Improved and updated maven build process.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@919 d688527b-c9ab-4aba-bd8d-4036d912da1d

8 files changed, 127 insertions, 461 deletions

diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index 50b6fc411..edf27d123 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -2,86 +2,70 @@
   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>server</artifactId>
+		<artifactId>moa-spss</artifactId>
 		<version>1.4.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>MOA.spss.server</groupId>
-  <artifactId>serverlib</artifactId>
+  <artifactId>moa-spss-lib</artifactId>
   <packaging>jar</packaging>
   <version>1.4.0</version>
-  <name>MOA SPSS Serverlibrary</name>
+  <name>MOA SP/SS API</name>
 
-  <properties>
-  	<thirdPartyLib>${basedir}/../../../buildhelper</thirdPartyLib>
-  </properties>
+	<properties>
+		<repositoryPath>${basedir}/../../../repository</repositoryPath>
+	</properties>
   
   <dependencies>
     <dependency>
       <groupId>axis</groupId>
       <artifactId>axis</artifactId>
     </dependency>
-    <dependency>
-      <groupId>saaj</groupId>
-      <artifactId>saaj</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-discovery</groupId>
-      <artifactId>commons-discovery</artifactId>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>saaj</groupId>-->
+<!--      <artifactId>saaj</artifactId>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>commons-discovery</groupId>-->
+<!--      <artifactId>commons-discovery</artifactId>-->
+<!--    </dependency>-->
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
-<!--    <dependency>-->
-<!--      <groupId>iDoclet</groupId>-->
-<!--      <artifactId>iDoclet</artifactId>-->
-<!--    </dependency>-->
     <dependency>
       <groupId>javax.activation</groupId>
       <artifactId>activation</artifactId>
     </dependency>
-    <dependency>
-      <groupId>jaxen</groupId>
-      <artifactId>jaxen</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>dom</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>jaxp-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>sax</artifactId>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>jaxen</groupId>-->
+<!--      <artifactId>jaxen</artifactId>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>jaxp</groupId>-->
+<!--      <artifactId>dom</artifactId>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>jaxp</groupId>-->
+<!--      <artifactId>jaxp-api</artifactId>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>jaxp</groupId>-->
+<!--      <artifactId>sax</artifactId>-->
+<!--    </dependency>-->
 <!--    <dependency>-->
 <!--      <groupId>javaext</groupId>-->
 <!--      <artifactId>jaxrpc</artifactId>-->
 <!--    </dependency>-->
-    <dependency>
-      <groupId>org.w3c.dom</groupId>
-      <artifactId>dom</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>sax</groupId>
-      <artifactId>sax</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jsse</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jnet</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jcert</artifactId>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>org.w3c.dom</groupId>-->
+<!--      <artifactId>dom</artifactId>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>sax</groupId>-->
+<!--      <artifactId>sax</artifactId>-->
+<!--    </dependency>-->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -112,7 +96,7 @@
     </dependency>
     <dependency>
       <groupId>iaik.prod</groupId>
-      <artifactId>iaik_moa_full</artifactId>
+      <artifactId>iaik_moa</artifactId>
     </dependency>
     <dependency>
       <groupId>iaik.prod</groupId>
@@ -126,33 +110,106 @@
     <dependency>
       <groupId>iaik.prod</groupId>
       <artifactId>iaik_ecc</artifactId>
+      <scope>compile</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.win32</groupId>
-      <artifactId>Pkcs11Wrapper</artifactId>
-			<type>dll</type>
-			<version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>MOA</groupId>
-      <artifactId>common</artifactId>
-<!--      <scope>system</scope>-->
-<!--      <systemPath>${basedir}/../../../common/target</systemPath>-->
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>iaik.prod</groupId>-->
+<!--      <artifactId>iaik_Pkcs11Wrapper</artifactId>-->
+<!--			<classifier>win32</classifier>-->
+<!--			<type>dll</type>-->
+<!--			<version>1.0</version>-->
+<!--    </dependency>-->
     <dependency>
       <groupId>MOA</groupId>
