merge

11 files changed, 6 insertions, 113 deletions

diff --git a/spss/handbook/clients/referencedData/.classpath b/spss/handbook/clients/referencedData/.classpath
deleted file mode 100644
index 767a2a2de..000000000
--- a/spss/handbook/clients/referencedData/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="src" output="target/classes" path="src/main/java">

-		<attributes>

-			<attribute name="optional" value="true"/>

-			<attribute name="maven.pomderived" value="true"/>

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">

-		<attributes>

-			<attribute name="optional" value="true"/>

-			<attribute name="maven.pomderived" value="true"/>

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">

-		<attributes>

-			<attribute name="maven.pomderived" value="true"/>

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">

-		<attributes>

-			<attribute name="maven.pomderived" value="true"/>

-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="output" path="target/classes"/>

-</classpath>

diff --git a/spss/handbook/clients/referencedData/.project b/spss/handbook/clients/referencedData/.project
deleted file mode 100644
index 3d724d6bd..000000000
--- a/spss/handbook/clients/referencedData/.project
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-  <name>moa-spss-handbook-referencedData</name>

-  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>

-  <projects/>

-  <buildSpec>

-    <buildCommand>

-      <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>

-    </buildCommand>

-    <buildCommand>

-      <name>org.eclipse.jdt.core.javabuilder</name>

-    </buildCommand>

-    <buildCommand>

-      <name>org.eclipse.wst.common.project.facet.core.builder</name>

-    </buildCommand>

-    <buildCommand>

-      <name>org.eclipse.wst.validation.validationbuilder</name>

-    </buildCommand>

-    <buildCommand>

-      <name>org.maven.ide.eclipse.maven2Builder</name>

-    </buildCommand>

-    <buildCommand>

-      <name>org.eclipse.m2e.core.maven2Builder</name>

-    </buildCommand>

-  </buildSpec>

-  <natures>

-    <nature>org.eclipse.m2e.core.maven2Nature</nature>

-    <nature>org.maven.ide.eclipse.maven2Nature</nature>

-    <nature>org.eclipse.wst.common.project.facet.core.nature</nature>

-    <nature>org.eclipse.jdt.core.javanature</nature>

-    <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>

-    <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>

-    <nature>org.eclipse.wst.jsdt.core.jsNature</nature>

-  </natures>

-</projectDescription>
\ No newline at end of file
diff --git a/spss/handbook/clients/referencedData/.settings/.jsdtscope b/spss/handbook/clients/referencedData/.settings/.jsdtscope
deleted file mode 100644
index f40dd98e2..000000000
--- a/spss/handbook/clients/referencedData/.settings/.jsdtscope
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>

-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">

-		<attributes>

-			<attribute name="hide" value="true"/>

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>

-	<classpathentry kind="output" path=""/>

-</classpath>

diff --git a/spss/handbook/clients/referencedData/.settings/org.eclipse.jdt.core.prefs b/spss/handbook/clients/referencedData/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5bdae7434..000000000
--- a/spss/handbook/clients/referencedData/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Aug 05 10:52:31 CEST 2013

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.compliance=1.5

diff --git a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.common.component b/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index b4191dc26..000000000
--- a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">

-  <wb-module deploy-name="moa-spss-handbook-referencedData">

-        <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="referencedData"/>

-  </wb-module>

-</project-modules>

diff --git a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.common.project.facet.core.xml b/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index ac59587b0..000000000
--- a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<faceted-project>

-  <fixed facet="jst.java"/>

-  <fixed facet="jst.web"/>

-  <installed facet="jst.java" version="5.0"/>

-  <installed facet="jst.web" version="2.3"/>

-</faceted-project>

diff --git a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.jsdt.ui.superType.container b/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.jsdt.ui.superType.container
deleted file mode 100644
index 3bd5d0a48..000000000
--- a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.jsdt.ui.superType.name b/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.jsdt.ui.superType.name
deleted file mode 100644
index 05bd71b6e..000000000
--- a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ /dev/null
@@ -1 +0,0 @@
-Window
\ No newline at end of file
diff --git a/spss/handbook/clients/referencedData/.settings/org.maven.ide.eclipse.prefs b/spss/handbook/clients/referencedData/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 7eae03e88..000000000
--- a/spss/handbook/clients/referencedData/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tue Jul 07 16:06:53 CEST 2009

-activeProfiles=

-eclipse.preferences.version=1

-fullBuildGoals=process-test-resources

-includeModules=false

-resolveWorkspaceProjects=true

-resourceFilterGoals=process-resources resources\:testResources

-skipCompilerPlugin=true

-version=1

diff --git a/spss/handbook/clients/referencedData/moa-spss-handbook-referencedData.iml b/spss/handbook/clients/referencedData/moa-spss-handbook-referencedData.iml
index 3b8b05541..d7e297421 100644
--- a/spss/handbook/clients/referencedData/moa-spss-handbook-referencedData.iml
+++ b/spss/handbook/clients/referencedData/moa-spss-handbook-referencedData.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+<module type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="web" name="Web">
       <configuration>
@@ -12,9 +12,9 @@
       </configuration>
     </facet>
   </component>
-  <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" />
+  <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/handbook/clients/referencedData/pom.xml b/spss/handbook/clients/referencedData/pom.xml
index 197250f42..8e0378bd6 100644
--- a/spss/handbook/clients/referencedData/pom.xml
+++ b/spss/handbook/clients/referencedData/pom.xml
@@ -3,13 +3,14 @@
   <parent>

     <groupId>MOA.spss.handbook.clients</groupId>

     <artifactId>moa-spss-handbook-clients</artifactId>

-    <version>1.5.x</version>

+    <version>2.0</version>

   </parent>

 

   <modelVersion>4.0.0</modelVersion>

   <groupId>MOA.spss.handbook</groupId>

   <artifactId>moa-spss-handbook-referencedData</artifactId>

   <packaging>war</packaging>

+  <version>2.0</version>

   <name>MOA SP/SS Handbook Referenced Data</name>

 

   <properties>