diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2013-09-05 09:46:38 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2013-09-05 09:46:38 +0200 |
| commit | e3667b6ccf1ae70a8c93b0af7a5bcf505831b073 (patch) | |
| tree | 85f74fd2bcf1745dfc8537db7c5c7d2468b46a75 /id/templates/.settings | |
| parent | cf5cf7c5baa823329d38e764ea53efe8f291d367 (diff) | |
| parent | eb33e9afb53314c8ab1e0854c587a808e8605fad (diff) | |
| download | moa-id-spss-e3667b6ccf1ae70a8c93b0af7a5bcf505831b073.tar.gz moa-id-spss-e3667b6ccf1ae70a8c93b0af7a5bcf505831b073.tar.bz2 moa-id-spss-e3667b6ccf1ae70a8c93b0af7a5bcf505831b073.zip | |
Merge branch 'moa2_0_tlenz' of https://gitlab.iaik.tugraz.at/afitzek/moa-idspss into moa2_0_tlenz
Conflicts:
id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
Diffstat (limited to 'id/templates/.settings')
| -rw-r--r-- | id/templates/.settings/org.eclipse.wst.common.component | 10 | ||||
| -rw-r--r-- | id/templates/.settings/org.eclipse.wst.common.project.facet.core.xml | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/id/templates/.settings/org.eclipse.wst.common.component b/id/templates/.settings/org.eclipse.wst.common.component index 0d2cb24b4..8ef19dd6b 100644 --- a/id/templates/.settings/org.eclipse.wst.common.component +++ b/id/templates/.settings/org.eclipse.wst.common.component @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="moa-id-templates">
- <property name="context-root" value="moa-id-templates"/>
- <wb-resource deploy-path="/" source-path="src/main/webapp"/>
+ <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+ <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<property name="java-output-path" value="/target/classes"/>
+ <property name="context-root" value="moaid-templates"/>
</wb-module>
-</project-modules>
\ No newline at end of file +</project-modules>
diff --git a/id/templates/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/templates/.settings/org.eclipse.wst.common.project.facet.core.xml index 564572b10..ac59587b0 100644 --- a/id/templates/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/id/templates/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -2,6 +2,6 @@ <faceted-project>
<fixed facet="jst.java"/>
<fixed facet="jst.web"/>
- <installed facet="jst.web" version="2.4"/>
<installed facet="jst.java" version="5.0"/>
-</faceted-project>
\ No newline at end of file + <installed facet="jst.web" version="2.3"/>
+</faceted-project>
|