merge

6 files changed, 4 insertions, 98 deletions

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

-<classpath>

-	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>

-	<classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>

-	<classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>

-	<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>

-	<classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.2.6/jaxb-api-2.2.6.jar"/>

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

-	<classpathentry kind="var" path="M2_REPO/axis/axis/1.0_IAIK/axis-1.0_IAIK.jar" sourcepath="/AXIS-IAIK"/>

-	<classpathentry kind="var" path="M2_REPO/org/apache/axis/axis-jaxrpc/1.4/axis-jaxrpc-1.4.jar"/>

-	<classpathentry kind="var" path="M2_REPO/org/apache/axis/axis-saaj/1.4/axis-saaj-1.4.jar"/>

-	<classpathentry kind="var" path="M2_REPO/axis/axis-wsdl4j/1.5.1/axis-wsdl4j-1.5.1.jar"/>

-	<classpathentry kind="var" path="M2_REPO/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar"/>

-	<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>

-	<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>

-	<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>

-	<classpathentry kind="var" path="M2_REPO/postgresql/postgresql/7.2/postgresql-7.2.jar"/>

-	<classpathentry kind="var" path="M2_REPO/xalan-bin-dist/xalan/2.7.1/xalan-2.7.1.jar"/>

-	<classpathentry kind="var" path="M2_REPO/xalan/serializer/2.7.1/serializer-2.7.1.jar"/>

-	<classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar"/>

-	<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.0/xercesImpl-2.9.0.jar"/>

-	<classpathentry kind="var" path="M2_REPO/xalan-bin-dist/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>

-	<classpathentry kind="var" path="M2_REPO/xalan-bin-dist/serializer/2.7.1/serializer-2.7.1.jar"/>

-	<classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.jar"/>

-	<classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar"/>

-	<classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.jar"/>

-	<classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.jar"/>

-	<classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_cms/4.1_MOA/iaik_cms-4.1_MOA.jar"/>

-	<classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.jar"/>

-	<classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_Pkcs11Wrapper/1.2.17/iaik_Pkcs11Wrapper-1.2.17.jar"/>

-	<classpathentry kind="src" path="/moa-common"/>

-	<classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.0-FCS/jaxen-1.0-FCS.jar"/>

-	<classpathentry kind="var" path="M2_REPO/saxpath/saxpath/1.0-FCS/saxpath-1.0-FCS.jar"/>

-	<classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6.2/joda-time-1.6.2.jar"/>

-	<classpathentry kind="src" path="/moa-spss-lib"/>

-	<classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar"/>

-	<classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_util/0.23/iaik_util-0.23.jar"/>

-	<classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar"/>

-	<classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.2.5/jaxb-impl-2.2.5.jar"/>

-	<classpathentry kind="var" path="M2_REPO/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.jar"/>

-	<classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.jar"/>

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

-</classpath>

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

-<projectDescription>

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

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

-  <projects>

-    <project>moa-common</project>

-    <project>moa-spss-lib</project>

-  </projects>

-  <buildSpec>

-    <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>

-  </natures>

-</projectDescription>
\ No newline at end of file
diff --git a/spss/handbook/clients/api/.settings/org.eclipse.jdt.core.prefs b/spss/handbook/clients/api/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5bdae7434..000000000
--- a/spss/handbook/clients/api/.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/api/.settings/org.maven.ide.eclipse.prefs b/spss/handbook/clients/api/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 1964c59a4..000000000
--- a/spss/handbook/clients/api/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tue Jul 07 16:06:54 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/api/moa-spss-handbook-apiClient.iml b/spss/handbook/clients/api/moa-spss-handbook-apiClient.iml
index a1234e810..0d3e3f954 100644
--- a/spss/handbook/clients/api/moa-spss-handbook-apiClient.iml
+++ b/spss/handbook/clients/api/moa-spss-handbook-apiClient.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="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" />
@@ -39,7 +39,7 @@
     <orderEntry type="library" name="Maven: saxpath:saxpath:1.0-FCS" level="project" />
     <orderEntry type="library" name="Maven: joda-time:joda-time:1.6.2" level="project" />
     <orderEntry type="module" module-name="moa-spss-lib" />
-    <orderEntry type="library" name="Maven: iaik.prod:iaik_tsl:0.0.2-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_tsl:1.0" level="project" />
     <orderEntry type="library" name="Maven: iaik.prod:iaik_util:0.23" level="project" />
     <orderEntry type="library" name="Maven: iaik.prod:iaik_xsect:1.1709142" level="project" />
     <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.2.6" level="project" />
diff --git a/spss/handbook/clients/api/pom.xml b/spss/handbook/clients/api/pom.xml
index d1e9388be..442d4fdb7 100644
--- a/spss/handbook/clients/api/pom.xml
+++ b/spss/handbook/clients/api/pom.xml
@@ -2,13 +2,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-apiClient</artifactId>

 	<packaging>jar</packaging>

+	<version>2.0</version>

 	<name>MOA SP/SS Handbook API Client</name>

 

 	<properties>