diff options
| author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2014-03-04 23:27:21 +0100 |
|---|---|---|
| committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2014-03-04 23:27:21 +0100 |
| commit | e1a7da578e195a59f4981bc56a9b8c615f1e69d2 (patch) | |
| tree | f77153bf75580e1672a2442020708a872053cc59 /spss/server/serverws/.settings/org.eclipse.wst.common.component | |
| parent | 9753d2e1c9fde6778e070825b141e0e69323c9b6 (diff) | |
| parent | f5440a189b89bd4aa69d6d54445579484d5d7228 (diff) | |
| download | moa-id-spss-e1a7da578e195a59f4981bc56a9b8c615f1e69d2.tar.gz moa-id-spss-e1a7da578e195a59f4981bc56a9b8c615f1e69d2.tar.bz2 moa-id-spss-e1a7da578e195a59f4981bc56a9b8c615f1e69d2.zip | |
Merge branch 'moa2_0_tlenz' of https://gitlab.iaik.tugraz.at/afitzek/moa-idspss into moa2_0_tlenz
Conflicts:
id/server/doc/handbook/config/config.html
Diffstat (limited to 'spss/server/serverws/.settings/org.eclipse.wst.common.component')
| -rw-r--r-- | spss/server/serverws/.settings/org.eclipse.wst.common.component | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/spss/server/serverws/.settings/org.eclipse.wst.common.component b/spss/server/serverws/.settings/org.eclipse.wst.common.component index ff1d935dd..ffe4d38a0 100644 --- a/spss/server/serverws/.settings/org.eclipse.wst.common.component +++ b/spss/server/serverws/.settings/org.eclipse.wst.common.component @@ -1,15 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="moa-spss-ws">
+ <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+ <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<dependent-module archiveName="moa-spss-lib-2.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="moa-common-2.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
<dependency-type>uses</dependency-type>
</dependent-module>
- <property name="context-root" value="moa-spss-ws"/>
- <wb-resource deploy-path="/" source-path="src/main/webapp"/>
- <wb-resource deploy-path="/" source-path="resources/wsdl"/>
- <wb-resource deploy-path="/" source-path="C:/eclipse_workspaces/MOA_Git02/moa-idspss/spss/handbook"/>
<property name="java-output-path" value="/target/classes"/>
+ <property name="context-root" value="moa-spss"/>
</wb-module>
</project-modules>
|