aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common-test/pom.xml71
-rw-r--r--id/server/auth/pom.xml4
-rw-r--r--id/server/idserverlib/pom.xml2
-rw-r--r--id/server/proxy/pom.xml4
-rw-r--r--pom.xml18
-rw-r--r--spss/assembly-lib.xml6
-rw-r--r--spss/assembly.xml12
-rw-r--r--spss/handbook/clients/api/pom.xml2
-rw-r--r--spss/handbook/clients/webservice/pom.xml2
-rw-r--r--spss/server/pom.xml2
-rw-r--r--spss/server/serverlib/pom.xml426
-rw-r--r--spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/AllTests.java (renamed from spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/AllTests.java)0
-rw-r--r--spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/SPSSTestCase.java (renamed from spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/SPSSTestCase.java)0
-rw-r--r--spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/AllTests.java (renamed from spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/api/xmlbind/AllTests.java)0
-rw-r--r--spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java (renamed from spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java)0
-rw-r--r--spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java (renamed from spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java)0
-rw-r--r--spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java (renamed from spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java)0
-rw-r--r--spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java (renamed from spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java)0
-rw-r--r--spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/config/AllTests.java (renamed from spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/config/AllTests.java)0
-rw-r--r--spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest1.java (renamed from spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest1.java)0
-rw-r--r--spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest2.java (renamed from spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest2.java)0
-rw-r--r--spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest3.java (renamed from spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest3.java)0
-rw-r--r--spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java (renamed from spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java)0
-rw-r--r--spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfiguratorTest.java (renamed from spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfiguratorTest.java)0
-rw-r--r--spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/AllTests.java (renamed from spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/invoke/AllTests.java)0
-rw-r--r--spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java (renamed from spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java)0
-rw-r--r--spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java (renamed from spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java)0
-rw-r--r--spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java (renamed from spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java)0
-rw-r--r--spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java (renamed from spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java)0
-rw-r--r--spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java (renamed from spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java)0
-rw-r--r--spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java (renamed from spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java)1
-rw-r--r--spss/server/serverws/pom.xml2
-rw-r--r--spss/server/tools/pom.xml84
-rw-r--r--spss/server/tools/run/certtool.bat (renamed from spss/server/tools/src/main/resources/tools/certtool.bat)0
-rw-r--r--spss/server/tools/run/certtool.sh (renamed from spss/server/tools/src/main/resources/tools/certtool.sh)0
-rw-r--r--spss/server/tools/run/configtool.bat (renamed from spss/server/tools/src/main/resources/tools/configtool.bat)0
-rw-r--r--spss/server/tools/run/configtool.sh (renamed from spss/server/tools/src/main/resources/tools/configtool.sh)0
-rw-r--r--spss/server/tools/src/main/resources/tools/ConfigurationMapper.xsl (renamed from spss/server/serverws/tools/ConfigurationMapper.xsl)0
38 files changed, 309 insertions, 327 deletions
diff --git a/common-test/pom.xml b/common-test/pom.xml
deleted file mode 100644
index 029e0e61d..000000000
--- a/common-test/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>MOA</groupId>
- <artifactId>MOA</artifactId>
- <version>1.4.1</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>MOA</groupId>
- <artifactId>moa-common-test</artifactId>
- <version>1.4.1</version>
- <packaging>jar</packaging>
- <name>MOA common test-library</name>
-
- <properties>
- <repositoryPath>${basedir}/../repository</repositoryPath>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>MOA</groupId>
- <artifactId>moa-common</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_jce_full</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
- <dependency>
- <groupId>xalan-bin-dist</groupId>
- <artifactId>xalan</artifactId>
- </dependency>
- <dependency>
- <groupId>xalan-bin-dist</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
- <dependency>
- <groupId>xalan-bin-dist</groupId>
- <artifactId>serializer</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 57aea5ac4..ef53ba336 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -53,12 +53,12 @@
<dependency>
<groupId>MOA.spss.server</groupId>
<artifactId>moa-spss-lib</artifactId>
- <version>${project.version}</version>
+ <!--version>${project.version}</version-->
</dependency>
<dependency>
<groupId>MOA.id.server</groupId>
<artifactId>moa-id-lib</artifactId>
- <version>${project.version}</version>
+ <!--version>${project.version}</version-->
</dependency>
<!-- transitive dependencies we don't want to include into the war -->
<dependency>
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 0eb0451e5..0edfe53dd 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -89,7 +89,7 @@
<dependency>
<groupId>MOA.spss.server</groupId>
<artifactId>moa-spss-lib</artifactId>
- <version>${project.version}</version>
+ <!--version>${project.version}</version-->
</dependency>
<dependency>
<groupId>iaik.prod</groupId>
diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 72397b959..103393d53 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -55,12 +55,12 @@
<dependency>
<groupId>MOA.spss.server</groupId>
<artifactId>moa-spss-lib</artifactId>
- <version>${project.version}</version>
+ <!--version>${project.version}</version-->
</dependency>
<dependency>
<groupId>MOA.id.server</groupId>
<artifactId>moa-id-lib</artifactId>
- <version>${project.version}</version>
+ <!--version>${project.version}</version-->
</dependency>
<!-- transitive dependencies we don't want to include into the war -->
<dependency>
diff --git a/pom.xml b/pom.xml
index 2c8795975..dab384dc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,6 +168,24 @@
<type>test-jar</type>
</dependency>
<dependency>
+ <groupId>MOA.id.server</groupId>
+ <artifactId>moa-id-lib</artifactId>
+ <version>1.4.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>MOA.spss.server</groupId>
+ <artifactId>moa-spss-lib</artifactId>
+ <version>1.4.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>MOA.spss.server</groupId>
+ <artifactId>moa-spss-tools</artifactId>
+ <version>1.4.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
diff --git a/spss/assembly-lib.xml b/spss/assembly-lib.xml
index 560b2be75..158cf53e9 100644
--- a/spss/assembly-lib.xml
+++ b/spss/assembly-lib.xml
@@ -141,6 +141,10 @@
<directory>${basedir}/spss/server/serverlib/resources/licenses</directory>
<outputDirectory>/licenses</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>${basedir}/spss/server/tools/run</directory>
+ <outputDirectory>/tools</outputDirectory>
+ </fileSet>
</fileSets>
-</assembly> \ No newline at end of file
+</assembly>
diff --git a/spss/assembly.xml b/spss/assembly.xml
index 780e8c346..56cfbb95e 100644
--- a/spss/assembly.xml
+++ b/spss/assembly.xml
@@ -21,7 +21,7 @@
<include>xalan-bin-dist:xalan</include>
<include>xerces:xercesImpl</include>
<include>xalan-bin-dist:xml-apis</include>
- <include>xalan-bin-dist:serializer</include>
+ <include>xalan-bin-dist:serializer</include>
</includes>
<outputDirectory>/endorsed</outputDirectory>
<!-- strip version off the artifact file names -->
@@ -69,8 +69,8 @@
<include>xalan-bin-dist:xalan</include>
</includes>
<outputDirectory>/tools</outputDirectory>
- <!-- strip version off the artifact file names -->
- <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ <!-- strip version off the artifact file names -->
+ <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
</dependencySet>
</dependencySets>
<outputDirectory>/tools</outputDirectory>
@@ -126,6 +126,10 @@
<directory>${basedir}/spss/server/serverws/data/deploy/tools</directory>
<outputDirectory>/tools</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>${basedir}/spss/server/tools/run</directory>
+ <outputDirectory>/tools</outputDirectory>
+ </fileSet>
</fileSets>
-</assembly> \ No newline at end of file
+</assembly>
diff --git a/spss/handbook/clients/api/pom.xml b/spss/handbook/clients/api/pom.xml
index c026cc939..da9e7de7f 100644
--- a/spss/handbook/clients/api/pom.xml
+++ b/spss/handbook/clients/api/pom.xml
@@ -120,7 +120,7 @@
<dependency>
<groupId>MOA.spss.server</groupId>
<artifactId>moa-spss-lib</artifactId>
- <version>1.4.2</version>
+ <!--version>1.4.2</version-->
</dependency>
</dependencies>
diff --git a/spss/handbook/clients/webservice/pom.xml b/spss/handbook/clients/webservice/pom.xml
index 8e9f16fb3..41d8874db 100644
--- a/spss/handbook/clients/webservice/pom.xml
+++ b/spss/handbook/clients/webservice/pom.xml
@@ -120,7 +120,7 @@
<dependency>
<groupId>MOA.spss.server</groupId>
<artifactId>moa-spss-lib</artifactId>
- <version>1.4.2</version>
+ <!--version>1.4.2</version-->
</dependency>
</dependencies>
diff --git a/spss/server/pom.xml b/spss/server/pom.xml
index 82e8a8c2f..39593518e 100644
--- a/spss/server/pom.xml
+++ b/spss/server/pom.xml
@@ -14,9 +14,9 @@
<name>MOA SP/SS Server</name>
<modules>
+ <module>tools</module>
<module>serverlib</module>
<module>serverws</module>
- <module>tools</module>
</modules>
<properties>
diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index c49a234a1..87e9b5575 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -1,208 +1,218 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>MOA.spss</groupId>
- <artifactId>moa-spss</artifactId>
- <version>1.4.x</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>MOA.spss.server</groupId>
- <artifactId>moa-spss-lib</artifactId>
- <packaging>jar</packaging>
- <version>1.4.2</version>
- <name>MOA SP/SS API</name>
-
- <properties>
- <repositoryPath>${basedir}/../../../repository</repositoryPath>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-discovery</groupId>
- <artifactId>commons-discovery</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>xalan-bin-dist</groupId>
- <artifactId>xalan</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
- <dependency>
- <groupId>xalan-bin-dist</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
- <dependency>
- <groupId>xalan-bin-dist</groupId>
- <artifactId>serializer</artifactId>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_moa</artifactId>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_ixsil</artifactId>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_jce_full</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_ecc</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_cms</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_Pkcs11Provider</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_Pkcs11Wrapper</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_Pkcs11Wrapper</artifactId>
- <classifier>win32</classifier>
- <type>dll</type>
- <scope>runtime</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>MOA</groupId>
- <artifactId>moa-common</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <quiet>true</quiet>
- <author>false</author>
- <version>false</version>
- <use>true</use>
- <excludePackageNames>at.gv.egovernment.moa.spss.server.*;at.gv.egovernment.moa.spss.api.impl.*;at.gv.egovernment.moa.spss.impl.*</excludePackageNames>
- <tags>
- <tag>
- <name>pre</name>
- <placement>a</placement>
- <head>Preconditions:</head>
- </tag>
- <tag>
- <name>post</name>
- <placement>a</placement>
- <head>Postconditions:</head>
- </tag>
- </tags>
- <groups>
- <group>
- <title>API Factory and Services</title>
- <packages>at.gv.egovernment.moa.spss.api</packages>
- </group>
- <group>
- <title>Exceptions</title>
- <packages>at.gv.egovernment.moa.spss</packages>
- </group>
- <group>
- <title>API Objects for Signature Creation</title>
- <packages>at.gv.egovernment.moa.spss.api.xmlsign</packages>
- </group>
- <group>
- <title>API Objects for CMS Signature Verification</title>
- <packages>at.gv.egovernment.moa.spss.api.cmsverify</packages>
- </group>
- <group>
- <title>API Objects for XML Signature Verification</title>
- <packages>at.gv.egovernment.moa.spss.api.xmlverify</packages>
- </group>
- <group>
- <title>Common API Objects</title>
- <packages>at.gv.egovernment.moa.spss.api.common</packages>
- </group>
- <group>
- <title>Builders and Parsers to convert API Objects to and from XML</title>
- <packages>at.gv.egovernment.moa.spss.api.xmlbind</packages>
- </group>
- <group>
- <title>Utilities</title>
- <packages>at.gv.egovernment.moa.util</packages>
- <packages>at.gv.egovernment.moa.spss.util</packages>
- </group>
- <group>
- <title>Logging</title>
- <packages>at.gv.egovernment.moa.logging</packages>
- </group>
- </groups>
- <link>http://java.sun.com/j2se/1.4/docs/api/</link>
- </configuration>
- <executions>
- <execution>
- <id>generate-javadoc</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>MOA.spss</groupId>
+ <artifactId>moa-spss</artifactId>
+ <version>1.4.x</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>MOA.spss.server</groupId>
+ <artifactId>moa-spss-lib</artifactId>
+ <packaging>jar</packaging>
+ <version>1.4.2</version>
+ <name>MOA SP/SS API</name>
+
+ <properties>
+ <repositoryPath>${basedir}/../../../repository</repositoryPath>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>xalan-bin-dist</groupId>
+ <artifactId>xalan</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xalan-bin-dist</groupId>
+ <artifactId>xml-apis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xalan-bin-dist</groupId>
+ <artifactId>serializer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_moa</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_ixsil</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_jce_full</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_ecc</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_cms</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_Pkcs11Provider</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_Pkcs11Wrapper</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_Pkcs11Wrapper</artifactId>
+ <classifier>win32</classifier>
+ <type>dll</type>
+ <scope>runtime</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>MOA</groupId>
+ <artifactId>moa-common</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>MOA</groupId>
+ <artifactId>moa-common</artifactId>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>MOA.spss.server</groupId>
+ <artifactId>moa-spss-tools</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <quiet>true</quiet>
+ <author>false</author>
+ <version>false</version>
+ <use>true</use>
+ <excludePackageNames>at.gv.egovernment.moa.spss.server.*;at.gv.egovernment.moa.spss.api.impl.*;at.gv.egovernment.moa.spss.impl.*</excludePackageNames>
+ <tags>
+ <tag>
+ <name>pre</name>
+ <placement>a</placement>
+ <head>Preconditions:</head>
+ </tag>
+ <tag>
+ <name>post</name>
+ <placement>a</placement>
+ <head>Postconditions:</head>
+ </tag>
+ </tags>
+ <groups>
+ <group>
+ <title>API Factory and Services</title>
+ <packages>at.gv.egovernment.moa.spss.api</packages>
+ </group>
+ <group>
+ <title>Exceptions</title>
+ <packages>at.gv.egovernment.moa.spss</packages>
+ </group>
+ <group>
+ <title>API Objects for Signature Creation</title>
+ <packages>at.gv.egovernment.moa.spss.api.xmlsign</packages>
+ </group>
+ <group>
+ <title>API Objects for CMS Signature Verification</title>
+ <packages>at.gv.egovernment.moa.spss.api.cmsverify</packages>
+ </group>
+ <group>
+ <title>API Objects for XML Signature Verification</title>
+ <packages>at.gv.egovernment.moa.spss.api.xmlverify</packages>
+ </group>
+ <group>
+ <title>Common API Objects</title>
+ <packages>at.gv.egovernment.moa.spss.api.common</packages>
+ </group>
+ <group>
+ <title>Builders and Parsers to convert API Objects to and from XML</title>
+ <packages>at.gv.egovernment.moa.spss.api.xmlbind</packages>
+ </group>
+ <group>
+ <title>Utilities</title>
+ <packages>at.gv.egovernment.moa.util</packages>
+ <packages>at.gv.egovernment.moa.spss.util</packages>
+ </group>
+ <group>
+ <title>Logging</title>
+ <packages>at.gv.egovernment.moa.logging</packages>
+ </group>
+ </groups>
+ <link>http://java.sun.com/j2se/1.4/docs/api/</link>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-javadoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/AllTests.java b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/AllTests.java
index c670b5e55..c670b5e55 100644
--- a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/AllTests.java
+++ b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/AllTests.java
diff --git a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/SPSSTestCase.java b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/SPSSTestCase.java
index a585e30a0..a585e30a0 100644
--- a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/SPSSTestCase.java
+++ b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/SPSSTestCase.java
diff --git a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/api/xmlbind/AllTests.java b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/AllTests.java
index 28f79729e..28f79729e 100644
--- a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/api/xmlbind/AllTests.java
+++ b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/AllTests.java
diff --git a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java
index 7ce705b01..7ce705b01 100644
--- a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java
+++ b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java
diff --git a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java
index f580f86bc..f580f86bc 100644
--- a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java
+++ b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java
diff --git a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java
index 4be7667eb..4be7667eb 100644
--- a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java
+++ b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java
diff --git a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java
index 3b8e8b00e..3b8e8b00e 100644
--- a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java
+++ b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java
diff --git a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/config/AllTests.java b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/config/AllTests.java
index 131f38c19..131f38c19 100644
--- a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/config/AllTests.java
+++ b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/config/AllTests.java
diff --git a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest1.java b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest1.java
index 474a387ad..474a387ad 100644
--- a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest1.java
+++ b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest1.java
diff --git a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest2.java b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest2.java
index adf02809b..adf02809b 100644
--- a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest2.java
+++ b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest2.java
diff --git a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest3.java b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest3.java
index 7da2165cb..7da2165cb 100644
--- a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest3.java
+++ b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest3.java
diff --git a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java
index be1090e4a..be1090e4a 100644
--- a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java
+++ b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java
diff --git a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfiguratorTest.java b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfiguratorTest.java
index 3b403dc19..3b403dc19 100644
--- a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfiguratorTest.java
+++ b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfiguratorTest.java
diff --git a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/invoke/AllTests.java b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/AllTests.java
index 65fa2bf72..65fa2bf72 100644
--- a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/invoke/AllTests.java
+++ b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/AllTests.java
diff --git a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java
index 3024730f4..3024730f4 100644
--- a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java
+++ b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java
diff --git a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java
index 7de2add33..7de2add33 100644
--- a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java
+++ b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java
diff --git a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java
index 13a80cbf1..13a80cbf1 100644
--- a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java
+++ b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java
diff --git a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java
index 28cd3805a..28cd3805a 100644
--- a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java
+++ b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java
diff --git a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java
index 56e3d541b..56e3d541b 100644
--- a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java
+++ b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java
diff --git a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java
index b46c20086..ac6e8c3e0 100644
--- a/spss/server/serverlib/src/test/java/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java
+++ b/spss/server/serverlib/src/test/java/test/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java
@@ -4,7 +4,6 @@ import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import at.gv.egovernment.moa.spss.server.tools.CertTool;
-
import test.at.gv.egovernment.moa.MOATestCase;
/**
diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml
index 88b3345d6..aed4e8cc1 100644
--- a/spss/server/serverws/pom.xml
+++ b/spss/server/serverws/pom.xml
@@ -57,7 +57,7 @@
<dependency>
<groupId>MOA.spss.server</groupId>
<artifactId>moa-spss-lib</artifactId>
- <version>${pom.version}</version>
+ <!--version>${pom.version}</version-->
</dependency>
<dependency>
<groupId>MOA</groupId>
diff --git a/spss/server/tools/pom.xml b/spss/server/tools/pom.xml
index 3a3cde79c..191ba234f 100644
--- a/spss/server/tools/pom.xml
+++ b/spss/server/tools/pom.xml
@@ -1,38 +1,56 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>MOA.spss</groupId>
- <artifactId>moa-spss</artifactId>
- <version>1.4.x</version>
- </parent>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>MOA.spss</groupId>
+ <artifactId>moa-spss</artifactId>
+ <version>1.4.x</version>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>MOA.spss.server</groupId>
- <artifactId>moa-spss-tools</artifactId>
- <packaging>jar</packaging>
- <version>1.4.2</version>
- <name>MOA SP/SS Tools</name>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>MOA.spss.server</groupId>
+ <artifactId>moa-spss-tools</artifactId>
+ <packaging>jar</packaging>
+ <version>1.4.2</version>
+ <name>MOA SP/SS Tools</name>
- <properties>
- <thirdPartyLib>${basedir}/../../../buildhelper</thirdPartyLib>
- </properties>
+ <properties>
+ <thirdPartyLib>${basedir}/../../../buildhelper</thirdPartyLib>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>MOA.spss.server</groupId>
- <artifactId>moa-spss-lib</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_jce_full</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_ecc</artifactId>
- <scope>compile</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+<!--
+ <dependency>
+ <groupId>MOA.spss.server</groupId>
+ <artifactId>moa-spss-lib</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ -->
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_moa</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_jce_full</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_ecc</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/spss/server/tools/src/main/resources/tools/certtool.bat b/spss/server/tools/run/certtool.bat
index ae55bc4a5..ae55bc4a5 100644
--- a/spss/server/tools/src/main/resources/tools/certtool.bat
+++ b/spss/server/tools/run/certtool.bat
diff --git a/spss/server/tools/src/main/resources/tools/certtool.sh b/spss/server/tools/run/certtool.sh
index 721eff4d8..721eff4d8 100644
--- a/spss/server/tools/src/main/resources/tools/certtool.sh
+++ b/spss/server/tools/run/certtool.sh
diff --git a/spss/server/tools/src/main/resources/tools/configtool.bat b/spss/server/tools/run/configtool.bat
index 868df11f0..868df11f0 100644
--- a/spss/server/tools/src/main/resources/tools/configtool.bat
+++ b/spss/server/tools/run/configtool.bat
diff --git a/spss/server/tools/src/main/resources/tools/configtool.sh b/spss/server/tools/run/configtool.sh
index f7f29bae1..f7f29bae1 100644
--- a/spss/server/tools/src/main/resources/tools/configtool.sh
+++ b/spss/server/tools/run/configtool.sh
diff --git a/spss/server/serverws/tools/ConfigurationMapper.xsl b/spss/server/tools/src/main/resources/tools/ConfigurationMapper.xsl
index fd47cbf84..fd47cbf84 100644
--- a/spss/server/serverws/tools/ConfigurationMapper.xsl
+++ b/spss/server/tools/src/main/resources/tools/ConfigurationMapper.xsl