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/server/auth/.settings/org.eclipse.wst.common.component | |
| 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/server/auth/.settings/org.eclipse.wst.common.component')
| -rw-r--r-- | id/server/auth/.settings/org.eclipse.wst.common.component | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/id/server/auth/.settings/org.eclipse.wst.common.component b/id/server/auth/.settings/org.eclipse.wst.common.component index b4ffa88f6..9725f5b61 100644 --- a/id/server/auth/.settings/org.eclipse.wst.common.component +++ b/id/server/auth/.settings/org.eclipse.wst.common.component @@ -17,7 +17,8 @@ </dependent-module> <property name="context-root" value="moa-id-auth"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/> - <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"/> </wb-module> </project-modules> |