diff options
| author | cecigg <caggsld@gmail.com> | 2013-05-11 19:17:28 (GMT) |
|---|---|---|
| committer | cecigg <caggsld@gmail.com> | 2013-05-11 19:17:28 (GMT) |
| commit | ee226f14dd3efb6146c44e7dc31fded83d3e1c65 (patch) | |
| tree | 7dd846dcb96ae658069d7ab24c3745d93b9084cf /EjercitarEAR | |
| parent | 41a1739b4ef8e5a24ae94a0214508898097529f6 (diff) | |
| parent | d330eeb391afc326ad32417601e06082ab23e0f5 (diff) | |
Merge remote-tracking branch 'origin/samu' into ceci
Diffstat (limited to 'EjercitarEAR')
| -rw-r--r-- | EjercitarEAR/.project | 52 | ||||
| -rw-r--r-- | EjercitarEAR/.settings/org.eclipse.wst.common.component | 34 | ||||
| -rw-r--r-- | EjercitarEAR/.settings/org.eclipse.wst.common.project.facet.core.xml | 10 |
3 files changed, 48 insertions, 48 deletions
diff --git a/EjercitarEAR/.project b/EjercitarEAR/.project index 5265456..23a21f1 100644 --- a/EjercitarEAR/.project +++ b/EjercitarEAR/.project @@ -1,26 +1,26 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>EjercitarEAR</name>
- <comment></comment>
- <projects>
- <project>EjercitarJPA</project>
- <project>EjercitarServer</project>
- <project>EjercitarWeb</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>EjercitarEAR</name> + <comment></comment> + <projects> + <project>EjercitarJPA</project> + <project>EjercitarServer</project> + <project>EjercitarWeb</project> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + </natures> +</projectDescription> diff --git a/EjercitarEAR/.settings/org.eclipse.wst.common.component b/EjercitarEAR/.settings/org.eclipse.wst.common.component index 5ff0238..25caa26 100644 --- a/EjercitarEAR/.settings/org.eclipse.wst.common.component +++ b/EjercitarEAR/.settings/org.eclipse.wst.common.component @@ -1,17 +1,17 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
- <wb-module deploy-name="EjercitarEAR">
- <wb-resource deploy-path="/" source-path="/EarContent" tag="defaultRootSource"/>
- <dependent-module archiveName="EjercitarJPA.jar" deploy-path="/lib" handle="module:/resource/EjercitarJPA/EjercitarJPA">
- <dependency-type>uses</dependency-type>
- </dependent-module>
- <dependent-module archiveName="EjercitarServer.jar" deploy-path="/" handle="module:/resource/EjercitarServer/EjercitarServer">
- <dependent-object/>
- <dependency-type>uses</dependency-type>
- </dependent-module>
- <dependent-module archiveName="EjercitarWeb.war" deploy-path="/" handle="module:/resource/EjercitarWeb/EjercitarWeb">
- <dependent-object/>
- <dependency-type>uses</dependency-type>
- </dependent-module>
- </wb-module>
-</project-modules>
+<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="EjercitarEAR"> + <wb-resource deploy-path="/" source-path="/EarContent" tag="defaultRootSource"/> + <dependent-module archiveName="EjercitarJPA.jar" deploy-path="/lib" handle="module:/resource/EjercitarJPA/EjercitarJPA"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module archiveName="EjercitarServer.jar" deploy-path="/" handle="module:/resource/EjercitarServer/EjercitarServer"> + <dependent-object/> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module archiveName="EjercitarWeb.war" deploy-path="/" handle="module:/resource/EjercitarWeb/EjercitarWeb"> + <dependent-object/> + <dependency-type>uses</dependency-type> + </dependent-module> + </wb-module> +</project-modules> diff --git a/EjercitarEAR/.settings/org.eclipse.wst.common.project.facet.core.xml b/EjercitarEAR/.settings/org.eclipse.wst.common.project.facet.core.xml index 43a97ce..7a8af8a 100644 --- a/EjercitarEAR/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/EjercitarEAR/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <fixed facet="jst.ear"/>
- <installed facet="jst.ear" version="6.0"/>
-</faceted-project>
+<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <fixed facet="jst.ear"/> + <installed facet="jst.ear" version="6.0"/> +</faceted-project> |