-      <artifactId>common-test</artifactId>
-      <scope>system</scope>
-      <systemPath>${basedir}/../../../common-test/target</systemPath>
+      <artifactId>moa-common</artifactId>
     </dependency>
   </dependencies>
+  <build>
+      <plugins>
+      <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>Postconfitions:</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/resources/data/deploy/tools/certtool.bat b/spss/server/serverlib/resources/data/deploy/tools/certtool.bat
deleted file mode 100644
index 0504211b8..000000000
--- a/spss/server/serverlib/resources/data/deploy/tools/certtool.bat
+++ /dev/null
@@ -1,25 +0,0 @@
-@echo off

-

-rem

-rem Script to invoke the CertTool class

-rem 

-rem Author: Patrick Peck

-rem Version: $Id: certtool.bat,v 1.6 2003/05/08 11:46:29 peck Exp $

-rem

-

-

-if %OS%=="Windows_NT" @setlocal

-

-set CERTTOOL=at.gv.egovernment.moa.spss.server.tools.CertTool

-set TOOLSPATH=%~p0

-set CLASSPATH=%TOOLSPATH%tools.jar;%TOOLSPATH%iaik_moa_full.jar;%TOOLSPATH%iaik_jce_full.jar;%TOOLSPATH%iaik_ecc.jar;%TOOLSPATH%log4j-1.2.7.jar

-

-if "%JAVA_HOME%"=="" goto noJavaHome

-%JAVA_HOME%\bin\java.exe -classpath %CLASSPATH% %CERTTOOL% %1 %2 %3 %4 %5 %6 %7 %8 %9

-goto end

-

-:noJavaHome

-echo error: JAVA_HOME not defined

-

-:end

-if %OS%=="Windows_NT" @endlocal
\ No newline at end of file
diff --git a/spss/server/serverlib/resources/data/deploy/tools/certtool.sh b/spss/server/serverlib/resources/data/deploy/tools/certtool.sh
deleted file mode 100644
index c7ff374f4..000000000
--- a/spss/server/serverlib/resources/data/deploy/tools/certtool.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-#
-# Script to invoke the CertTool class	
-#
-# Author:Patrick Peck
-# Version: $Id: certtool.sh,v 1.9 2003/06/23 16:01:27 peck Exp $
-#
-
-
-if [ -z "$JAVA_HOME" ]; then 
-  echo "error: JAVA_HOME not defined";
-  exit;
-fi
-
-CERTOOL=at.gv.egovernment.moa.spss.server.tools.CertTool
-TOOLSPATH=`dirname $PWD/$0`
-CLASSPATH=$TOOLSPATH/tools.jar:$TOOLSPATH/iaik_moa_full.jar:$TOOLSPATH/iaik_jce_full.jar:$TOOLSPATH/iaik_ecc.jar:$TOOLSPATH/log4j-1.2.7.jar
-
-$JAVA_HOME/bin/java -classpath $CLASSPATH $CERTOOL $*
diff --git a/spss/server/serverlib/resources/data/deploy/tools/configtool.bat b/spss/server/serverlib/resources/data/deploy/tools/configtool.bat
deleted file mode 100644
index 868df11f0..000000000
--- a/spss/server/serverlib/resources/data/deploy/tools/configtool.bat
+++ /dev/null
@@ -1,25 +0,0 @@
-@echo off

-

-rem

-rem Script to invoke the ConfigTool class

-rem 

-rem Author: Gregor Karlinger

-rem Version: $Id:  $

-rem

-

-

-if %OS%=="Windows_NT" @setlocal

-

-set CONFIGTOOL=at.gv.egovernment.moa.spss.server.tools.ConfigTool

-set TOOLSPATH=%~p0

-set CLASSPATH=%TOOLSPATH%tools.jar;%TOOLSPATH%xalan.jar;

-

-if "%JAVA_HOME%"=="" goto noJavaHome

