diff options
| author | Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> | 2013-09-04 09:37:31 +0200 |
|---|---|---|
| committer | Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> | 2013-09-04 09:37:31 +0200 |
| commit | eadd6dd97f1b30608b31ffcd90382874fbcdaddc (patch) | |
| tree | 1e02de018bcb417bf897f06fb79bf64eda9b4b06 /id/oa | |
| parent | 61362f940ca679fe215de34b1683e1110fea8d3e (diff) | |
| parent | 69f2dfdf3e0b5d976df3cdece6a8ead4848d746a (diff) | |
| download | moa-id-spss-eadd6dd97f1b30608b31ffcd90382874fbcdaddc.tar.gz moa-id-spss-eadd6dd97f1b30608b31ffcd90382874fbcdaddc.tar.bz2 moa-id-spss-eadd6dd97f1b30608b31ffcd90382874fbcdaddc.zip | |
Merge SPSS
Diffstat (limited to 'id/oa')
| -rw-r--r-- | id/oa/.settings/.jsdtscope | 2 | ||||
| -rw-r--r-- | id/oa/.settings/org.eclipse.wst.common.component | 8 | ||||
| -rw-r--r-- | id/oa/.settings/org.eclipse.wst.common.project.facet.core.xml | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/id/oa/.settings/.jsdtscope b/id/oa/.settings/.jsdtscope index f40dd98e2..beb42ee1c 100644 --- a/id/oa/.settings/.jsdtscope +++ b/id/oa/.settings/.jsdtscope @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry kind="src" path="target/m2e-wtp/web-resources"/>
+ <classpathentry kind="src" path="src/main/webapp"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
<attributes>
diff --git a/id/oa/.settings/org.eclipse.wst.common.component b/id/oa/.settings/org.eclipse.wst.common.component index 3bc38ebcc..beb49b957 100644 --- a/id/oa/.settings/org.eclipse.wst.common.component +++ b/id/oa/.settings/org.eclipse.wst.common.component @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="moa-id-oa">
- <property name="context-root" value="moa-id-oa"/>
- <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="oa"/>
</wb-module>
</project-modules>
diff --git a/id/oa/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/oa/.settings/org.eclipse.wst.common.project.facet.core.xml index 73c938daf..76426f651 100644 --- a/id/oa/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/id/oa/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -4,4 +4,4 @@ <fixed facet="jst.web"/>
<installed facet="jst.web" version="2.4"/>
<installed facet="jst.java" version="1.5"/>
-</faceted-project>
+</faceted-project> |