diff options
| author | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-02-04 17:25:09 +0100 |
|---|---|---|
| committer | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-02-04 17:25:09 +0100 |
| commit | 65fb688c9323696fcc12e1c049a2b6a75d6ff1e5 (patch) | |
| tree | 8dd14e62cf367552447cccf452dfadbefd72387f /spss/server | |
| parent | 06a794922b67df242f50afc901231f621fd189de (diff) | |
| download | moa-id-spss-65fb688c9323696fcc12e1c049a2b6a75d6ff1e5.tar.gz moa-id-spss-65fb688c9323696fcc12e1c049a2b6a75d6ff1e5.tar.bz2 moa-id-spss-65fb688c9323696fcc12e1c049a2b6a75d6ff1e5.zip | |
merging with other code
Diffstat (limited to 'spss/server')
| -rw-r--r-- | spss/server/moa-spss.iml | 8 | ||||
| -rw-r--r-- | spss/server/serverlib/moa-spss-lib.iml | 3 | ||||
| -rw-r--r-- | spss/server/serverws/moa-spss-ws.iml | 2 | ||||
| -rw-r--r-- | spss/server/tools/moa-spss-tools.iml | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/spss/server/moa-spss.iml b/spss/server/moa-spss.iml index d86f7c4dc..4d170c8a3 100644 --- a/spss/server/moa-spss.iml +++ b/spss/server/moa-spss.iml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<module type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/target/classes" /> - <output-test url="file://$MODULE_DIR$/target/test-classes" /> +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/../target/classes" /> + <output-test url="file://$MODULE_DIR$/../target/test-classes" /> <content url="file://$MODULE_DIR$"> <excludeFolder url="file://$MODULE_DIR$/target" /> </content> diff --git a/spss/server/serverlib/moa-spss-lib.iml b/spss/server/serverlib/moa-spss-lib.iml index 0652af183..d36dae117 100644 --- a/spss/server/serverlib/moa-spss-lib.iml +++ b/spss/server/serverlib/moa-spss-lib.iml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module type="JAVA_MODULE" version="4"> +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <component name="FacetManager"> <facet type="web" name="Web"> <configuration> @@ -55,7 +55,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" scope="TEST" name="Maven: MOA:moa-common:test-jar:tests:2.0" level="project" /> </component> </module> diff --git a/spss/server/serverws/moa-spss-ws.iml b/spss/server/serverws/moa-spss-ws.iml index b90669e54..80378b441 100644 --- a/spss/server/serverws/moa-spss-ws.iml +++ b/spss/server/serverws/moa-spss-ws.iml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module type="JAVA_MODULE" version="4"> +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <component name="FacetManager"> <facet type="web" name="Web"> <configuration> diff --git a/spss/server/tools/moa-spss-tools.iml b/spss/server/tools/moa-spss-tools.iml index c4d7825ea..40f81fa9a 100644 --- a/spss/server/tools/moa-spss-tools.iml +++ b/spss/server/tools/moa-spss-tools.iml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module type="JAVA_MODULE" version="4"> +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/../../target/classes" /> <output-test url="file://$MODULE_DIR$/../../target/test-classes" /> |