-%JAVA_HOME%\bin\java.exe -classpath %CLASSPATH% %CONFIGTOOL% %1 %2 %3 %4 %5 %6 %7 %8 %9

-goto end

-

-:noJavaHome

-echo error: JAVA_HOME not defined

-

-:end

-if %OS%=="Windows_NT" @endlocal
\ No newline at end of file
diff --git a/spss/server/serverlib/resources/data/deploy/tools/configtool.sh b/spss/server/serverlib/resources/data/deploy/tools/configtool.sh
deleted file mode 100644
index f7f29bae1..000000000
--- a/spss/server/serverlib/resources/data/deploy/tools/configtool.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-#
-# Script to invoke the ConfigTool class	
-#
-# Author: Gregor Karlinger
-# Version: $Id:  $
-#
-
-
-if [ -z "$JAVA_HOME" ]; then 
-  echo "error: JAVA_HOME not defined";
-  exit;
-fi
-
-CONFIGTOOL=at.gv.egovernment.moa.spss.server.tools.ConfigTool
-TOOLSPATH=`dirname $PWD/$0`
-CLASSPATH=$TOOLSPATH/tools.jar:$TOOLSPATH/xalan.jar
-
-$JAVA_HOME/bin/java -classpath $CLASSPATH $CONFIGTOOL $*
diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/tools/CertTool.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/tools/CertTool.java
deleted file mode 100644
index 9fe17eae2..000000000
--- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/tools/CertTool.java
+++ /dev/null
@@ -1,242 +0,0 @@
-package at.gv.egovernment.moa.spss.server.tools;
-
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.security.cert.CertificateException;
-
-import iaik.asn1.structures.Name;
-import iaik.pki.store.certstore.CertStoreException;
-import iaik.pki.store.certstore.CertStoreTypes;
-import iaik.pki.store.certstore.directory.DirectoryCertStore;
-import iaik.pki.store.certstore.directory.DirectoryCertStoreParameters;
-import iaik.pki.store.certstore.directory.DirectoryStoreException;
-import iaik.security.ecc.provider.ECCProvider;
-import iaik.security.provider.IAIK;
-import iaik.utils.RFC2253NameParserException;
-import iaik.x509.X509Certificate;
-
-/**
- * A tool to support X509 certificate handling for configuring the MOA SP/SS 
- * service.
- * 
- * This class provides functions for:
- * <ul>
- * <li>printing certificate information</li>
- * <li>adding certificates to the cert store</li>
- * </ul> 
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class CertTool {
-
-  /** Error message if the DN cannot be parsed according to RFC2253. */
-  private static final String ILLEGAL_RFC2253_NAME =
-    "Kein gültiger RFC2253-Name";
-
-  /**
-   * Main entry point of the tool.
-   * 
-   * @param args The command line arguments. A single argument is expected,
-   * which is the file name of the X509 certificate to inspect.
-   */
-  public static void main(String args[]) {
-    CertTool certTool = new CertTool();
-
-    if (args.length == 2 && "-info".equals(args[0])) {
-      initProviders();
-      certTool.printCertInfo(args[1], System.out);
-    } else if (args.length == 3 && "-add".equals(args[0])) {
-      initProviders();
-      certTool.addCertToCertStore(args[1], args[2]);
-    } else {
-      certTool.printUsage(System.err);
-    }
-  }
-  
-  /**
-   * Init the JCE providers, depending on the JDK used.
-   * 
-   * Adds the IAIK JCE and IAIK ECC providers.
-   */
-  private static void initProviders() {
-    if (System.getProperty("java.version").startsWith("1.3")) {
-      IAIK.addAsProvider();
-    } else {
-      IAIK.addAsJDK14Provider();
-    }
-    ECCProvider.addAsProvider();
-  }
-
-  /**
-   * Print the information about the certificate.
-   * 
-   * This method will output information about the Subject DN, the Issuer DN and
-   * the serial number of the certificate.
-   * 
-   * @param certFile The name of the certificate file to inspect.
-   * @param out The stream to print the information to.
-   */
-  public void printCertInfo(String certFile, PrintStream out) {
-    try {
-      InputStream is = new BufferedInputStream(new FileInputStream(certFile));
-      X509Certificate cert = new X509Certificate(is);
-      String issuerDN;
-      String serial;
-      String subjectDN;
-
-      try {
-        subjectDN = ((Name) (cert.getSubjectDN())).getRFC2253String();
-      } catch (RFC2253NameParserException e) {
-        subjectDN = ILLEGAL_RFC2253_NAME;
-      }
-
-      try {
-        issuerDN = ((Name) (cert.getIssuerDN())).getRFC2253String();
-      } catch (RFC2253NameParserException e) {
-        issuerDN = ILLEGAL_RFC2253_NAME;
-      }
-
-      serial = cert.getSerialNumber().toString();
-
-      out.println("SubjectDN (RFC2253): " + subjectDN);
-      out.println("IssuerDN (RFC2253) : " + issuerDN);
-      out.println("Serial Number      : " + serial);
-    } catch (FileNotFoundException e) {
-      System.err.println("Zertifikat nicht gefunden: " + certFile);
-    } catch (IOException e) {
-      System.err.println(
-        "I/O Fehler beim Lesen des Zertifikats: " + e.getMessage());
-    } catch (CertificateException e) {
-      System.err.println(
-        "Fehler beim Lesen des Zertifikats: " + e.getMessage());
-    } catch (Throwable t) {
-      System.err.println("Allgemeiner Fehler: " + t.getMessage());
-    }
-  }
-
-  /**
-   * Add a certificate to a directory certificate store.
-   * 
-   * @param certFile The certificate to add.
-   * @param certStoreRoot The root directory of the certificate store.
-   */
-  public void addCertToCertStore(String certFile, String certStoreRoot) {
-    try {
-      // read the certificate
-      InputStream is = new BufferedInputStream(new FileInputStream(certFile));
-      X509Certificate cert = new X509Certificate(is);
-
-      // initialize the DirectoryCertStore
-      DirectoryCertStore certStore =
-        new DirectoryCertStore(
-          new SimpleDirectoryCertStoreParameters(certStoreRoot),
-          null);
-      
-      certStore.storeCertificate(cert, null);
-      
-      System.out.println("\nDas Zertifikat wurde erfolreich hinzugefügt.\n");
-
-    } catch (FileNotFoundException e) {
-      System.err.println("Zertifikat nicht gefunden: " + certFile);
-    } catch (IOException e) {
-      System.err.println(
-        "I/O Fehler beim Lesen des Zertifikats: " + e.getMessage());
-    } catch (CertificateException e) {
-      System.err.println(
-        "Fehler beim Lesen des Zertifikats: " + e.getMessage());
-    } catch (DirectoryStoreException e) {
-      System.err.println(
-        "Fehler beim Öffnen des Zertifikatsspeichers: " + e.getMessage());
-    } catch (CertStoreException e) {
-      System.err.println(
-        "Fehler beim Hinzufügen des Zertifikats: " + e.getMessage());
-    } catch (Throwable t) {
-      System.err.println("Allgemeiner Fehler: " + t.getMessage());
-      t.printStackTrace();
-    }
-  }
-
-  /**
-   * Print tool usage.
-   * 
-   * @param out The <code>PrintStream</code> to print to.
-   */
-  private void printUsage(PrintStream out) {
-    out.println("\nCerttool-Syntax:\n");
-    out.println("-info <X509 Zertifikatsdatei");
-    out.println();
-    out.println("-add  <X509 Zertifikatsdatei> <Zertifikatsspeicher>");
-    out.println("\n");
-  }
-
-}
-
-/**
- * Simple implementation of the <code>DirectoryCertStoreParameters</code>
- * interface intelligent enough for setting up a simple
- * <code>DirectoryCertStore</code> in the <code>CertTool</code>.
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-class SimpleDirectoryCertStoreParameters
-  implements DirectoryCertStoreParameters {
-
-  /** The cert store root directory. */
-  private String rootDirectory;
-
-  /**
-   * Create a new <code>SimpleDirectoryCertStoreParameters</code> object.
-   * 
-   * @param rootDirectory The root directory of the cert store.
-   */
-  public SimpleDirectoryCertStoreParameters(String rootDirectory) {
-    this.rootDirectory = rootDirectory;
-  }
-
-  /**
-   * @return <code>&quot;MOA Directory CertStore&quot;</code>
-   * @see iaik.pki.store.certstore.CertStoreParameters#getId()
-   */
-  public String getId() {
-    return "MOA Directory CertStore";
-  }
-
-  /**
-   * @return CertStoreTypes.DIRECTORY
-   * @see iaik.pki.store.certstore.CertStoreParameters#getType()
-   */  
-  public String getType() {
-    return CertStoreTypes.DIRECTORY;
-  }
-
-  /**
-   * @return <code>false</code>
-   * @see iaik.pki.store.certstore.CertStoreParameters#isReadOnly()
-   */
-  public boolean isReadOnly() {
-    return false;
-  }
-
-  /**
-   * @return <code>false</code>
-   * @see iaik.pki.store.certstore.directory.DirectoryCertStoreParameters#createNew()
-   */
-  public boolean createNew() {
-    return false;
-  }
-
-  /**
-   * @return The root directory given at construction time.
-   * @see iaik.pki.store.certstore.directory.DirectoryCertStoreParameters#getRootDirectory()
-   */
-  public String getRootDirectory() {
-    return rootDirectory;
-  }
-
-}
\ No newline at end of file
diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/tools/ConfigTool.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/tools/ConfigTool.java
deleted file mode 100644
index d5c3b48c1..000000000
--- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/tools/ConfigTool.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package at.gv.egovernment.moa.spss.server.tools;
-
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-/**
- * A tool for converting a MOA SPSS Version 1.0 configuration file into
- * a Version 1.3 configuration file.
- * 
- * @author Gregor Karlinger
- * @version $Id$
- */
-public class ConfigTool
-{
- 	public static void main(String[] args)
-  {  
-    if (args == null || args.length != 2)
-    {
-      System.out.println("Usage: ConfigTool <MOA.SPSS.1-0.ConfigFile.xml> <MOA.SPSS.1-3.ConfigFile.xml>");
-      System.out.println("  <MOA.SPSS.1-0.ConfigFile.xml> ... Old config file to be transformed");
-      System.out.println("  <MOA.SPSS.1-3.ConfigFile.xml> ... New config file resulting from the transform");
-      System.exit(-1);
-    }
- 	  
- 	  try
-    {
- 	    TransformerFactory tFactory = TransformerFactory.newInstance();
- 	    Transformer transformer = tFactory.newTransformer(new StreamSource(
- 	      ConfigTool.class.getResourceAsStream("/resources/tools/ConfigurationMapper.xsl")));
-      transformer.transform(new StreamSource(args[0]), new StreamResult(new FileOutputStream(args[1])));
-    	
-    	System.out.println("Successfully mapped configuration file.");
-    }
-    catch (TransformerConfigurationException e)
-    {
-      System.err.println("An error occurred during mapping the configuration file:");
-      System.err.println("  Cannot initialize XSLT transform.");
-      System.err.println("  " + e.getMessage());
-    }
-    catch (FileNotFoundException e)
-    {
-      System.err.println("An error occurred during mapping the configuration file:");
-      System.err.println("  There is a problem with the filename for the new configuration file.");
-      System.err.println("  " + e.getMessage());
-    }
-    catch (TransformerException e)
-    {
-      System.err.println("An error occurred during mapping the configuration file:");
-      System.err.println("  " + e.getMessage());
-    }
-  }
-}
diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/overview.htm b/spss/server/serverlib/src/main/javadoc/overview.html
index 9b17bbf91..9b17bbf91 100644
--- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/overview.htm
+++ b/spss/server/serverlib/src/main/javadoc/overview.html