A lot of moa sig stuff

254 files changed, 3764 insertions, 2961 deletions

diff --git a/moaSig/build.gradle b/moaSig/build.gradle
index 951632c..b7ed724 100644
--- a/moaSig/build.gradle
+++ b/moaSig/build.gradle
@@ -1,3 +1,14 @@
+buildscript {
+  repositories {
+    maven {
+      url "https://plugins.gradle.org/m2/"
+    }
+  }
+  dependencies {
+    classpath "com.bmuschko:gradle-tomcat-plugin:2.2.4"
+  }
+}
+
 subprojects {
     apply plugin: 'java'
     apply plugin: 'eclipse'
@@ -10,10 +21,10 @@ subprojects {
         testCompile 'junit:junit:4.8.2'
     }
 
-    version = '1.0'
+    version = '3.0.0-RC1'
 
     jar {
-        manifest.attributes provider: 'my cool company'
+        manifest.attributes provider: 'EGIZ'
     }
 }
 
diff --git a/moaSig/common/build.gradle b/moaSig/common/build.gradle
index 998ccbe..9b88188 100644
--- a/moaSig/common/build.gradle
+++ b/moaSig/common/build.gradle
@@ -3,7 +3,7 @@ dependencies {
 
 	compile 'org.slf4j:slf4j-api:1.7.12'
 	compile 'xerces:xercesImpl:2.11.0'
-	compile 'xalan:xalan:2.7.2'
+	compile 'xalan:xalan:2.7.1'
 	compile 'joda-time:joda-time:2.8.2'
 	compile 'jaxen:jaxen:1.1.6'
 }
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/logging/LogMsg.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/logging/LogMsg.java
index 51667f0..9eb84fa 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/logging/LogMsg.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/logging/LogMsg.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.logging;
+package at.gv.egovernment.moaspss.logging;
 
 /**
  * A unified message type to log messages from inside the MOA subsystem.
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/logging/Logger.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/logging/Logger.java
index 7cb2e7d..532a8be 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/logging/Logger.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/logging/Logger.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.logging;
+package at.gv.egovernment.moaspss.logging;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/logging/LoggingContext.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/logging/LoggingContext.java
index db4b93a..0fb0e7d 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/logging/LoggingContext.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/logging/LoggingContext.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.logging;
+package at.gv.egovernment.moaspss.logging;
 
 /**
  * Encapsulates contextual information (i.e. per request information) for
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/logging/LoggingContextManager.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/logging/LoggingContextManager.java
index f0d7b4c..b4cd294 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/logging/LoggingContextManager.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/logging/LoggingContextManager.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.logging;
+package at.gv.egovernment.moaspss.logging;
 
 /**
  * Provides each thread with a single instance of <code>LoggingContext</code>.
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/Base64Utils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Base64Utils.java
index 66bf503..25a19bc 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/Base64Utils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Base64Utils.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/BoolUtils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/BoolUtils.java
index 492aca9..56eab08 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/BoolUtils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/BoolUtils.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 /**
  * Utility class for parsing XML schema boolean values.
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/CollectionUtils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/CollectionUtils.java
index 8597e1e..01a80ea 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/CollectionUtils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/CollectionUtils.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/Constants.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Constants.java
index 5fc0d4d..45e7d8a 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/Constants.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Constants.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import java.util.HashMap;
 
@@ -381,6 +381,16 @@ public interface Constants {
   public static final String XENC_SCHEMA_LOCATION =
     SCHEMA_ROOT + "xenc-schema.xsd";
 
+  /* Prefix used for the XML Encryption XML namespace */
+  public static final String SAML2_METADATA_PREFIX = "md";
+  
+  /* Prefix used for the XML Encryption XML namespace */
+  public static final String SAML2_METADATA_URI = "urn:oasis:names:tc:SAML:2.0:metadata";
+
+  /* Local location of the XML Encryption XML schema definition. */
+  public static final String SAML2_METADATA_SCHEMA_LOCATION =
+    SCHEMA_ROOT + "saml-schema-metadata-2.0.xsd";
+  
   /**
    * Contains all namespaces and local schema locations for XML schema
    * definitions relevant for MOA. For use in validating XML parsers.
@@ -413,7 +423,8 @@ public interface Constants {
       + (SAML2P_NS_URI + " " + SAML2P_SCHEMA_LOCATION + " ")
       + (STORK_NS_URI + " " + STORK_SCHEMA_LOCATION + " ")
       + (STORKP_NS_URI + " " + STORKP_SCHEMA_LOCATION + " ")
-      + (XENC_NS_URI + " " + XENC_SCHEMA_LOCATION);
+      + (XENC_NS_URI + " " + XENC_SCHEMA_LOCATION + " ")
+      + (SAML2_METADATA_URI + " " + SAML2_METADATA_SCHEMA_LOCATION);
 
   /** URN prefix for bPK and wbPK. */
   public static final String URN_PREFIX = "urn:publicid:gv.at";
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/DOMUtils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/DOMUtils.java
index 2b816ed..c5550ad 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/DOMUtils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/DOMUtils.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -68,7 +68,7 @@ import org.xml.sax.ErrorHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moaspss.logging.Logger;
 
 /**
  * Various utility functions for handling XML DOM trees.
@@ -246,7 +246,10 @@ public class DOMUtils {
 	    parser.setFeature(CREATE_ENTITY_REF_NODES_FEATURE, false);
 	    parser.setFeature(EXTERNAL_GENERAL_ENTITIES_FEATURE, false);
 	    parser.setFeature(EXTERNAL_PARAMETER_ENTITIES_FEATURE, false);
-	
+	    
+	    //fix XXE problem
+	    //parser.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+	    
 	    if (validating) {
 	      if (externalSchemaLocations != null) {
 	        parser.setProperty(
@@ -270,10 +273,11 @@ public class DOMUtils {
 	
 	    // parse the document and return it
 	    // if debug is enabled: use copy of strem (baStream) else use orig stream
+	    
 	    if(null != baStream)
 	    	parser.parse(new InputSource(baStream));
 	    else 
-			parser.parse(new InputSource(inputStream));
+	    	parser.parse(new InputSource(inputStream));
     } catch(SAXException e) {
 			if(true == Logger.isDebugEnabled() && null != buffer) {
 				String xmlContent = new String(buffer);
@@ -519,7 +523,6 @@ public class DOMUtils {
     parser.setFeature(EXTERNAL_GENERAL_ENTITIES_FEATURE, false);
     parser.setFeature(DISALLOW_DOCTYPE_FEATURE, true);
     
-    
     if (externalSchemaLocations != null) {
       parser.setProperty(
         EXTERNAL_SCHEMA_LOCATION_PROPERTY,
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/DateTimeUtils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/DateTimeUtils.java
index a2e0965..c199c29 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/DateTimeUtils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/DateTimeUtils.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import java.io.StringWriter;
 import java.text.DateFormat;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/Empty.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Empty.java
index 533b39b..9c678d4 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/Empty.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Empty.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 /**
  * @author <a href="mailto:thomas.knall@iaik.tugraz.at">Thomas Knall</a>
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/EntityResolverChain.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/EntityResolverChain.java
index 7213d03..487c6a4 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/EntityResolverChain.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/EntityResolverChain.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/FileUtils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/FileUtils.java
index a70d62e..309e01a 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/FileUtils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/FileUtils.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import java.io.BufferedInputStream;
 import java.io.File;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/KeyStoreUtils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/KeyStoreUtils.java
index 3d28f4f..b4d7b02 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/KeyStoreUtils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/KeyStoreUtils.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import iaik.x509.X509Certificate;
 
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/MOADefaultHandler.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOADefaultHandler.java
index 7a79bd9..3dde827 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/MOADefaultHandler.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOADefaultHandler.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import java.io.IOException;
 
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/MOAEntityResolver.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOAEntityResolver.java
index 8f3ffd4..7f529ca 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/MOAEntityResolver.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOAEntityResolver.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import java.io.InputStream;
 
@@ -31,8 +31,8 @@ import org.apache.xerces.util.URI.MalformedURIException;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moaspss.logging.LogMsg;
+import at.gv.egovernment.moaspss.logging.Logger;
 
 /**
  * An <code>EntityResolver</code> that looks up entities stored as
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/MOAErrorHandler.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOAErrorHandler.java
index 3769b26..1842d03 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/MOAErrorHandler.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOAErrorHandler.java
@@ -22,14 +22,14 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import org.apache.xml.utils.DefaultErrorHandler;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moaspss.logging.LogMsg;
+import at.gv.egovernment.moaspss.logging.Logger;
 
 /**
  * An <code>ErrorHandler</code> that logs a message and throws a
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/MOATimer.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOATimer.java
index acc380d..8542b58 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/MOATimer.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOATimer.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import java.util.Map;
 import java.util.WeakHashMap;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/MessageProvider.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MessageProvider.java
index 1623ff1..da97ea1 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/MessageProvider.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MessageProvider.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import java.util.Locale;
 
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/Messages.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Messages.java
index 20de46b..6e324b7 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/Messages.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Messages.java
@@ -22,14 +22,14 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import java.text.MessageFormat;
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.PropertyResourceBundle;
 
-import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moaspss.logging.Logger;
 
 /**
  * Provides access to the system messages resource used for exception handling
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/MiscUtil.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MiscUtil.java
index 2a5e1b8..5510ac8 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/MiscUtil.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MiscUtil.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -41,8 +41,8 @@ import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.util.ex.EgovUtilException;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.util.ex.EgovUtilException;
 
 
 
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/NodeIteratorAdapter.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/NodeIteratorAdapter.java
index fdc8232..998edb4 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/NodeIteratorAdapter.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/NodeIteratorAdapter.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import java.util.ListIterator;
 
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/NodeListAdapter.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/NodeListAdapter.java
index e39cc02..d88ef4b 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/NodeListAdapter.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/NodeListAdapter.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import java.util.List;
 
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/OutputXML2File.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/OutputXML2File.java
index e3f8f75..e4e6cc5 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/OutputXML2File.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/OutputXML2File.java
@@ -28,11 +28,11 @@
  * @author rschamberger
  * $ID$
  */
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import org.w3c.dom.Element;
 
-import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moaspss.logging.Logger;
 
 /**
  * utility functions to write XML data to files
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/ResourceBundleChain.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/ResourceBundleChain.java
index 234ed89..1edad95 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/ResourceBundleChain.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/ResourceBundleChain.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/SSLUtils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/SSLUtils.java
index c2c67ec..5078f01 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/SSLUtils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/SSLUtils.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/StreamEntityResolver.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/StreamEntityResolver.java
index b3bc8ae..5d328cf 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/StreamEntityResolver.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/StreamEntityResolver.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/StreamUtils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/StreamUtils.java
index e4ccd12..f3abe9c 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/StreamUtils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/StreamUtils.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/StringUtils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/StringUtils.java
index ad879d2..695be18 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/StringUtils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/StringUtils.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import java.util.StringTokenizer;
 
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/URLDecoder.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/URLDecoder.java
index 66739a7..af71e2d 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/URLDecoder.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/URLDecoder.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/URLEncoder.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/URLEncoder.java
index e6df1fd..2aa7e22 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/URLEncoder.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/URLEncoder.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.StringWriter;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/XPathException.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/XPathException.java
index 0d20752..cbf3e4e 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/XPathException.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/XPathException.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import java.io.PrintStream;
 import java.io.PrintWriter;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/XPathUtils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/XPathUtils.java
index 89aeaf3..2604c20 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/XPathUtils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/XPathUtils.java
@@ -22,7 +22,7 @@
  */
 
 
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
 
 import java.util.List;
 import java.util.Map;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/ex/EgovUtilException.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/ex/EgovUtilException.java
index 733a2a8..27169b4 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/ex/EgovUtilException.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/ex/EgovUtilException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package at.gv.egovernment.moa.util.ex;
+package at.gv.egovernment.moaspss.util.ex;
 
 public class EgovUtilException extends Exception {
 
diff --git a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/MOATestCase.java b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/MOATestCase.java
index 5d1c537..1754ead 100644
--- a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/MOATestCase.java
+++ b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/MOATestCase.java
@@ -34,11 +34,10 @@ import org.w3c.dom.Document;
 
 import org.xml.sax.InputSource;
 
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.DOMUtils;
 import junit.framework.TestCase;
 
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-
 /**
  * Base class for MOA test cases.
  * 
diff --git a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/DOMUtilsTest.java b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/DOMUtilsTest.java
index 1a2b690..e62d896 100644
--- a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/DOMUtilsTest.java
+++ b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/DOMUtilsTest.java
@@ -30,11 +30,10 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.DOMUtils;
 import test.at.gv.egovernment.moa.*;
 
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-
 /**
  * @author Patrick Peck
  * @version $Id$
diff --git a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/DateTimeUtilsTest.java b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/DateTimeUtilsTest.java
index e3468b8..56f7578 100644
--- a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/DateTimeUtilsTest.java
+++ b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/DateTimeUtilsTest.java
@@ -31,10 +31,9 @@ import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
 
+import at.gv.egovernment.moaspss.util.DateTimeUtils;
 import junit.framework.TestCase;
 
-import at.gv.egovernment.moa.util.DateTimeUtils;
-
 /**
  * @author Patrick Peck
  * @version $Id$
diff --git a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java
index 2433eca..5e0c8fb 100644
--- a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java
+++ b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java
@@ -34,8 +34,7 @@ import java.security.Security;
 import java.security.cert.X509Certificate;
 import java.util.Enumeration;
 
-import at.gv.egovernment.moa.util.KeyStoreUtils;
-
+import at.gv.egovernment.moaspss.util.KeyStoreUtils;
 import junit.framework.TestCase;
 
 /**
diff --git a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/SSLUtilsTest.java b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/SSLUtilsTest.java
index 2b5094f..31a0591 100644
--- a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/SSLUtilsTest.java
+++ b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/SSLUtilsTest.java
@@ -32,12 +32,13 @@ import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLSocketFactory;
 
 import junit.framework.TestCase;
-import at.gv.egovernment.moa.util.KeyStoreUtils;
-import at.gv.egovernment.moa.util.SSLUtils;
 
 import com.sun.net.ssl.HostnameVerifier;
 import com.sun.net.ssl.HttpsURLConnection;
 
+import at.gv.egovernment.moaspss.util.KeyStoreUtils;
+import at.gv.egovernment.moaspss.util.SSLUtils;
+
 /**
  * @author Paul Ivancsics
  * @version $Id$
diff --git a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/URLDecoderTest.java b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/URLDecoderTest.java
index 2ded896..7513b51 100644
--- a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/URLDecoderTest.java
+++ b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/URLDecoderTest.java
@@ -26,9 +26,8 @@ package test.at.gv.egovernment.moa.util;
 
 import java.net.URLEncoder;
 
-import at.gv.egovernment.moa.util.FileUtils;
-import at.gv.egovernment.moa.util.URLDecoder;
-
+import at.gv.egovernment.moaspss.util.FileUtils;
+import at.gv.egovernment.moaspss.util.URLDecoder;
 import junit.framework.TestCase;
 
 /*
diff --git a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/URLEncoderTest.java b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/URLEncoderTest.java
index 5f72c8a..78c3c7c 100644
--- a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/URLEncoderTest.java
+++ b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/URLEncoderTest.java
@@ -24,9 +24,9 @@
 
 package test.at.gv.egovernment.moa.util;
 
-import at.gv.egovernment.moa.util.FileUtils;
-import at.gv.egovernment.moa.util.URLDecoder;
-import at.gv.egovernment.moa.util.URLEncoder;
+import at.gv.egovernment.moaspss.util.FileUtils;
+import at.gv.egovernment.moaspss.util.URLDecoder;
+import at.gv.egovernment.moaspss.util.URLEncoder;
 import junit.framework.TestCase;
 
 /*
diff --git a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java
index dfe7a53..b471fe6 100644
--- a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java
+++ b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java
@@ -35,10 +35,9 @@ import org.apache.xerces.xni.grammars.XMLGrammarDescription;
 import org.apache.xerces.xni.parser.XMLInputSource;
 import org.xml.sax.InputSource;
 
+import at.gv.egovernment.moaspss.util.Constants;
 import test.at.gv.egovernment.moa.MOATestCase;
 
-import at.gv.egovernment.moa.util.Constants;
-
 
 /**
  * Experimentation with Xerces grammar caching.
diff --git a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/XPathUtilsTest.java b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/XPathUtilsTest.java
index 15e6a62..f2b216f 100644
--- a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/XPathUtilsTest.java
+++ b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/XPathUtilsTest.java
@@ -26,10 +26,9 @@ package test.at.gv.egovernment.moa.util;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 
+import at.gv.egovernment.moaspss.util.XPathUtils;
 import test.at.gv.egovernment.moa.MOATestCase;
 
-import at.gv.egovernment.moa.util.XPathUtils;
-
 
 /**
  * @author Patrick Peck
diff --git a/moaSig/libs/iaik_cpades.jar b/moaSig/libs/iaik_cpades.jar
index 9deb1bf..3116980 100644
--- a/moaSig/libs/iaik_cpades.jar
+++ b/moaSig/libs/iaik_cpades.jar
diff --git a/moaSig/libs/iaik_moa.jar b/moaSig/libs/iaik_moa.jar
index 8d274c6..0e4f72a 100644
--- a/moaSig/libs/iaik_moa.jar
+++ b/moaSig/libs/iaik_moa.jar
diff --git a/moaSig/libs/iaik_pki.jar b/moaSig/libs/iaik_pki.jar
deleted file mode 100644
index 9c89086..0000000
--- a/moaSig/libs/iaik_pki.jar
+++ /dev/null
diff --git a/moaSig/libs/iaik_pki_module.jar b/moaSig/libs/iaik_pki_module.jar
index 01379aa..eb6b2ad 100644
--- a/moaSig/libs/iaik_pki_module.jar
+++ b/moaSig/libs/iaik_pki_module.jar
diff --git a/moaSig/libs/iaik_sigval.jar b/moaSig/libs/iaik_sigval.jar
index 4aa741e..1e69ad3 100644
--- a/moaSig/libs/iaik_sigval.jar
+++ b/moaSig/libs/iaik_sigval.jar
diff --git a/moaSig/libs/iaik_sigvallib.jar b/moaSig/libs/iaik_sigvallib.jar
index b2d8184..cc60786 100644
--- a/moaSig/libs/iaik_sigvallib.jar
+++ b/moaSig/libs/iaik_sigvallib.jar
diff --git a/moaSig/libs/iaik_tsl-1.1.jar b/moaSig/libs/iaik_tsl-1.1.jar
index 6fa0fef..b4eb067 100644
--- a/moaSig/libs/iaik_tsl-1.1.jar
+++ b/moaSig/libs/iaik_tsl-1.1.jar
diff --git a/moaSig/libs/iaik_xades.jar b/moaSig/libs/iaik_xades.jar
index 73401d7..07ae769 100644
--- a/moaSig/libs/iaik_xades.jar
+++ b/moaSig/libs/iaik_xades.jar
diff --git a/moaSig/libs/iaik_xsect.jar b/moaSig/libs/iaik_xsect.jar
index e891231..b04dc07 100644
--- a/moaSig/libs/iaik_xsect.jar
+++ b/moaSig/libs/iaik_xsect.jar
diff --git a/moaSig/moa-sig-lib/build.gradle b/moaSig/moa-sig-lib/build.gradle
index adb053f..ee39d3c 100644
--- a/moaSig/moa-sig-lib/build.gradle
+++ b/moaSig/moa-sig-lib/build.gradle
@@ -1,3 +1,10 @@
+apply plugin: 'java-library-distribution'
+
+distributions {
+    main{
+        baseName = 'MOA-SPSS'
+    }
+}
 
 dependencies {
 	compile fileTree(dir: '../libs', include: '*.jar')
@@ -11,6 +18,7 @@ dependencies {
 	compile 'org.xerial:sqlite-jdbc:3.8.11.2'
 	compile 'javax.xml.bind:jaxb-api:2.2.12'
 	compile 'com.sun.xml.bind:jaxb-core:2.2.11'
+	compile 'com.sun.xml.bind:jaxb-impl:2.2.11'
 	compile 'org.postgresql:postgresql:9.4-1204-jdbc42'
 }
 
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/MOAException.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/MOAException.java
index 803f3fd..bf7f9af 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/MOAException.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/MOAException.java
@@ -34,10 +34,8 @@ import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import at.gv.egovernment.moa.util.Constants;
-
-
 import at.gv.egovernment.moa.spss.util.MessageProvider;
+import at.gv.egovernment.moaspss.util.Constants;
 
 /**
  * Base class of MOA specific exceptions.
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/MOARuntimeException.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/MOARuntimeException.java
index a3c8565..3a65c48 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/MOARuntimeException.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/MOARuntimeException.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import at.gv.egovernment.moa.spss.util.MessageProvider;
-import at.gv.egovernment.moa.util.Constants;
+import at.gv.egovernment.moaspss.util.Constants;
 
 /**
  * Base class of MOA specific runtime exceptions.
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/Configurator.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/Configurator.java
index 6cbdf7d..59db7b5 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/Configurator.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/Configurator.java
@@ -52,7 +52,7 @@ public abstract class Configurator {
           (Configurator) discover.newInstance(
             Configurator.class,
             DEFAULT_IMPLEMENTATION);*/
-        return new ConfiguratorImpl();
+    	instance = new ConfiguratorImpl();
       } catch (Exception e) {
         // this can not happen since we provide a valid default 
         // implementation
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SPSSFactory.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SPSSFactory.java
index d216569..c6a750e 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SPSSFactory.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SPSSFactory.java
@@ -109,7 +109,7 @@ public abstract class SPSSFactory {
           (SPSSFactory) discover.newInstance(
             SPSSFactory.class,
             DEFAULT_IMPLEMENTATION);*/
-        return new SPSSFactoryImpl();
+        instance = new SPSSFactoryImpl();
       } catch (Exception e) {
         // this can not happen since we provide a valid default 
         // implementation
@@ -469,6 +469,37 @@ public abstract class SPSSFactory {
     CMSDataObject dataObject,
     String trustProfileID,
     boolean pdf);
+  
+  /**
+   * Create a new <code>VerifyCMSSignatureRequest</code> object.
+   * 
+   * @param signatories The indexes of the signatories whose signature is to
+   * be verified.
+   * @param dateTime The date for which the verification is to be performed.
+   * May be <code>null</code>.
+   * @param cmsSignature The CMS signature.
+   * @param dataObject The signed data. May be <code>null</code>.
+   * @param trustProfileID The ID of the trust profile containing the trusted
+   * root certificates.
+   * @return The <code>VerifyCMSSignatureRequest</code> containing the above
+   * data.
+   * 
+   * @pre signatories != null && signatories.length > 0
+   * @pre signaturies != VerifyCMSSignatureRequest.ALL_SIGNATORIES implies
+   *        for (int i = 0;  i < signatories.length; i++)
+   *          signatories[i] >= 1
+   * @pre cmsSignature != null
+   * @pre trustProfileID != null && trustProfileID.length() > 0
+   * @post return != null
+   */
+  public abstract VerifyCMSSignatureRequest createVerifyCMSSignatureRequest(
+    int[] signatories,
+    Date dateTime,
+    InputStream cmsSignature,
+    CMSDataObject dataObject,
+    String trustProfileID,
+    boolean pdf,
+    boolean extended);
 
   /**
    * Create a new <code>CMSDataObject</code> object from data at a given URI.
@@ -583,6 +614,41 @@ public abstract class SPSSFactory {
     SignatureManifestCheckParams signatureManifestParams,
     boolean returnHashInputData,
     String trustProfileID);
+  
+  /**
+   * Create a new <code>VerifyXMLSignatureRequest</code> object.
+   * 
+   * @param dateTime The date for which the verification is to be performed.
+   * May be <code>null</code>.
+   * @param verifySignatureInfo Information about the signature environment and
+   * the location of the signature.
+   * @param supplementProfiles Supplemental information for the signature 
+   * environment. May be <code>null</code>.
+   * @param signatureManifestParams Additional information for checking the
+   * signature manifest. May be <code>null</code>.
+   * @param returnHashInputData If <code>true</code>, hash input data will
+   * be returned in the response, otherwise not.
+   * @param trustProfileID The ID of the trust profile containing the trusted
+   * root certificates.
+   * @param extendedValidation Should the valdation result in forms
+   * @return The new <code>VerifyXMLSignatureRequest</code> containing the
+   * above data.
+   * 
+   * @pre verifySignatureInfo != null
+   * @pre supplementProfiles != null implies
+   *        forall Object o in supplementProfiles | 
+   *          o instanceof at.gv.egovernment.moa.spss.api.xmlverify.SupplementProfile
+   * @pre trustProfileID != null && trustProfileID.length() > 0
+   * @post return != null
+   */
+  public abstract VerifyXMLSignatureRequest createVerifyXMLSignatureRequest(
+		    Date dateTime,
+		    VerifySignatureInfo verifySignatureInfo,
+		    List supplementProfiles,
+		    SignatureManifestCheckParams signatureManifestParams,
+		    boolean returnHashInputData,
+		    String trustProfileID,
+		    boolean extendedValidation);
 
   /**
    * Create a new <code>VerifySignatureInfo</code> object.
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SignatureCreationService.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SignatureCreationService.java
index dfdd13d..05271fb 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SignatureCreationService.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SignatureCreationService.java
@@ -59,7 +59,7 @@ public abstract class SignatureCreationService {
           (SignatureCreationService) discover.newInstance(
             SignatureCreationService.class,
             DEFAULT_IMPLEMENTATION);*/
-        return new SignatureCreationServiceImpl();
+        instance = new SignatureCreationServiceImpl();
       } catch (Exception e) {
         // this can not happen since we provide a valid default 
         // implementation
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SignatureVerificationService.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SignatureVerificationService.java
index 85e2a97..2433e20 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SignatureVerificationService.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SignatureVerificationService.java
@@ -60,7 +60,7 @@ public abstract class SignatureVerificationService {
           (SignatureVerificationService) discover.newInstance(
             SignatureVerificationService.class,
             DEFAULT_IMPLEMENTATION);*/
-        return new SignatureVerificationServiceImpl();
+    	  instance = new SignatureVerificationServiceImpl();
       } catch (Exception e) {
         // this can not happen since we provide a valid default 
         // implementation
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureRequest.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureRequest.java
index 3adb381..6294fb1 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureRequest.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureRequest.java
@@ -75,4 +75,5 @@ public interface VerifyCMSSignatureRequest {
   public String getTrustProfileId();
   
   public boolean isPDF();
+  public boolean isExtended();
 }
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/CanonicalizationTransform.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/CanonicalizationTransform.java
index 988c5bc..05977c5 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/CanonicalizationTransform.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/CanonicalizationTransform.java
@@ -24,7 +24,7 @@
 
 package at.gv.egovernment.moa.spss.api.common;
 
-import at.gv.egovernment.moa.util.Constants;
+import at.gv.egovernment.moaspss.util.Constants;
 
 /**
  * A canonicalization type of <code>Transform</code>.
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/ExclusiveCanonicalizationTransform.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/ExclusiveCanonicalizationTransform.java
index 5c2b633..557ff21 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/ExclusiveCanonicalizationTransform.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/ExclusiveCanonicalizationTransform.java
@@ -26,7 +26,7 @@ package at.gv.egovernment.moa.spss.api.common;
 
 import java.util.List;
 
-import at.gv.egovernment.moa.util.Constants;
+import at.gv.egovernment.moaspss.util.Constants;
 
 /**
  * An exclusive canonicalization type of <code>Transform</code>.
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java
index 478dcb4..9719c29 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java
@@ -21,7 +21,6 @@
  * that you distribute must include a readable copy of the "NOTICE" text file.
  */
 
-
 package at.gv.egovernment.moa.spss.api.impl;
 
 import java.io.InputStream;
@@ -85,576 +84,474 @@ import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
  */
 public class SPSSFactoryImpl extends SPSSFactory {
 
-  public CreateXMLSignatureRequest createCreateXMLSignatureRequest(
-    String keyIdentifier,
-    List singleSignatureInfos) {
-    CreateXMLSignatureRequestImpl createXMLSignatureRequest =
-      new CreateXMLSignatureRequestImpl();
-    createXMLSignatureRequest.setKeyIdentifier(keyIdentifier);
-    createXMLSignatureRequest.setSingleSignatureInfos(singleSignatureInfos);
-    return createXMLSignatureRequest;
-  }
-  
-  public CreateCMSSignatureRequest createCreateCMSSignatureRequest(
-    String keyIdentifier,
-    List singleSignatureInfos) {
-	  CreateCMSSignatureRequestImpl createCMSSignatureRequest =
-		      new CreateCMSSignatureRequestImpl();
-	  createCMSSignatureRequest.setKeyIdentifier(keyIdentifier);
-	  createCMSSignatureRequest.setSingleSignatureInfos(singleSignatureInfos);
-	  return createCMSSignatureRequest;
-	  
-  }
-  
-  public CreateCMSSignatureResponse createCreateCMSSignatureResponse(List responseElements) {
-	  CreateCMSSignatureResponseImpl createCMSSignatureResponse = new CreateCMSSignatureResponseImpl();
-	  createCMSSignatureResponse.setResponseElements(responseElements);
-	  return createCMSSignatureResponse;
-  }
-  
-  
-  public CMSSignatureResponse createCMSSignatureResponse(String base64value) {
-	  CMSSignatureResponseImpl cmsSignatureResponse = new CMSSignatureResponseImpl();
-	  cmsSignatureResponse.setCMSSignature(base64value);
-	  
-	  return cmsSignatureResponse;
-  }
-  
-
-  public SingleSignatureInfo createSingleSignatureInfo(
-    List dataObjectInfos,
-    CreateSignatureInfo createSignatureInfo,
-    boolean securityLayerConform) {
-    SingleSignatureInfoImpl singleSignatureInfo = new SingleSignatureInfoImpl();
-    singleSignatureInfo.setDataObjectInfos(dataObjectInfos);
-    singleSignatureInfo.setCreateSignatureInfo(createSignatureInfo);
-    singleSignatureInfo.setSecurityLayerConform(securityLayerConform);
-    return singleSignatureInfo;
-  }
-  
-  public at.gv.egovernment.moa.spss.api.cmssign.SingleSignatureInfo createSingleSignatureInfoCMS(
-		  at.gv.egovernment.moa.spss.api.cmssign.DataObjectInfo dataObjectInfo,		    
-		    boolean securityLayerConform) {
-		    SingleSignatureInfoCMSImpl singleSignatureInfo = new SingleSignatureInfoCMSImpl();
-		    singleSignatureInfo.setDataObjectInfo(dataObjectInfo);
-		    singleSignatureInfo.setSecurityLayerConform(securityLayerConform);
-		    return singleSignatureInfo;
-		  }
-  
-  public DataObjectInfo createDataObjectInfo(
-    String structure,
-    boolean childOfManifest,
-    Content dataObject,
-    CreateTransformsInfoProfile createTransformsInfoProfile) {
-    DataObjectInfoImpl dataObjectInfo = new DataObjectInfoImpl();
-    dataObjectInfo.setStructure(structure);
-    dataObjectInfo.setChildOfManifest(childOfManifest);
-    dataObjectInfo.setDataObject(dataObject);
-    dataObjectInfo.setCreateTransformsInfoProfile(createTransformsInfoProfile);
-    return dataObjectInfo;
-  }
-  
-  public at.gv.egovernment.moa.spss.api.cmssign.DataObjectInfo createDataObjectInfo(
-		    String structure,
-		    CMSDataObject dataObject) {
-		    DataObjectInfoCMSImpl dataObjectInfo = new DataObjectInfoCMSImpl();
-		    dataObjectInfo.setStructure(structure);
-		    dataObjectInfo.setDataObject(dataObject);
-		    return dataObjectInfo;
-		  }
-
-  public CreateTransformsInfoProfile createCreateTransformsInfoProfile(String profileID) {
-
-    CreateTransformsInfoProfileIDImpl createTransformsInfoProfile =
-      new CreateTransformsInfoProfileIDImpl();
-    createTransformsInfoProfile.setCreateTransformsInfoProfileID(profileID);
-    return createTransformsInfoProfile;
-  }
-
-  public CreateTransformsInfoProfile createCreateTransformsInfoProfile(
-    CreateTransformsInfo transformsInfo,
-    List supplements) {
-    CreateTransformsInfoProfileExplicitImpl createTransformsInfoProfile =
-      new CreateTransformsInfoProfileExplicitImpl();
-    createTransformsInfoProfile.setCreateTransformsInfo(transformsInfo);
-    createTransformsInfoProfile.setSupplements(supplements);
-    return createTransformsInfoProfile;
-  }
-
-  public CreateTransformsInfo createCreateTransformsInfo(
-    List transforms,
-    MetaInfo finalDataMetaInfo) {
-    CreateTransformsInfoImpl createTransformsInfo =
-      new CreateTransformsInfoImpl();
-      
-    createTransformsInfo.setTransforms(transforms);
-    createTransformsInfo.setFinalDataMetaInfo(finalDataMetaInfo);
-    return createTransformsInfo;
-  }
-
-  public CreateSignatureInfo createCreateSignatureInfo(
-    Content createSignatureEnvironment,
-    CreateSignatureEnvironmentProfile createSignatureEnvironmentProfile) {
-    CreateSignatureInfoImpl createSignatureInfo = new CreateSignatureInfoImpl();
-    createSignatureInfo.setCreateSignatureEnvironment(
-      createSignatureEnvironment);
-    createSignatureInfo.setCreateSignatureEnvironmentProfile(
-      createSignatureEnvironmentProfile);
-    return createSignatureInfo;
-  }
-
-  public CreateSignatureEnvironmentProfile createCreateSignatureEnvironmentProfile(
-    CreateSignatureLocation createSignatureLocation,
-    List supplements) {
-    CreateSignatureEnvironmentProfileExplicitImpl createSignatureEnvironmentProfile =
-      new CreateSignatureEnvironmentProfileExplicitImpl();
-    createSignatureEnvironmentProfile.setCreateSignatureLocation(
-      createSignatureLocation);
-    createSignatureEnvironmentProfile.setSupplements(supplements);
-    return createSignatureEnvironmentProfile;
-  }
-
-  public CreateSignatureLocation createCreateSignatureLocation(
-    String signatureLocationXPath,
-    int signatureLocationIndex,
-    Map namespaceDeclarations) {
-    CreateSignatureLocationImpl createSignatureLocation =
-      new CreateSignatureLocationImpl();
-    createSignatureLocation.setIndex(signatureLocationIndex);
-    createSignatureLocation.setNamespaceDeclarations(namespaceDeclarations);
-    createSignatureLocation.setXPathExpression(signatureLocationXPath);
-    return createSignatureLocation;
-  }
-
-  public CreateSignatureEnvironmentProfile createCreateSignatureEnvironmentProfile(String profileID) {
-    CreateSignatureEnvironmentProfileIDImpl createSignatureEnvironmentProfile =
-      new CreateSignatureEnvironmentProfileIDImpl();
-    createSignatureEnvironmentProfile.setCreateSignatureEnvironmentProfileID(
-      profileID);
-    return createSignatureEnvironmentProfile;
-  }
-
-  public CreateXMLSignatureResponse createCreateXMLSignatureResponse(List responseElements) {
-    CreateXMLSignatureResponseImpl createXMLSignatureResponse =
-      new CreateXMLSignatureResponseImpl();
-    createXMLSignatureResponse.setResponseElements(responseElements);
-    return createXMLSignatureResponse;
-  }
-
-  public SignatureEnvironmentResponse createSignatureEnvironmentResponse(Element signatureEnvironment) {
-    SignatureEnvironmentResponseImpl signatureEnvironmentResponse =
-      new SignatureEnvironmentResponseImpl();
-    signatureEnvironmentResponse.setSignatureEnvironment(signatureEnvironment);
-    return signatureEnvironmentResponse;
-  }
-
-  public ErrorResponse createErrorResponse(int code, String info) {
-    ErrorResponseImpl errorResponse = new ErrorResponseImpl();
-    errorResponse.setErrorCode(code);
-    errorResponse.setInfo(info);
-    return errorResponse;
-  }
-
-  public VerifyCMSSignatureRequest createVerifyCMSSignatureRequest(
-    int[] signatories,
-    Date dateTime,
-    InputStream cmsSignature,
-    CMSDataObject dataObject,
-    String trustProfileID,
-    boolean pdf) {
-    VerifyCMSSignatureRequestImpl verifyCMSSignatureRequest =
-      new VerifyCMSSignatureRequestImpl();
-    verifyCMSSignatureRequest.setDateTime(dateTime);
-    verifyCMSSignatureRequest.setCMSSignature(cmsSignature);
-    verifyCMSSignatureRequest.setDataObject(dataObject);
-    verifyCMSSignatureRequest.setTrustProfileId(trustProfileID);
-    verifyCMSSignatureRequest.setSignatories(signatories);
-    verifyCMSSignatureRequest.setPDF(pdf);
-    return verifyCMSSignatureRequest;
-  }
-
-  public CMSDataObject createCMSDataObject(
-    MetaInfo metaInfo,
-    CMSContent content,
-    BigDecimal excludeByteRangeFrom,
-    BigDecimal excludeByteRangeTo) {
-      
-    CMSDataObjectImpl cmsDataObject = new CMSDataObjectImpl();
-    cmsDataObject.setMetaInfo(metaInfo);
-    cmsDataObject.setContent(content);
-    cmsDataObject.setExcludeByteRangeFrom(excludeByteRangeFrom);
-    cmsDataObject.setExcludeByteRangeTo(excludeByteRangeTo);
-    
-    return cmsDataObject;
-  }
-  
-  public CMSContent createCMSContent(InputStream binaryContent) {
-    CMSContentExplicitImpl cmsContent = new CMSContentExplicitImpl();
-    
-    cmsContent.setBinaryContent(binaryContent);
-    return cmsContent;
-  }
-
-  public CMSContent createCMSContent(String referenceURI) {
-    CMSContentReferenceImpl cmsContent = new CMSContentReferenceImpl();
-    
-    cmsContent.setReference(referenceURI);
-    return cmsContent;
-  }  
-  
-
-  public CMSDataObject createCMSDataObject(
-    MetaInfo metaInfo,
-    String referenceURI) {
-    CMSDataObjectImpl cmsDataObject = new CMSDataObjectImpl();
-    CMSContentReferenceImpl cmsContent = new CMSContentReferenceImpl();
-    cmsDataObject.setMetaInfo(metaInfo);
-    cmsContent.setReference(referenceURI);
-    return cmsDataObject;
-  }
-
-  public VerifyCMSSignatureResponse createVerifyCMSSignatureResponse(List responseElements) {
-    VerifyCMSSinatureResponseImpl verifyCMSSignatureResponse =
-      new VerifyCMSSinatureResponseImpl();
-    verifyCMSSignatureResponse.setResponseElements(responseElements);
-    return verifyCMSSignatureResponse;
-  }
-
-  public VerifyCMSSignatureResponseElement createVerifyCMSSignatureResponseElement(
-    SignerInfo signerInfo,
-    CheckResult signatureCheck,
-    CheckResult certificateCheck, 
-    List adesResult) {
-    VerifyCMSSignatureResponseElementImpl verifyCMSSignatureResponseElement =
-      new VerifyCMSSignatureResponseElementImpl();
-    verifyCMSSignatureResponseElement.setSignerInfo(signerInfo);
-    verifyCMSSignatureResponseElement.setSignatureCheck(signatureCheck);
-    verifyCMSSignatureResponseElement.setCertificateCheck(certificateCheck);
-    verifyCMSSignatureResponseElement.setAdESFormResults(adesResult);
-    return verifyCMSSignatureResponseElement;
-  }
-
-  public VerifyXMLSignatureRequest createVerifyXMLSignatureRequest(
-    Date dateTime,
-    VerifySignatureInfo verifySignatureInfo,
-    List supplementProfiles,
-    SignatureManifestCheckParams signatureManifestParams,
-    boolean returnHashInputData,
-    String trustProfileID) {
-    VerifyXMLSignatureRequestImpl verifyXMLSignatureRequest =
-      new VerifyXMLSignatureRequestImpl();
-    verifyXMLSignatureRequest.setDateTime(dateTime);
-    verifyXMLSignatureRequest.setSignatureInfo(verifySignatureInfo);
-    verifyXMLSignatureRequest.setSupplementProfiles(supplementProfiles);
-    verifyXMLSignatureRequest.setSignatureManifestCheckParams(
-      signatureManifestParams);
-    verifyXMLSignatureRequest.setReturnHashInputData(returnHashInputData);
-    verifyXMLSignatureRequest.setTrustProfileId(trustProfileID);
-    return verifyXMLSignatureRequest;
-  }
-
-  public VerifySignatureInfo createVerifySignatureInfo(
-    Content verifySignatureEnvironment,
-    VerifySignatureLocation verifySignatureLocation) {
-    VerifySignatureInfoImpl verifySignatureInfo = new VerifySignatureInfoImpl();
-    verifySignatureInfo.setVerifySignatureEnvironment(
-      verifySignatureEnvironment);
-    verifySignatureInfo.setVerifySignatureLocation(verifySignatureLocation);
-    return verifySignatureInfo;
-  }
-
-  public VerifySignatureLocation createVerifySignatureLocation(
-    String xPathExpression,
-    Map namespaceDeclarations) {
-    VerifySignatureLocationImpl verifySignatureLocation =
-      new VerifySignatureLocationImpl();
-    verifySignatureLocation.setXPathExpression(xPathExpression);
-    verifySignatureLocation.setNamespaceDeclarations(namespaceDeclarations);
-    return verifySignatureLocation;
-  }
-
-  public SupplementProfile createSupplementProfile(String profileID) {
-    SupplementProfileIDImpl supplementProfileID = new SupplementProfileIDImpl();
-    supplementProfileID.setSupplementProfileID(profileID);
-    return supplementProfileID;
-  }
-
-  public SupplementProfile createSupplementProfile(XMLDataObjectAssociation supplementProfile) {
-    SupplementProfileExplicitImpl supplementProfileExplicit =
-      new SupplementProfileExplicitImpl();
-    supplementProfileExplicit.setSupplementProfile(supplementProfile);
-    return supplementProfileExplicit;
-  }
-
-  public SignatureManifestCheckParams createSignatureManifestCheckParams(
-    List referenceInfos,
-    boolean returnReferenceInputData) {
-    SignatureManifestCheckParamsImpl signatureManifestCheckParams =
-      new SignatureManifestCheckParamsImpl();
-    signatureManifestCheckParams.setReferenceInfos(referenceInfos);
-    signatureManifestCheckParams.setReturnReferenceInputData(
-      returnReferenceInputData);
-    return signatureManifestCheckParams;
-  }
-
-  public ReferenceInfo createReferenceInfo(List verifyTransformsInfoProfiles) {
-    ReferenceInfoImpl referenceInfo = new ReferenceInfoImpl();
-    referenceInfo.setVerifyTransformsInfoProfiles(verifyTransformsInfoProfiles);
-    return referenceInfo;
-  }
-
-  public VerifyTransformsInfoProfile createVerifyTransformsInfoProfile(
-    List transforms,
-    List transformParameters) {
-    VerifyTransformsInfoProfileExplicitImpl verifyTransformsInfoProfile =
-      new VerifyTransformsInfoProfileExplicitImpl();
-    
-    verifyTransformsInfoProfile.setTransforms(transforms);
-    verifyTransformsInfoProfile.setTransformParameters(transformParameters);
-    
-    return verifyTransformsInfoProfile;
-  }
-
-  public VerifyTransformsInfoProfile createVerifyTransformsInfoProfile(String profileID) {
-    VerifyTransformsInfoProfileIDImpl verifyTransformsInfoProfile =
-      new VerifyTransformsInfoProfileIDImpl();
-    verifyTransformsInfoProfile.setVerifyTransformsInfoProfileID(profileID);
-    return verifyTransformsInfoProfile;
-  }
-
-
-  public TransformParameter createTransformParameter(String URI, String digestMethod, byte[] digestValue) {
-    TransformPatameterHashImpl transformParameter =
-      new TransformPatameterHashImpl();
-    transformParameter.setURI(URI);
-    transformParameter.setDigestMethod(digestMethod);
-    transformParameter.setDigestValue(digestValue);
-    return transformParameter;
-  }
-
-  public TransformParameter createTransformParameter(
-    String URI,
-    InputStream binaryData) {
-    TransformParameterBinaryImpl transformParameter =
-      new TransformParameterBinaryImpl();
-    transformParameter.setURI(URI);
-    transformParameter.setBinaryContent(binaryData);
-    return transformParameter;
-  }
-
-  public TransformParameter createTransformParameter(String URI) {
-    TransformParameterURIImpl transformParameter =
-      new TransformParameterURIImpl();
-    transformParameter.setURI(URI);
-    return transformParameter;
-  }
-
-  public VerifyXMLSignatureResponse createVerifyXMLSignatureResponse(
-    SignerInfo signerInfo,
-    List hashInputDatas,
-    List referenceInputDatas,
-    ReferencesCheckResult signatureCheck,
-    ReferencesCheckResult signatureManifestCheck,
-    List xmlDsigManifestChecks,
-    CheckResult certificateCheck,
-    List adesFormResults) {
-    VerifyXMLSignatureResponseImpl verifyXMLSignatureResponse =
-      new VerifyXMLSignatureResponseImpl();
-    verifyXMLSignatureResponse.setSignerInfo(signerInfo);
-    verifyXMLSignatureResponse.setHashInputDatas(hashInputDatas);
-    verifyXMLSignatureResponse.setReferenceInputDatas(referenceInputDatas);
-    verifyXMLSignatureResponse.setSignatureCheck(signatureCheck);
-    verifyXMLSignatureResponse.setSignatureManifestCheck(
-      signatureManifestCheck);
-    verifyXMLSignatureResponse.setXMLDsigManifestChecks(xmlDsigManifestChecks);
-    verifyXMLSignatureResponse.setCertificateCheck(certificateCheck);
-    verifyXMLSignatureResponse.setAdESFormResults(adesFormResults);
-    return verifyXMLSignatureResponse;
-  }
-
-  public ReferencesCheckResult createReferencesCheckResult(
-    int code,
-    ReferencesCheckResultInfo info) {
-    ReferencesCheckResultImpl referencesCheckResult =
-      new ReferencesCheckResultImpl();
-    referencesCheckResult.setCode(code);
-    referencesCheckResult.setInfo(info);
-    return referencesCheckResult;
-  }
-
-  public ReferencesCheckResultInfo createReferencesCheckResultInfo(
-    NodeList anyOtherInfo,
-    int[] failedReferences) {
-    ReferencesCheckResultInfoImpl referencesCheckResultInfo =
-      new ReferencesCheckResultInfoImpl();
-    referencesCheckResultInfo.setAnyOtherInfo(anyOtherInfo);
-    referencesCheckResultInfo.setFailedReferences(failedReferences);
-    return referencesCheckResultInfo;
-  }
-
-  public ManifestRefsCheckResult createManifestRefsCheckResult(
-    int code,
-    ManifestRefsCheckResultInfo info) {
-    ManifestRefsCheckResultImpl manifestRefsCheckResult =
-      new ManifestRefsCheckResultImpl();
-    manifestRefsCheckResult.setCode(code);
-    manifestRefsCheckResult.setInfo(info);
-    return manifestRefsCheckResult;
-  }
-  
-  public ManifestRefsCheckResultInfo createManifestRefsCheckResultInfo(
-    NodeList anyOtherInfo,
-    int[] failedReferences,
-    int referringSigReference) {
-    ManifestRefsCheckResultInfoImpl manifestRefsCheckResultInfo =
-      new ManifestRefsCheckResultInfoImpl();
-    manifestRefsCheckResultInfo.setAnyOtherInfo(anyOtherInfo);
-    manifestRefsCheckResultInfo.setReferringSignatureReference(
-      referringSigReference);
-    manifestRefsCheckResultInfo.setFailedReferences(failedReferences);
-    return manifestRefsCheckResultInfo;
-  }
-
-  public Content createContent(InputStream binaryData, String referenceURI) {
-    ContentBinaryImpl content = new ContentBinaryImpl();
-    content.setBinaryContent(binaryData);
-    content.setReference(referenceURI);
-    return content;
-  }
-
-  public Content createContent(String locationReferenceURI, String referenceURI) {
-    ContentLocRefImpl content = new ContentLocRefImpl();
-    content.setLocationReferenceURI(locationReferenceURI);
-    content.setReference(referenceURI);
-    return content;
-  }
-
-  public Content createContent(String referenceURI) {
-    ContentReferenceImpl content = new ContentReferenceImpl();
-    content.setReference(referenceURI);
-    return content;
-  }
-
-  public Content createContent(NodeList xmlData, String referenceURI) {
-    ContentXMLImpl content = new ContentXMLImpl();
-    content.setXMLContent(xmlData);
-    content.setReference(referenceURI);
-    return content;
-  }
-  
-  public XMLDataObjectAssociation createXMLDataObjectAssociation(
-    MetaInfo metaInfo,
-    Content xmlContent) {
-    XMLDataObjectAssociationImpl xmlDataObjectAssociation =
-      new XMLDataObjectAssociationImpl();
-    xmlDataObjectAssociation.setMetaInfo(metaInfo);
-    xmlDataObjectAssociation.setContent(xmlContent);
-    return xmlDataObjectAssociation;
-  }
-
-  public MetaInfo createMetaInfo(
-    String mimeType,
-    String description,
-    NodeList otherInfo,
-    String type) {
-    MetaInfoImpl metaInfo = new MetaInfoImpl();
-    metaInfo.setMimeType(mimeType);
-    metaInfo.setDescription(description);
-    metaInfo.setAnyElements(otherInfo);
-    metaInfo.setType(type);
-    return metaInfo;
-  }
-
-  public Transform createCanonicalizationTransform(String algorithmURI) {
-    CanonicalizationTransformImpl transform = new CanonicalizationTransformImpl(algorithmURI);
-    return transform;
-  }
-  
-  public Transform createExclusiveCanonicalizationTransform(String algorithmURI, List inclusiveNamespacePrefixes) {
-    ExclusiveCanonicalizationTransformImpl transform = new ExclusiveCanonicalizationTransformImpl(algorithmURI);
-    transform.setInclusiveNamespacePrefixes(inclusiveNamespacePrefixes);
-    return transform;
-  }
-  
-  public Transform createBase64Transform() {
-    Base64TransformImpl transform = new Base64TransformImpl();
-    return transform;
-  }
-
-  public Transform createEnvelopedSignatureTransform() {
-    EnvelopedSignatureTransformImpl transform =
-      new EnvelopedSignatureTransformImpl();
-    return transform;
-  }
-
-  public Transform createXSLTTransform(Element styleSheet) {
-    XSLTransformImpl transform = new XSLTransformImpl();
-    transform.setStylesheet(styleSheet);
-    return transform;
-  }
-
-  public Transform createXPathTransform(
-    String xPathExpression,
-    Map namespaceDeclarations) {
-    XPathTransformImpl transform = new XPathTransformImpl();
-    transform.setXPathExpression(xPathExpression);
-    transform.setNamespaceDelcarations(namespaceDeclarations);
-    return transform;
-  }
-
-  public Transform createXPathFilter2Transform(List xPathFilters) {
-    XPathFilter2TransformImpl transform = new XPathFilter2TransformImpl();
-    transform.setFilters(xPathFilters);
-    return transform;
-  }
-
-  public XPathFilter createXPathFilter(
-    String filterType,
-    String xPathExpression,
-    Map namespaceDeclarations) {
-    XPathFilterImpl xPathFilter = new XPathFilterImpl();
-    xPathFilter.setFilterType(filterType);
-    xPathFilter.setXPathExpression(xPathExpression);
-    xPathFilter.setNamespaceDelcarations(namespaceDeclarations);
-    return xPathFilter;
-  }
-
-  public CheckResult createCheckResult(int code, NodeList info) {
-    CheckResultImpl checkResult = new CheckResultImpl();
-    checkResult.setCode(code);
-    checkResult.setInfo(info);
-    return checkResult;
-  }
-  
-
-  public SignerInfo createSignerInfo(
-    X509Certificate signerCertificate,
-    boolean qualifiedCertificate,
-    boolean qcSourceTSL,
-    boolean publicAuthority,
-    String publicAuthorityID, 
-    boolean sscd,
-    boolean sscdSourceTSL,
-    String issuerCountryCode) {
-    SignerInfoImpl signerInfo = new SignerInfoImpl();
-    signerInfo.setSignerCertificate(signerCertificate);
-    signerInfo.setQualifiedCertificate(qualifiedCertificate);
-    signerInfo.setQCSourceTSL(qcSourceTSL);
-    signerInfo.setPublicAuthority(publicAuthority);
-    signerInfo.setPublicAuhtorityID(publicAuthorityID);
-    signerInfo.setSSCD(sscd);
-    signerInfo.setSSCDSourceTSL(sscdSourceTSL);
-    signerInfo.setIssuerCountryCode(issuerCountryCode);
-    return signerInfo;
-  }
-
-  public X509IssuerSerial createX509IssuerSerial(
-    String issuerName,
-    BigInteger serialNumber) {
-    X509IssuerSerialImpl x509IssuerSerial = new X509IssuerSerialImpl();
-    x509IssuerSerial.setX509IssuerName(issuerName);
-    x509IssuerSerial.setX509SerialNumber(serialNumber);
-    return x509IssuerSerial;
-  }
+	public CreateXMLSignatureRequest createCreateXMLSignatureRequest(String keyIdentifier, List singleSignatureInfos) {
+		CreateXMLSignatureRequestImpl createXMLSignatureRequest = new CreateXMLSignatureRequestImpl();
+		createXMLSignatureRequest.setKeyIdentifier(keyIdentifier);
+		createXMLSignatureRequest.setSingleSignatureInfos(singleSignatureInfos);
+		return createXMLSignatureRequest;
+	}
+
+	public CreateCMSSignatureRequest createCreateCMSSignatureRequest(String keyIdentifier, List singleSignatureInfos) {
+		CreateCMSSignatureRequestImpl createCMSSignatureRequest = new CreateCMSSignatureRequestImpl();
+		createCMSSignatureRequest.setKeyIdentifier(keyIdentifier);
+		createCMSSignatureRequest.setSingleSignatureInfos(singleSignatureInfos);
+		return createCMSSignatureRequest;
+
+	}
+
+	public CreateCMSSignatureResponse createCreateCMSSignatureResponse(List responseElements) {
+		CreateCMSSignatureResponseImpl createCMSSignatureResponse = new CreateCMSSignatureResponseImpl();
+		createCMSSignatureResponse.setResponseElements(responseElements);
+		return createCMSSignatureResponse;
+	}
+
+	public CMSSignatureResponse createCMSSignatureResponse(String base64value) {
+		CMSSignatureResponseImpl cmsSignatureResponse = new CMSSignatureResponseImpl();
+		cmsSignatureResponse.setCMSSignature(base64value);
+
+		return cmsSignatureResponse;
+	}
+
+	public SingleSignatureInfo createSingleSignatureInfo(List dataObjectInfos, CreateSignatureInfo createSignatureInfo,
+			boolean securityLayerConform) {
+		SingleSignatureInfoImpl singleSignatureInfo = new SingleSignatureInfoImpl();
+		singleSignatureInfo.setDataObjectInfos(dataObjectInfos);
+		singleSignatureInfo.setCreateSignatureInfo(createSignatureInfo);
+		singleSignatureInfo.setSecurityLayerConform(securityLayerConform);
+		return singleSignatureInfo;
+	}
+
+	public at.gv.egovernment.moa.spss.api.cmssign.SingleSignatureInfo createSingleSignatureInfoCMS(
+			at.gv.egovernment.moa.spss.api.cmssign.DataObjectInfo dataObjectInfo, boolean securityLayerConform) {
+		SingleSignatureInfoCMSImpl singleSignatureInfo = new SingleSignatureInfoCMSImpl();
+		singleSignatureInfo.setDataObjectInfo(dataObjectInfo);
+		singleSignatureInfo.setSecurityLayerConform(securityLayerConform);
+		return singleSignatureInfo;
+	}
+
+	public DataObjectInfo createDataObjectInfo(String structure, boolean childOfManifest, Content dataObject,
+			CreateTransformsInfoProfile createTransformsInfoProfile) {
+		DataObjectInfoImpl dataObjectInfo = new DataObjectInfoImpl();
+		dataObjectInfo.setStructure(structure);
+		dataObjectInfo.setChildOfManifest(childOfManifest);
+		dataObjectInfo.setDataObject(dataObject);
+		dataObjectInfo.setCreateTransformsInfoProfile(createTransformsInfoProfile);
+		return dataObjectInfo;
+	}
+
+	public at.gv.egovernment.moa.spss.api.cmssign.DataObjectInfo createDataObjectInfo(String structure,
+			CMSDataObject dataObject) {
+		DataObjectInfoCMSImpl dataObjectInfo = new DataObjectInfoCMSImpl();
+		dataObjectInfo.setStructure(structure);
+		dataObjectInfo.setDataObject(dataObject);
+		return dataObjectInfo;
+	}
+
+	public CreateTransformsInfoProfile createCreateTransformsInfoProfile(String profileID) {
+
+		CreateTransformsInfoProfileIDImpl createTransformsInfoProfile = new CreateTransformsInfoProfileIDImpl();
+		createTransformsInfoProfile.setCreateTransformsInfoProfileID(profileID);
+		return createTransformsInfoProfile;
+	}
+
+	public CreateTransformsInfoProfile createCreateTransformsInfoProfile(CreateTransformsInfo transformsInfo,
+			List supplements) {
+		CreateTransformsInfoProfileExplicitImpl createTransformsInfoProfile = new CreateTransformsInfoProfileExplicitImpl();
+		createTransformsInfoProfile.setCreateTransformsInfo(transformsInfo);
+		createTransformsInfoProfile.setSupplements(supplements);
+		return createTransformsInfoProfile;
+	}
+
+	public CreateTransformsInfo createCreateTransformsInfo(List transforms, MetaInfo finalDataMetaInfo) {
+		CreateTransformsInfoImpl createTransformsInfo = new CreateTransformsInfoImpl();
+
+		createTransformsInfo.setTransforms(transforms);
+		createTransformsInfo.setFinalDataMetaInfo(finalDataMetaInfo);
+		return createTransformsInfo;
+	}
+
+	public CreateSignatureInfo createCreateSignatureInfo(Content createSignatureEnvironment,
+			CreateSignatureEnvironmentProfile createSignatureEnvironmentProfile) {
+		CreateSignatureInfoImpl createSignatureInfo = new CreateSignatureInfoImpl();
+		createSignatureInfo.setCreateSignatureEnvironment(createSignatureEnvironment);
+		createSignatureInfo.setCreateSignatureEnvironmentProfile(createSignatureEnvironmentProfile);
+		return createSignatureInfo;
+	}
+
+	public CreateSignatureEnvironmentProfile createCreateSignatureEnvironmentProfile(
+			CreateSignatureLocation createSignatureLocation, List supplements) {
+		CreateSignatureEnvironmentProfileExplicitImpl createSignatureEnvironmentProfile = new CreateSignatureEnvironmentProfileExplicitImpl();
+		createSignatureEnvironmentProfile.setCreateSignatureLocation(createSignatureLocation);
+		createSignatureEnvironmentProfile.setSupplements(supplements);
+		return createSignatureEnvironmentProfile;
+	}
+
+	public CreateSignatureLocation createCreateSignatureLocation(String signatureLocationXPath,
+			int signatureLocationIndex, Map namespaceDeclarations) {
+		CreateSignatureLocationImpl createSignatureLocation = new CreateSignatureLocationImpl();
+		createSignatureLocation.setIndex(signatureLocationIndex);
+		createSignatureLocation.setNamespaceDeclarations(namespaceDeclarations);
+		createSignatureLocation.setXPathExpression(signatureLocationXPath);
+		return createSignatureLocation;
+	}
+
+	public CreateSignatureEnvironmentProfile createCreateSignatureEnvironmentProfile(String profileID) {
+		CreateSignatureEnvironmentProfileIDImpl createSignatureEnvironmentProfile = new CreateSignatureEnvironmentProfileIDImpl();
+		createSignatureEnvironmentProfile.setCreateSignatureEnvironmentProfileID(profileID);
+		return createSignatureEnvironmentProfile;
+	}
+
+	public CreateXMLSignatureResponse createCreateXMLSignatureResponse(List responseElements) {
+		CreateXMLSignatureResponseImpl createXMLSignatureResponse = new CreateXMLSignatureResponseImpl();
+		createXMLSignatureResponse.setResponseElements(responseElements);
+		return createXMLSignatureResponse;
+	}
+
+	public SignatureEnvironmentResponse createSignatureEnvironmentResponse(Element signatureEnvironment) {
+		SignatureEnvironmentResponseImpl signatureEnvironmentResponse = new SignatureEnvironmentResponseImpl();
+		signatureEnvironmentResponse.setSignatureEnvironment(signatureEnvironment);
+		return signatureEnvironmentResponse;
+	}
+
+	public ErrorResponse createErrorResponse(int code, String info) {
+		ErrorResponseImpl errorResponse = new ErrorResponseImpl();
+		errorResponse.setErrorCode(code);
+		errorResponse.setInfo(info);
+		return errorResponse;
+	}
+
+	public VerifyCMSSignatureRequest createVerifyCMSSignatureRequest(int[] signatories, Date dateTime,
+			InputStream cmsSignature, CMSDataObject dataObject, String trustProfileID, boolean pdf) {
+		return this.createVerifyCMSSignatureRequest(signatories, dateTime, cmsSignature, dataObject, trustProfileID, pdf, false);
+	}
+
+	public VerifyCMSSignatureRequest createVerifyCMSSignatureRequest(int[] signatories, Date dateTime,
+			InputStream cmsSignature, CMSDataObject dataObject, String trustProfileID, boolean pdf, boolean extended) {
+		VerifyCMSSignatureRequestImpl verifyCMSSignatureRequest = new VerifyCMSSignatureRequestImpl();
+		verifyCMSSignatureRequest.setDateTime(dateTime);
+		verifyCMSSignatureRequest.setCMSSignature(cmsSignature);
+		verifyCMSSignatureRequest.setDataObject(dataObject);
+		verifyCMSSignatureRequest.setTrustProfileId(trustProfileID);
+		verifyCMSSignatureRequest.setSignatories(signatories);
+		verifyCMSSignatureRequest.setPDF(pdf);
+		verifyCMSSignatureRequest.setExtended(extended);
+		return verifyCMSSignatureRequest;
+	}
+	
+	public CMSDataObject createCMSDataObject(MetaInfo metaInfo, CMSContent content, BigDecimal excludeByteRangeFrom,
+			BigDecimal excludeByteRangeTo) {
+
+		CMSDataObjectImpl cmsDataObject = new CMSDataObjectImpl();
+		cmsDataObject.setMetaInfo(metaInfo);
+		cmsDataObject.setContent(content);
+		cmsDataObject.setExcludeByteRangeFrom(excludeByteRangeFrom);
+		cmsDataObject.setExcludeByteRangeTo(excludeByteRangeTo);
+
+		return cmsDataObject;
+	}
+
+	public CMSContent createCMSContent(InputStream binaryContent) {
+		CMSContentExplicitImpl cmsContent = new CMSContentExplicitImpl();
+
+		cmsContent.setBinaryContent(binaryContent);
+		return cmsContent;
+	}
+
+	public CMSContent createCMSContent(String referenceURI) {
+		CMSContentReferenceImpl cmsContent = new CMSContentReferenceImpl();
+
+		cmsContent.setReference(referenceURI);
+		return cmsContent;
+	}
+
+	public CMSDataObject createCMSDataObject(MetaInfo metaInfo, String referenceURI) {
+		CMSDataObjectImpl cmsDataObject = new CMSDataObjectImpl();
+		CMSContentReferenceImpl cmsContent = new CMSContentReferenceImpl();
+		cmsDataObject.setMetaInfo(metaInfo);
+		cmsContent.setReference(referenceURI);
+		return cmsDataObject;
+	}
+
+	public VerifyCMSSignatureResponse createVerifyCMSSignatureResponse(List responseElements) {
+		VerifyCMSSinatureResponseImpl verifyCMSSignatureResponse = new VerifyCMSSinatureResponseImpl();
+		verifyCMSSignatureResponse.setResponseElements(responseElements);
+		return verifyCMSSignatureResponse;
+	}
+
+	public VerifyCMSSignatureResponseElement createVerifyCMSSignatureResponseElement(SignerInfo signerInfo,
+			CheckResult signatureCheck, CheckResult certificateCheck, List adesResult) {
+		VerifyCMSSignatureResponseElementImpl verifyCMSSignatureResponseElement = new VerifyCMSSignatureResponseElementImpl();
+		verifyCMSSignatureResponseElement.setSignerInfo(signerInfo);
+		verifyCMSSignatureResponseElement.setSignatureCheck(signatureCheck);
+		verifyCMSSignatureResponseElement.setCertificateCheck(certificateCheck);
+		verifyCMSSignatureResponseElement.setAdESFormResults(adesResult);
+		return verifyCMSSignatureResponseElement;
+	}
+
+	public VerifyXMLSignatureRequest createVerifyXMLSignatureRequest(Date dateTime,
+			VerifySignatureInfo verifySignatureInfo, List supplementProfiles,
+			SignatureManifestCheckParams signatureManifestParams, boolean returnHashInputData, String trustProfileID) {
+		return this.createVerifyXMLSignatureRequest(dateTime, verifySignatureInfo, supplementProfiles,
+				signatureManifestParams, returnHashInputData, trustProfileID, false);
+	}
+
+	public VerifySignatureInfo createVerifySignatureInfo(Content verifySignatureEnvironment,
+			VerifySignatureLocation verifySignatureLocation) {
+		VerifySignatureInfoImpl verifySignatureInfo = new VerifySignatureInfoImpl();
+		verifySignatureInfo.setVerifySignatureEnvironment(verifySignatureEnvironment);
+		verifySignatureInfo.setVerifySignatureLocation(verifySignatureLocation);
+		return verifySignatureInfo;
+	}
+
+	public VerifySignatureLocation createVerifySignatureLocation(String xPathExpression, Map namespaceDeclarations) {
+		VerifySignatureLocationImpl verifySignatureLocation = new VerifySignatureLocationImpl();
+		verifySignatureLocation.setXPathExpression(xPathExpression);
+		verifySignatureLocation.setNamespaceDeclarations(namespaceDeclarations);
+		return verifySignatureLocation;
+	}
+
+	public SupplementProfile createSupplementProfile(String profileID) {
+		SupplementProfileIDImpl supplementProfileID = new SupplementProfileIDImpl();
+		supplementProfileID.setSupplementProfileID(profileID);
+		return supplementProfileID;
+	}
+
+	public SupplementProfile createSupplementProfile(XMLDataObjectAssociation supplementProfile) {
+		SupplementProfileExplicitImpl supplementProfileExplicit = new SupplementProfileExplicitImpl();
+		supplementProfileExplicit.setSupplementProfile(supplementProfile);
+		return supplementProfileExplicit;
+	}
+
+	public SignatureManifestCheckParams createSignatureManifestCheckParams(List referenceInfos,
+			boolean returnReferenceInputData) {
+		SignatureManifestCheckParamsImpl signatureManifestCheckParams = new SignatureManifestCheckParamsImpl();
+		signatureManifestCheckParams.setReferenceInfos(referenceInfos);
+		signatureManifestCheckParams.setReturnReferenceInputData(returnReferenceInputData);
+		return signatureManifestCheckParams;
+	}
+
+	public ReferenceInfo createReferenceInfo(List verifyTransformsInfoProfiles) {
+		ReferenceInfoImpl referenceInfo = new ReferenceInfoImpl();
+		referenceInfo.setVerifyTransformsInfoProfiles(verifyTransformsInfoProfiles);
+		return referenceInfo;
+	}
+
+	public VerifyTransformsInfoProfile createVerifyTransformsInfoProfile(List transforms, List transformParameters) {
+		VerifyTransformsInfoProfileExplicitImpl verifyTransformsInfoProfile = new VerifyTransformsInfoProfileExplicitImpl();
+
+		verifyTransformsInfoProfile.setTransforms(transforms);
+		verifyTransformsInfoProfile.setTransformParameters(transformParameters);
+
+		return verifyTransformsInfoProfile;
+	}
+
+	public VerifyTransformsInfoProfile createVerifyTransformsInfoProfile(String profileID) {
+		VerifyTransformsInfoProfileIDImpl verifyTransformsInfoProfile = new VerifyTransformsInfoProfileIDImpl();
+		verifyTransformsInfoProfile.setVerifyTransformsInfoProfileID(profileID);
+		return verifyTransformsInfoProfile;
+	}
+
+	public TransformParameter createTransformParameter(String URI, String digestMethod, byte[] digestValue) {
+		TransformPatameterHashImpl transformParameter = new TransformPatameterHashImpl();
+		transformParameter.setURI(URI);
+		transformParameter.setDigestMethod(digestMethod);
+		transformParameter.setDigestValue(digestValue);
+		return transformParameter;
+	}
+
+	public TransformParameter createTransformParameter(String URI, InputStream binaryData) {
+		TransformParameterBinaryImpl transformParameter = new TransformParameterBinaryImpl();
+		transformParameter.setURI(URI);
+		transformParameter.setBinaryContent(binaryData);
+		return transformParameter;
+	}
+
+	public TransformParameter createTransformParameter(String URI) {
+		TransformParameterURIImpl transformParameter = new TransformParameterURIImpl();
+		transformParameter.setURI(URI);
+		return transformParameter;
+	}
+
+	public VerifyXMLSignatureResponse createVerifyXMLSignatureResponse(SignerInfo signerInfo, List hashInputDatas,
+			List referenceInputDatas, ReferencesCheckResult signatureCheck,
+			ReferencesCheckResult signatureManifestCheck, List xmlDsigManifestChecks, CheckResult certificateCheck,
+			List adesFormResults) {
+		VerifyXMLSignatureResponseImpl verifyXMLSignatureResponse = new VerifyXMLSignatureResponseImpl();
+		verifyXMLSignatureResponse.setSignerInfo(signerInfo);
+		verifyXMLSignatureResponse.setHashInputDatas(hashInputDatas);
+		verifyXMLSignatureResponse.setReferenceInputDatas(referenceInputDatas);
+		verifyXMLSignatureResponse.setSignatureCheck(signatureCheck);
+		verifyXMLSignatureResponse.setSignatureManifestCheck(signatureManifestCheck);
+		verifyXMLSignatureResponse.setXMLDsigManifestChecks(xmlDsigManifestChecks);
+		verifyXMLSignatureResponse.setCertificateCheck(certificateCheck);
+		verifyXMLSignatureResponse.setAdESFormResults(adesFormResults);
+		return verifyXMLSignatureResponse;
+	}
+
+	public ReferencesCheckResult createReferencesCheckResult(int code, ReferencesCheckResultInfo info) {
+		ReferencesCheckResultImpl referencesCheckResult = new ReferencesCheckResultImpl();
+		referencesCheckResult.setCode(code);
+		referencesCheckResult.setInfo(info);
+		return referencesCheckResult;
+	}
+
+	public ReferencesCheckResultInfo createReferencesCheckResultInfo(NodeList anyOtherInfo, int[] failedReferences) {
+		ReferencesCheckResultInfoImpl referencesCheckResultInfo = new ReferencesCheckResultInfoImpl();
+		referencesCheckResultInfo.setAnyOtherInfo(anyOtherInfo);
+		referencesCheckResultInfo.setFailedReferences(failedReferences);
+		return referencesCheckResultInfo;
+	}
+
+	public ManifestRefsCheckResult createManifestRefsCheckResult(int code, ManifestRefsCheckResultInfo info) {
+		ManifestRefsCheckResultImpl manifestRefsCheckResult = new ManifestRefsCheckResultImpl();
+		manifestRefsCheckResult.setCode(code);
+		manifestRefsCheckResult.setInfo(info);
+		return manifestRefsCheckResult;
+	}
+
+	public ManifestRefsCheckResultInfo createManifestRefsCheckResultInfo(NodeList anyOtherInfo, int[] failedReferences,
+			int referringSigReference) {
+		ManifestRefsCheckResultInfoImpl manifestRefsCheckResultInfo = new ManifestRefsCheckResultInfoImpl();
+		manifestRefsCheckResultInfo.setAnyOtherInfo(anyOtherInfo);
+		manifestRefsCheckResultInfo.setReferringSignatureReference(referringSigReference);
+		manifestRefsCheckResultInfo.setFailedReferences(failedReferences);
+		return manifestRefsCheckResultInfo;
+	}
+
+	public Content createContent(InputStream binaryData, String referenceURI) {
+		ContentBinaryImpl content = new ContentBinaryImpl();
+		content.setBinaryContent(binaryData);
+		content.setReference(referenceURI);
+		return content;
+	}
+
+	public Content createContent(String locationReferenceURI, String referenceURI) {
+		ContentLocRefImpl content = new ContentLocRefImpl();
+		content.setLocationReferenceURI(locationReferenceURI);
+		content.setReference(referenceURI);
+		return content;
+	}
+
+	public Content createContent(String referenceURI) {
+		ContentReferenceImpl content = new ContentReferenceImpl();
+		content.setReference(referenceURI);
+		return content;
+	}
+
+	public Content createContent(NodeList xmlData, String referenceURI) {
+		ContentXMLImpl content = new ContentXMLImpl();
+		content.setXMLContent(xmlData);
+		content.setReference(referenceURI);
+		return content;
+	}
+
+	public XMLDataObjectAssociation createXMLDataObjectAssociation(MetaInfo metaInfo, Content xmlContent) {
+		XMLDataObjectAssociationImpl xmlDataObjectAssociation = new XMLDataObjectAssociationImpl();
+		xmlDataObjectAssociation.setMetaInfo(metaInfo);
+		xmlDataObjectAssociation.setContent(xmlContent);
+		return xmlDataObjectAssociation;
+	}
+
+	public MetaInfo createMetaInfo(String mimeType, String description, NodeList otherInfo, String type) {
+		MetaInfoImpl metaInfo = new MetaInfoImpl();
+		metaInfo.setMimeType(mimeType);
+		metaInfo.setDescription(description);
+		metaInfo.setAnyElements(otherInfo);
+		metaInfo.setType(type);
+		return metaInfo;
+	}
+
+	public Transform createCanonicalizationTransform(String algorithmURI) {
+		CanonicalizationTransformImpl transform = new CanonicalizationTransformImpl(algorithmURI);
+		return transform;
+	}
+
+	public Transform createExclusiveCanonicalizationTransform(String algorithmURI, List inclusiveNamespacePrefixes) {
+		ExclusiveCanonicalizationTransformImpl transform = new ExclusiveCanonicalizationTransformImpl(algorithmURI);
+		transform.setInclusiveNamespacePrefixes(inclusiveNamespacePrefixes);
+		return transform;
+	}
+
+	public Transform createBase64Transform() {
+		Base64TransformImpl transform = new Base64TransformImpl();
+		return transform;
+	}
+
+	public Transform createEnvelopedSignatureTransform() {
+		EnvelopedSignatureTransformImpl transform = new EnvelopedSignatureTransformImpl();
+		return transform;
+	}
+
+	public Transform createXSLTTransform(Element styleSheet) {
+		XSLTransformImpl transform = new XSLTransformImpl();
+		transform.setStylesheet(styleSheet);
+		return transform;
+	}
+
+	public Transform createXPathTransform(String xPathExpression, Map namespaceDeclarations) {
+		XPathTransformImpl transform = new XPathTransformImpl();
+		transform.setXPathExpression(xPathExpression);
+		transform.setNamespaceDelcarations(namespaceDeclarations);
+		return transform;
+	}
+
+	public Transform createXPathFilter2Transform(List xPathFilters) {
+		XPathFilter2TransformImpl transform = new XPathFilter2TransformImpl();
+		transform.setFilters(xPathFilters);
+		return transform;
+	}
+
+	public XPathFilter createXPathFilter(String filterType, String xPathExpression, Map namespaceDeclarations) {
+		XPathFilterImpl xPathFilter = new XPathFilterImpl();
+		xPathFilter.setFilterType(filterType);
+		xPathFilter.setXPathExpression(xPathExpression);
+		xPathFilter.setNamespaceDelcarations(namespaceDeclarations);
+		return xPathFilter;
+	}
+
+	public CheckResult createCheckResult(int code, NodeList info) {
+		CheckResultImpl checkResult = new CheckResultImpl();
+		checkResult.setCode(code);
+		checkResult.setInfo(info);
+		return checkResult;
+	}
+
+	public SignerInfo createSignerInfo(X509Certificate signerCertificate, boolean qualifiedCertificate,
+			boolean qcSourceTSL, boolean publicAuthority, String publicAuthorityID, boolean sscd, boolean sscdSourceTSL,
+			String issuerCountryCode) {
+		SignerInfoImpl signerInfo = new SignerInfoImpl();
+		signerInfo.setSignerCertificate(signerCertificate);
+		signerInfo.setQualifiedCertificate(qualifiedCertificate);
+		signerInfo.setQCSourceTSL(qcSourceTSL);
+		signerInfo.setPublicAuthority(publicAuthority);
+		signerInfo.setPublicAuhtorityID(publicAuthorityID);
+		signerInfo.setSSCD(sscd);
+		signerInfo.setSSCDSourceTSL(sscdSourceTSL);
+		signerInfo.setIssuerCountryCode(issuerCountryCode);
+		return signerInfo;
+	}
+
+	public X509IssuerSerial createX509IssuerSerial(String issuerName, BigInteger serialNumber) {
+		X509IssuerSerialImpl x509IssuerSerial = new X509IssuerSerialImpl();
+		x509IssuerSerial.setX509IssuerName(issuerName);
+		x509IssuerSerial.setX509SerialNumber(serialNumber);
+		return x509IssuerSerial;
+	}
+
+	@Override
+	public VerifyXMLSignatureRequest createVerifyXMLSignatureRequest(Date dateTime,
+			VerifySignatureInfo verifySignatureInfo, List supplementProfiles,
+			SignatureManifestCheckParams signatureManifestParams, boolean returnHashInputData, String trustProfileID,
+			boolean extendedValidation) {
+		VerifyXMLSignatureRequestImpl verifyXMLSignatureRequest = new VerifyXMLSignatureRequestImpl();
+		verifyXMLSignatureRequest.setDateTime(dateTime);
+		verifyXMLSignatureRequest.setSignatureInfo(verifySignatureInfo);
+		verifyXMLSignatureRequest.setSupplementProfiles(supplementProfiles);
+		verifyXMLSignatureRequest.setSignatureManifestCheckParams(signatureManifestParams);
+		verifyXMLSignatureRequest.setReturnHashInputData(returnHashInputData);
+		verifyXMLSignatureRequest.setTrustProfileId(trustProfileID);
+		verifyXMLSignatureRequest.setExtendedValidation(extendedValidation);
+		return verifyXMLSignatureRequest;
+	}
 
 }
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureRequestImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureRequestImpl.java
index 78d817b..e16717d 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureRequestImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureRequestImpl.java
@@ -51,6 +51,7 @@ public class VerifyCMSSignatureRequestImpl
   private Date dateTime;
   
   private boolean pdf = false;
+  private boolean extended = false;
 
   /**
    * Sets the indexes of the signatories whose signature should be verified.
@@ -124,4 +125,12 @@ public class VerifyCMSSignatureRequestImpl
 	  return this.pdf;
   }
 
+public synchronized boolean isExtended() {
+	return extended;
+}
+
+public synchronized void setExtended(boolean extended) {
+	this.extended = extended;
+}
+
 }
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureRequestImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureRequestImpl.java
index 1b9be35..91d1917 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureRequestImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureRequestImpl.java
@@ -21,7 +21,6 @@
  * that you distribute must include a readable copy of the "NOTICE" text file.
  */
 
-
 package at.gv.egovernment.moa.spss.api.impl;
 
 import java.util.ArrayList;
@@ -39,99 +38,114 @@ import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest;
  * @author Fatemeh Philippi
  * @version $Id$
  */
-public class VerifyXMLSignatureRequestImpl
-  implements VerifyXMLSignatureRequest {
-  /** Date and time for signature verification. */
-  private Date dateTime;
-  /** The signature to be verified. */
-  private VerifySignatureInfo verifySignatureInfo;
-  /** Supplemental information about the singature. */
-  private List supplementProfiles;
-  /** Additional parameters for checking the signature manifest. */
-  private SignatureManifestCheckParams signatureManifestCheckParams;
-  /** Whether to return the hash input data. */
-  private boolean returnHashInputData;
-  /** The profile ID of the trust profile containing the trusted certificates. 
-   */
-  private String trustProfileId;
-
-  /**
-   * Sets the date and time for signature verification.
-   * 
-   * @param dateTime The date and time for signature verification.
-   */
-  public void setDateTime(Date dateTime) {
-    this.dateTime = dateTime;
-  }
-
-  public Date getDateTime() {
-    return dateTime;
-  }
-
-  /** 
-   * Sets the signature to be verified.
-   * 
-   * @param signatureInfo The signature to be verified.
-   */
-  public void setSignatureInfo(VerifySignatureInfo signatureInfo) {
-    this.verifySignatureInfo = signatureInfo;
-  }
-
-  public VerifySignatureInfo getSignatureInfo() {
-    return verifySignatureInfo;
-  }
-
-  /**
-   * Sets supplemental information about the singature.
-   * @param supplementProfiles
-   */
-  public void setSupplementProfiles(List supplementProfiles) {
-    this.supplementProfiles =
-      supplementProfiles != null
-        ? Collections.unmodifiableList(new ArrayList(supplementProfiles))
-        : null;
-  }
-
-  public List getSupplementProfiles() {
-    return supplementProfiles;
-  }
-
-  /**
-   * Sets supplemental information about the singature.
-   * @param params Supplemental information about the singature.
-   */
-  public void setSignatureManifestCheckParams(SignatureManifestCheckParams params) {
-    this.signatureManifestCheckParams = params;
-  }
-
-  public SignatureManifestCheckParams getSignatureManifestCheckParams() {
-    return signatureManifestCheckParams;
-  }
-
-  /**
-   * Sets whether to return hash input data.
-   * 
-   * @param returnSignedData Whether to return hash input data.
-   */
-  public void setReturnHashInputData(boolean returnSignedData) {
-    this.returnHashInputData = returnSignedData;
-  }
-
-  public boolean getReturnHashInputData() {
-    return returnHashInputData;
-  }
-
-  /**
-   * Sets the profile ID of trusted certificates.
-   * 
-   * @param trustProfileId The profile ID of trusted certificates.
-   */
-  public void setTrustProfileId(String trustProfileId) {
-    this.trustProfileId = trustProfileId;
-  }
-
-  public String getTrustProfileId() {
-    return trustProfileId;
-  }
+public class VerifyXMLSignatureRequestImpl implements VerifyXMLSignatureRequest {
+	/** Date and time for signature verification. */
+	private Date dateTime;
+	/** The signature to be verified. */
+	private VerifySignatureInfo verifySignatureInfo;
+	/** Supplemental information about the singature. */
+	private List supplementProfiles;
+	/** Additional parameters for checking the signature manifest. */
+	private SignatureManifestCheckParams signatureManifestCheckParams;
+	/** Whether to return the hash input data. */
+	private boolean returnHashInputData;
+	private boolean extendedValidation;
+	/**
+	 * The profile ID of the trust profile containing the trusted certificates.
+	 */
+	private String trustProfileId;
+
+	/**
+	 * Sets the date and time for signature verification.
+	 * 
+	 * @param dateTime
+	 *            The date and time for signature verification.
+	 */
+	public void setDateTime(Date dateTime) {
+		this.dateTime = dateTime;
+	}
+
+	public Date getDateTime() {
+		return dateTime;
+	}
+
+	/**
+	 * Sets the signature to be verified.
+	 * 
+	 * @param signatureInfo
+	 *            The signature to be verified.
+	 */
+	public void setSignatureInfo(VerifySignatureInfo signatureInfo) {
+		this.verifySignatureInfo = signatureInfo;
+	}
+
+	public VerifySignatureInfo getSignatureInfo() {
+		return verifySignatureInfo;
+	}
+
+	/**
+	 * Sets supplemental information about the singature.
+	 * 
+	 * @param supplementProfiles
+	 */
+	public void setSupplementProfiles(List supplementProfiles) {
+		this.supplementProfiles = supplementProfiles != null
+				? Collections.unmodifiableList(new ArrayList(supplementProfiles)) : null;
+	}
+
+	public List getSupplementProfiles() {
+		return supplementProfiles;
+	}
+
+	/**
+	 * Sets supplemental information about the singature.
+	 * 
+	 * @param params
+	 *            Supplemental information about the singature.
+	 */
+	public void setSignatureManifestCheckParams(SignatureManifestCheckParams params) {
+		this.signatureManifestCheckParams = params;
+	}
+
+	public SignatureManifestCheckParams getSignatureManifestCheckParams() {
+		return signatureManifestCheckParams;
+	}
+
+	/**
+	 * Sets whether to return hash input data.
+	 * 
+	 * @param returnSignedData
+	 *            Whether to return hash input data.
+	 */
+	public void setReturnHashInputData(boolean returnSignedData) {
+		this.returnHashInputData = returnSignedData;
+	}
+
+	public boolean getReturnHashInputData() {
+		return returnHashInputData;
+	}
+
+	/**
+	 * Sets the profile ID of trusted certificates.
+	 * 
+	 * @param trustProfileId
+	 *            The profile ID of trusted certificates.
+	 */
+	public void setTrustProfileId(String trustProfileId) {
+		this.trustProfileId = trustProfileId;
+	}
+
+	public String getTrustProfileId() {
+		return trustProfileId;
+	}
+
+	public synchronized void setExtendedValidation(boolean extendedValidation) {
+		this.extendedValidation = extendedValidation;
+	}
+
+	@Override
+	public boolean getExtendedValidaiton() {
+		return extendedValidation;
+	}
 
 }
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/CreateCMSSignatureRequestParser.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/CreateCMSSignatureRequestParser.java
index a8cae9c..3550c27 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/CreateCMSSignatureRequestParser.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/CreateCMSSignatureRequestParser.java
@@ -40,11 +40,11 @@ import at.gv.egovernment.moa.spss.api.cmssign.SingleSignatureInfo;
 import at.gv.egovernment.moa.spss.api.cmsverify.CMSContent;
 import at.gv.egovernment.moa.spss.api.cmsverify.CMSDataObject;
 import at.gv.egovernment.moa.spss.api.common.MetaInfo;
-import at.gv.egovernment.moa.util.Base64Utils;
-import at.gv.egovernment.moa.util.BoolUtils;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
+import at.gv.egovernment.moaspss.util.Base64Utils;
+import at.gv.egovernment.moaspss.util.BoolUtils;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.DOMUtils;
+import at.gv.egovernment.moaspss.util.XPathUtils;
 
 /**
  * A parser to parse <code>CreateCMSSignatureRequest</code> DOM trees into
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/CreateCMSSignatureResponseBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/CreateCMSSignatureResponseBuilder.java
index 907f90d..d808f2b 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/CreateCMSSignatureResponseBuilder.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/CreateCMSSignatureResponseBuilder.java
@@ -38,8 +38,8 @@ import at.gv.egovernment.moa.spss.api.cmssign.CreateCMSSignatureResponse;
 import at.gv.egovernment.moa.spss.api.cmssign.CreateCMSSignatureResponseElement;
 import at.gv.egovernment.moa.spss.api.xmlsign.ErrorResponse;
 import at.gv.egovernment.moa.spss.api.xmlsign.SignatureEnvironmentResponse;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.DOMUtils;
 
 /**
  * Convert a <code>CreateCMSSignatureResponse</code> API object into its
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParser.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParser.java
index 9cea2fc..d677f88 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParser.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParser.java
@@ -30,11 +30,6 @@ import java.util.List;
 import org.w3c.dom.Element;
 import org.w3c.dom.traversal.NodeIterator;
 
-import at.gv.egovernment.moa.util.BoolUtils;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.api.SPSSFactory;
 import at.gv.egovernment.moa.spss.api.common.Content;
@@ -44,6 +39,10 @@ import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfoProfile;
 import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest;
 import at.gv.egovernment.moa.spss.api.xmlsign.DataObjectInfo;
 import at.gv.egovernment.moa.spss.api.xmlsign.SingleSignatureInfo;
+import at.gv.egovernment.moaspss.util.BoolUtils;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.DOMUtils;
+import at.gv.egovernment.moaspss.util.XPathUtils;
 
 /**
  * A parser to parse <code>CreateXMLSignatureRequest</code> DOM trees into
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureResponseBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureResponseBuilder.java
index 0af1a67..3c93fce 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureResponseBuilder.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureResponseBuilder.java
@@ -30,13 +30,12 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-import at.gv.egovernment.moa.util.Constants;
-
 import at.gv.egovernment.moa.spss.MOASystemException;
 import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponse;
 import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponseElement;
 import at.gv.egovernment.moa.spss.api.xmlsign.ErrorResponse;
 import at.gv.egovernment.moa.spss.api.xmlsign.SignatureEnvironmentResponse;
+import at.gv.egovernment.moaspss.util.Constants;
 
 /**
  * Convert a <code>CreateXMLSignatureResponse</code> API object into its
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ProfileParser.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ProfileParser.java
index 0705c0b..6b34922 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ProfileParser.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ProfileParser.java
@@ -33,11 +33,6 @@ import java.util.Map;
 import org.w3c.dom.Element;
 import org.w3c.dom.traversal.NodeIterator;
 
-import at.gv.egovernment.moa.util.Base64Utils;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.api.SPSSFactory;
 import at.gv.egovernment.moa.spss.api.common.MetaInfo;
@@ -49,6 +44,10 @@ import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfoProfile;
 import at.gv.egovernment.moa.spss.api.xmlverify.SupplementProfile;
 import at.gv.egovernment.moa.spss.api.xmlverify.TransformParameter;
 import at.gv.egovernment.moa.spss.api.xmlverify.VerifyTransformsInfoProfile;
+import at.gv.egovernment.moaspss.util.Base64Utils;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.DOMUtils;
+import at.gv.egovernment.moaspss.util.XPathUtils;
 
 /**
  * Parse the various profile elements contained in the MOA web service requests
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/RequestParserUtils.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/RequestParserUtils.java
index 743a17c..1d53a0c 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/RequestParserUtils.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/RequestParserUtils.java
@@ -21,7 +21,6 @@
  * that you distribute must include a readable copy of the "NOTICE" text file.
  */
 
-
 package at.gv.egovernment.moa.spss.api.xmlbind;
 
 import java.text.ParseException;
@@ -30,17 +29,16 @@ import java.util.Date;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
-import at.gv.egovernment.moa.util.Base64Utils;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.DateTimeUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.api.SPSSFactory;
 import at.gv.egovernment.moa.spss.api.common.Content;
 import at.gv.egovernment.moa.spss.api.common.MetaInfo;
 import at.gv.egovernment.moa.spss.api.common.XMLDataObjectAssociation;
+import at.gv.egovernment.moaspss.util.Base64Utils;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.DOMUtils;
+import at.gv.egovernment.moaspss.util.DateTimeUtils;
+import at.gv.egovernment.moaspss.util.XPathUtils;
 
 /**
  * Utility methods for parsing XML requests definied in the MOA XML schema.
@@ -49,133 +47,164 @@ import at.gv.egovernment.moa.spss.api.common.XMLDataObjectAssociation;
  * @version $Id$
  */
 public class RequestParserUtils {
-  //
-  // XPath expressions for parsing parts of a request
-  //
-  private static final String MOA = Constants.MOA_PREFIX + ":";
-  private static final String REFERENCE_ATTR_NAME = "Reference";
-  private static final String MIME_TYPE_XPATH = MOA + "MimeType";
-  private static final String DESCRIPTION_XPATH = MOA + "Description";
-  private static final String TYPE_XPATH = MOA + "Type";
-  private static final String XML_ASSOC_CONTENT_XPATH = MOA + "Content";
-  private static final String CONTENT_XPATH =
-    MOA + "Base64Content | " + MOA + "XMLContent |" + MOA + "LocRefContent";
-  private static final String ANY_OTHER_XPATH =
-    "*[namespace-uri() != \"" + Constants.MOA_NS_URI + "\"]";
-
-  /**
-   * Parse a <code>XMLDataObjectAssociationType</code> kind of DOM element.
-   * 
-   * @param assocElem The <code>XMLDataObjectAssociationType</code> kind of
-   * DOM elmeent to parse. 
-   * @return The <code>XMLDataObjectAssociation</code> API object containing
-   * the data from the <code>XMLDataObjectAssociationType</code> DOM element.
-   */
-  public static XMLDataObjectAssociation parseXMLDataObjectAssociation(Element assocElem) {
-    SPSSFactory factory = SPSSFactory.getInstance();
-    MetaInfo metaInfo = parseMetaInfo(assocElem);
-    Element contentElem =
-      (Element) XPathUtils.selectSingleNode(assocElem, XML_ASSOC_CONTENT_XPATH);
-    Content content = parseContent(contentElem);
-
-    return factory.createXMLDataObjectAssociation(metaInfo, content);
-  }
-
-  /**
-   * Parse a <code>MetaInfoType</code> kind of DOM element.
-   * 
-   * @param metaInfoElem The <code>MetaInfoType</code> kind of DOM element.
-   * @return The <code>MetaInfo</code> API object containing the data from
-   * the <code>metaInfoElem</code>.
-   */
-  public static MetaInfo parseMetaInfo(Element metaInfoElem) {
-    SPSSFactory factory = SPSSFactory.getInstance();
-    String mimeType =
-      XPathUtils.getElementValue(metaInfoElem, MIME_TYPE_XPATH, null);
-    String description =
-      XPathUtils.getElementValue(metaInfoElem, DESCRIPTION_XPATH, null);
-    NodeList anyOther =
-      XPathUtils.selectNodeList(metaInfoElem, ANY_OTHER_XPATH);
-    String type =
-      XPathUtils.getElementValue(metaInfoElem, TYPE_XPATH, null);
-
-    return factory.createMetaInfo(mimeType, description, anyOther, type);
-  }
-
-  /**
-   * Parse a <code>ContentOptionalRefType</code> or 
-   * <code>ContentRequiredRefType</code> kind of DOM element.
-   * @param contentParentElem The DOM element being the parent of the 
-   * content element.
-   * @return The <code>Content</code> API object containing the data from
-   * the given DOM element.
-   */
-  public static Content parseContent(Element contentParentElem) {
-    SPSSFactory factory = SPSSFactory.getInstance();
-    String referenceURI =
-      contentParentElem.hasAttribute(REFERENCE_ATTR_NAME)
-        ? contentParentElem.getAttribute(REFERENCE_ATTR_NAME)
-        : null;
-    Element contentElem =
-      (Element) XPathUtils.selectSingleNode(contentParentElem, CONTENT_XPATH);
-
-    if (contentElem == null) {
-      return factory.createContent(referenceURI);
-    }
-
-    if ("Base64Content".equals(contentElem.getLocalName())) {
-      String base64String = DOMUtils.getText(contentElem);
-      return factory.createContent(
-        Base64Utils.decodeToStream(base64String, true),
-        referenceURI);
-    } else if ("LocRefContent".equals(contentElem.getLocalName())) {
-      String locationReferenceURI = DOMUtils.getText(contentElem);
-      return factory.createContent(
-        locationReferenceURI,
-        referenceURI);
-    } else { // "XMLContent".equals(contentElem.getLocalName())
-      return factory.createContent(
-        contentElem.getChildNodes(),
-        referenceURI);
-    }
-  }
-
-  /**
-   * Get the signing time from a Verfiy(CMS|XML)SignatureRequest.
-   * 
-   * @param requestElem A <code>Verify(CMS|XML)SignatureRequest</code> DOM 
-   * element.
-   * @param dateTimeXPath The XPath to lookup the <code>DateTime</code> element
-   * within the request.
-   * @return Date The date and time corresponding to the <code>DateTime</code>
-   * element in the request. If no <code>DateTime</code> element exists in the
-   * request, <code>null</code> is returned.
-   * @throws MOAApplicationException An error occurred during a parsing the
-   * <code>DateTime</code> element or creating the return value.
-   */
-  public static Date parseDateTime(Element requestElem, String dateTimeXPath)
-    throws MOAApplicationException {
-
-    Element dateTimeElem;
-    String dateTimeText;
-
-    // select the DateTime element
-    dateTimeElem =
-      (Element) XPathUtils.selectSingleNode(requestElem, dateTimeXPath);
-
-    // parse a date from the element value
-    if (dateTimeElem != null) {
-      dateTimeText = DOMUtils.getText(dateTimeElem);
-      try {
-        return DateTimeUtils.parseDateTime(dateTimeText);
-      } catch (ParseException e) {
-        throw new MOAApplicationException(
-          "1104",
-          new Object[] { dateTimeText });
-      }
-    } else {
-      return null;
-    }
-  }
+	//
+	// XPath expressions for parsing parts of a request
+	//
+	private static final String MOA = Constants.MOA_PREFIX + ":";
+	private static final String REFERENCE_ATTR_NAME = "Reference";
+	private static final String MIME_TYPE_XPATH = MOA + "MimeType";
+	private static final String DESCRIPTION_XPATH = MOA + "Description";
+	private static final String TYPE_XPATH = MOA + "Type";
+	private static final String XML_ASSOC_CONTENT_XPATH = MOA + "Content";
+	private static final String CONTENT_XPATH = MOA + "Base64Content | " + MOA + "XMLContent |" + MOA + "LocRefContent";
+	private static final String ANY_OTHER_XPATH = "*[namespace-uri() != \"" + Constants.MOA_NS_URI + "\"]";
+
+	/**
+	 * Parse a <code>XMLDataObjectAssociationType</code> kind of DOM element.
+	 * 
+	 * @param assocElem
+	 *            The <code>XMLDataObjectAssociationType</code> kind of DOM
+	 *            elmeent to parse.
+	 * @return The <code>XMLDataObjectAssociation</code> API object containing
+	 *         the data from the <code>XMLDataObjectAssociationType</code> DOM
+	 *         element.
+	 */
+	public static XMLDataObjectAssociation parseXMLDataObjectAssociation(Element assocElem) {
+		SPSSFactory factory = SPSSFactory.getInstance();
+		MetaInfo metaInfo = parseMetaInfo(assocElem);
+		Element contentElem = (Element) XPathUtils.selectSingleNode(assocElem, XML_ASSOC_CONTENT_XPATH);
+		Content content = parseContent(contentElem);
+
+		return factory.createXMLDataObjectAssociation(metaInfo, content);
+	}
+
+	/**
+	 * Parse a <code>MetaInfoType</code> kind of DOM element.
+	 * 
+	 * @param metaInfoElem
+	 *            The <code>MetaInfoType</code> kind of DOM element.
+	 * @return The <code>MetaInfo</code> API object containing the data from the
+	 *         <code>metaInfoElem</code>.
+	 */
+	public static MetaInfo parseMetaInfo(Element metaInfoElem) {
+		SPSSFactory factory = SPSSFactory.getInstance();
+		String mimeType = XPathUtils.getElementValue(metaInfoElem, MIME_TYPE_XPATH, null);
+		String description = XPathUtils.getElementValue(metaInfoElem, DESCRIPTION_XPATH, null);
+		NodeList anyOther = XPathUtils.selectNodeList(metaInfoElem, ANY_OTHER_XPATH);
+		String type = XPathUtils.getElementValue(metaInfoElem, TYPE_XPATH, null);
+
+		return factory.createMetaInfo(mimeType, description, anyOther, type);
+	}
+
+	/**
+	 * Parse a <code>ContentOptionalRefType</code> or
+	 * <code>ContentRequiredRefType</code> kind of DOM element.
+	 * 
+	 * @param contentParentElem
+	 *            The DOM element being the parent of the content element.
+	 * @return The <code>Content</code> API object containing the data from the
+	 *         given DOM element.
+	 */
+	public static Content parseContent(Element contentParentElem) {
+		SPSSFactory factory = SPSSFactory.getInstance();
+		String referenceURI = contentParentElem.hasAttribute(REFERENCE_ATTR_NAME)
+				? contentParentElem.getAttribute(REFERENCE_ATTR_NAME) : null;
+		Element contentElem = (Element) XPathUtils.selectSingleNode(contentParentElem, CONTENT_XPATH);
+
+		if (contentElem == null) {
+			return factory.createContent(referenceURI);
+		}
+
+		if ("Base64Content".equals(contentElem.getLocalName())) {
+			String base64String = DOMUtils.getText(contentElem);
+			return factory.createContent(Base64Utils.decodeToStream(base64String, true), referenceURI);
+		} else if ("LocRefContent".equals(contentElem.getLocalName())) {
+			String locationReferenceURI = DOMUtils.getText(contentElem);
+			return factory.createContent(locationReferenceURI, referenceURI);
+		} else { // "XMLContent".equals(contentElem.getLocalName())
+			return factory.createContent(contentElem.getChildNodes(), referenceURI);
+		}
+	}
+
+	/**
+	 * Get the signing time from a Verfiy(CMS|XML)SignatureRequest.
+	 * 
+	 * @param requestElem
+	 *            A <code>Verify(CMS|XML)SignatureRequest</code> DOM element.
+	 * @param dateTimeXPath
+	 *            The XPath to lookup the <code>DateTime</code> element within
+	 *            the request.
+	 * @return Date The date and time corresponding to the <code>DateTime</code>
+	 *         element in the request. If no <code>DateTime</code> element
+	 *         exists in the request, <code>null</code> is returned.
+	 * @throws MOAApplicationException
+	 *             An error occurred during a parsing the <code>DateTime</code>
+	 *             element or creating the return value.
+	 */
+	public static Date parseDateTime(Element requestElem, String dateTimeXPath) throws MOAApplicationException {
+
+		Element dateTimeElem;
+		String dateTimeText;
+
+		// select the DateTime element
+		dateTimeElem = (Element) XPathUtils.selectSingleNode(requestElem, dateTimeXPath);
+
+		// parse a date from the element value
+		if (dateTimeElem != null) {
+			dateTimeText = DOMUtils.getText(dateTimeElem);
+			try {
+				return DateTimeUtils.parseDateTime(dateTimeText);
+			} catch (ParseException e) {
+				throw new MOAApplicationException("1104", new Object[] { dateTimeText });
+			}
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Get the signing time from a Verfiy(CMS|XML)SignatureRequest.
+	 * 
+	 * @param requestElem
+	 *            A <code>Verify(CMS|XML)SignatureRequest</code> DOM element.
+	 * @param dateTimeXPath
+	 *            The XPath to lookup the <code>DateTime</code> element within
+	 *            the request.
+	 * @return Date The date and time corresponding to the <code>DateTime</code>
+	 *         element in the request. If no <code>DateTime</code> element
+	 *         exists in the request, <code>null</code> is returned.
+	 * @throws MOAApplicationException
+	 *             An error occurred during a parsing the <code>DateTime</code>
+	 *             element or creating the return value.
+	 */
+	public static boolean parseExtendedValidation(Element requestElem, String extendedValidationXPath,
+			boolean defaultValue) throws MOAApplicationException {
+
+		Element dateTimeElem;
+		String dateTimeText;
+
+		// select the DateTime element
+		dateTimeElem = (Element) XPathUtils.selectSingleNode(requestElem, extendedValidationXPath);
+
+		// parse a date from the element value
+		if (dateTimeElem != null) {
+			dateTimeText = DOMUtils.getText(dateTimeElem);
+				String xsdBoolean = dateTimeText.trim();
+				if ("".equals(xsdBoolean))
+					return defaultValue;
+				switch (xsdBoolean) {
+				case "true":
+				case "1":
+					return true;
+				case "false":
+				case "0":
+					return false;
+				default:
+					return false;
+				}
+		} else {
+			return defaultValue;
+		}
+	}
 
 }
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java
index eaafe00..a6ed83d 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java
@@ -39,12 +39,10 @@ import org.w3c.dom.NodeList;
 
 import iaik.utils.RFC2253NameParser;
 import iaik.utils.RFC2253NameParserException;
-
-import at.gv.egovernment.moa.util.Base64Utils;
-import at.gv.egovernment.moa.util.Constants;
-
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.MOASystemException;
+import at.gv.egovernment.moaspss.util.Base64Utils;
+import at.gv.egovernment.moaspss.util.Constants;
 
 /**
  * Utility methods used by the verious <code>ResponseBuilder</code> classes.
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/TransformParser.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/TransformParser.java
index 687b0ae..6dc4803 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/TransformParser.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/TransformParser.java
@@ -32,10 +32,6 @@ import java.util.StringTokenizer;
 import org.w3c.dom.Element;
 import org.w3c.dom.traversal.NodeIterator;
 
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.api.SPSSFactory;
 import at.gv.egovernment.moa.spss.api.common.Base64Transform;
@@ -47,6 +43,9 @@ import at.gv.egovernment.moa.spss.api.common.XPathFilter;
 import at.gv.egovernment.moa.spss.api.common.XPathFilter2Transform;
 import at.gv.egovernment.moa.spss.api.common.XPathTransform;
 import at.gv.egovernment.moa.spss.api.common.XSLTTransform;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.DOMUtils;
+import at.gv.egovernment.moaspss.util.XPathUtils;
 
 /**
  * A parser to parse XMLDsig <code>Transform</code> DOM elements into their
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParser.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParser.java
index bc92b7a..97a2541 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParser.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParser.java
@@ -33,18 +33,17 @@ import java.util.StringTokenizer;
 
 import org.w3c.dom.Element;
 
-import at.gv.egovernment.moa.util.Base64Utils;
-import at.gv.egovernment.moa.util.CollectionUtils;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.api.SPSSFactory;
 import at.gv.egovernment.moa.spss.api.cmsverify.CMSContent;
 import at.gv.egovernment.moa.spss.api.cmsverify.CMSDataObject;
 import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest;
 import at.gv.egovernment.moa.spss.api.common.MetaInfo;
+import at.gv.egovernment.moaspss.util.Base64Utils;
+import at.gv.egovernment.moaspss.util.CollectionUtils;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.DOMUtils;
+import at.gv.egovernment.moaspss.util.XPathUtils;
 
 /**
  * A parser to parse <code>VerifyCMSSignatureRequest</code> DOM trees into
@@ -60,6 +59,7 @@ public class VerifyCMSSignatureRequestParser {
   //
   private static final String MOA = Constants.MOA_PREFIX + ":";
   private static final String DATE_TIME_XPATH = MOA + "DateTime";
+  private static final String EXTENDED_VALIDATION_XPATH = MOA + "ExtendedValidation";
   private static final String CMS_SIGNATURE_XPATH = MOA + "CMSSignature";
   private static final String TRUST_PROFILE_ID_XPATH = MOA + "TrustProfileID";
   private static final String DATA_OBJECT_XPATH = MOA + "DataObject";
@@ -84,12 +84,53 @@ public class VerifyCMSSignatureRequestParser {
    * the data from the DOM element.
    * @throws MOAApplicationException An error occurred parsing the request.
    */
+  public VerifyCMSSignatureRequest parsePDF(Element requestElem)
+    throws MOAApplicationException {
+
+    int[] signatories = parseSignatories(requestElem);
+    Date dateTime =
+      RequestParserUtils.parseDateTime(requestElem, DATE_TIME_XPATH);
+    boolean extendedValidation = 
+    		RequestParserUtils.parseExtendedValidation(requestElem, EXTENDED_VALIDATION_XPATH, false);
+    
+    String cmsSignatureStr =
+      XPathUtils.getElementValue(requestElem, CMS_SIGNATURE_XPATH, "");
+    CMSDataObject dataObject = parseDataObject(requestElem);
+    String trustProfileID =
+      XPathUtils.getElementValue(requestElem, TRUST_PROFILE_ID_XPATH, null);
+    InputStream cmsSignature =
+      Base64Utils.decodeToStream(cmsSignatureStr, true);
+
+    return factory.createVerifyCMSSignatureRequest(
+      signatories,
+      dateTime,
+      cmsSignature,
+      dataObject,
+      trustProfileID,
+      true,
+      extendedValidation);
+  }
+  
+  /**
+   * Parse a <code>VerifyCMSSignatureRequest</code> DOM element, as defined
+   * by the MOA schema.
+   * 
+   * @param requestElem The <code>VerifyCMSSignatureRequest</code> to parse. The
+   * request must have been successfully parsed against the schema for this
+   * method to succeed.
+   * @return A <code>VerifyCMSSignatureRequest</code> API objects containing
+   * the data from the DOM element.
+   * @throws MOAApplicationException An error occurred parsing the request.
+   */
   public VerifyCMSSignatureRequest parse(Element requestElem)
     throws MOAApplicationException {
 
     int[] signatories = parseSignatories(requestElem);
     Date dateTime =
       RequestParserUtils.parseDateTime(requestElem, DATE_TIME_XPATH);
+    boolean extendedValidation = 
+    		RequestParserUtils.parseExtendedValidation(requestElem, EXTENDED_VALIDATION_XPATH, false);
+    
     String cmsSignatureStr =
       XPathUtils.getElementValue(requestElem, CMS_SIGNATURE_XPATH, "");
     CMSDataObject dataObject = parseDataObject(requestElem);
@@ -104,7 +145,8 @@ public class VerifyCMSSignatureRequestParser {
       cmsSignature,
       dataObject,
       trustProfileID,
-      false);
+      false,
+      extendedValidation);
   }
 
   /**
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureResponseBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureResponseBuilder.java
index b11560b..cefecac 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureResponseBuilder.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureResponseBuilder.java
@@ -35,6 +35,7 @@ import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse;
 import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponseElement;
 import at.gv.egovernment.moa.spss.api.common.CheckResult;
 import at.gv.egovernment.moa.spss.api.common.SignerInfo;
+import at.gv.egovernment.moa.spss.api.xmlverify.AdESFormResults;
 
 /**
  * Convert a <code>VerifyCMSSignatureResponse</code> API object into its
@@ -60,7 +61,7 @@ public class VerifyCMSSignatureResponseBuilder {
       ResponseBuilderUtils.createResponse("VerifyCMSSignatureResponse");
     responseElem = responseDoc.getDocumentElement();
   }
-
+  
   /**
    * Build a document containing a <code>VerifyCMSSignatureResponse</code>
    * DOM element being the XML representation of the given 
@@ -82,7 +83,7 @@ public class VerifyCMSSignatureResponseBuilder {
         (VerifyCMSSignatureResponseElement) iter.next();
       addResponseElement(responseElement);
     }
-
+    
     return responseDoc;
   }
 
@@ -125,6 +126,19 @@ public class VerifyCMSSignatureResponseBuilder {
       certCheck.getCode(),
       certCheck.getInfo());
     
+
+    if (responseElement.getAdESFormResults() != null) {
+
+		Iterator formIterator = responseElement.getAdESFormResults().iterator();
+
+		while (formIterator.hasNext()) {
+			AdESFormResults adESFormResult = (AdESFormResults) formIterator.next();
+			// add the CertificateCheck
+			ResponseBuilderUtils.addFormCheckElement(responseDoc, responseElem, "FormCheckResult",
+					adESFormResult.getCode().intValue(), adESFormResult.getName());
+
+		}
+	}
     
   }
 
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyPDFSignatureResponseBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyPDFSignatureResponseBuilder.java
new file mode 100644
index 0000000..cc44c29
--- /dev/null
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyPDFSignatureResponseBuilder.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2003 Federal Chancellery Austria
+ * MOA-SPSS has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+
+
+package at.gv.egovernment.moa.spss.api.xmlbind;
+
+import java.util.Iterator;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import at.gv.egovernment.moa.spss.MOAApplicationException;
+import at.gv.egovernment.moa.spss.MOASystemException;
+import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse;
+import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponseElement;
+import at.gv.egovernment.moa.spss.api.common.CheckResult;
+import at.gv.egovernment.moa.spss.api.common.SignerInfo;
+import at.gv.egovernment.moa.spss.api.xmlverify.AdESFormResults;
+
+/**
+ * Convert a <code>VerifyCMSSignatureResponse</code> API object into its
+ * XML representation, according to the MOA XML schema.
+ * 
+ * @author Patrick Peck
+ * @version $Id$
+ */
+public class VerifyPDFSignatureResponseBuilder {
+  /** The XML document containing the response element. */
+  private Document responseDoc;
+  /** The response <code>VerifyCMSSignatureResponse</code> DOM element. */
+  private Element responseElem;
+
+  /**
+   * Create a new <code>VerifyCMSSignatureResponseBuilder</code>:
+   * 
+   * @throws MOASystemException An error occurred setting up the resulting
+   * XML document.
+   */
+  public VerifyPDFSignatureResponseBuilder() throws MOASystemException {
+    responseDoc =
+      ResponseBuilderUtils.createResponse("VerifyPDFSignatureResponse");
+    responseElem = responseDoc.getDocumentElement();
+  }
+  
+  /**
+   * Build a document containing a <code>VerifyCMSSignatureResponse</code>
+   * DOM element being the XML representation of the given 
+   * <code>VerifyCMSSignatureResponse</code> API object.
+   * 
+   * @param response The <code>VerifyCMSSignatureResponse</code> to convert
+   * to XML.
+   * @return A document containing the <code>VerifyCMSSignatureResponse</code>
+   * DOM element.
+   * @throws MOAApplicationException An error occurred building the response.
+   */
+  public Document build(VerifyCMSSignatureResponse response)
+    throws MOAApplicationException {
+
+    Iterator iter;
+
+    for (iter = response.getResponseElements().iterator(); iter.hasNext();) {
+      VerifyCMSSignatureResponseElement responseElement =
+        (VerifyCMSSignatureResponseElement) iter.next();
+      addResponseElement(responseElement);
+    }
+    
+    return responseDoc;
+  }
+
+  /**
+   * Add an element to the response.
+   * 
+   * @param responseElement The element to add to the response.
+   * @throws MOAApplicationException An error occurred adding the element.
+   */
+  private void addResponseElement(VerifyCMSSignatureResponseElement responseElement)
+    throws MOAApplicationException {
+
+    SignerInfo signerInfo = responseElement.getSignerInfo();
+    CheckResult signatureCheck = responseElement.getSignatureCheck();
+    CheckResult certCheck = responseElement.getCertificateCheck();
+    
+    ResponseBuilderUtils.addSignerInfo(
+      responseDoc,
+      responseElem,
+      signerInfo.getSignerCertificate(),
+      signerInfo.isQualifiedCertificate(),
+      signerInfo.getQCSource(),
+      signerInfo.isPublicAuthority(),
+      signerInfo.getPublicAuhtorityID(),
+      signerInfo.isSSCD(),
+      signerInfo.getSSCDSource(),
+      signerInfo.getIssuerCountryCode());
+
+    ResponseBuilderUtils.addCodeInfoElement(
+      responseDoc,
+      responseElem,
+      "SignatureCheck",
+      signatureCheck.getCode(),
+      signatureCheck.getInfo());
+
+    ResponseBuilderUtils.addCodeInfoElement(
+      responseDoc,
+      responseElem,
+      "CertificateCheck",
+      certCheck.getCode(),
+      certCheck.getInfo());
+    
+
+    if (responseElement.getAdESFormResults() != null) {
+
+		Iterator formIterator = responseElement.getAdESFormResults().iterator();
+
+		while (formIterator.hasNext()) {
+			AdESFormResults adESFormResult = (AdESFormResults) formIterator.next();
+			// add the CertificateCheck
+			ResponseBuilderUtils.addFormCheckElement(responseDoc, responseElem, "FormCheckResult",
+					adESFormResult.getCode().intValue(), adESFormResult.getName());
+
+		}
+	}
+    
+  }
+
+}
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParser.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParser.java
index 7bd0b9e..f1bb1d7 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParser.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParser.java
@@ -21,7 +21,6 @@
  * that you distribute must include a readable copy of the "NOTICE" text file.
  */
 
-
 package at.gv.egovernment.moa.spss.api.xmlbind;
 
 import java.util.ArrayList;
@@ -32,11 +31,6 @@ import java.util.Map;
 import org.w3c.dom.Element;
 import org.w3c.dom.traversal.NodeIterator;
 
-import at.gv.egovernment.moa.util.BoolUtils;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.api.SPSSFactory;
 import at.gv.egovernment.moa.spss.api.common.Content;
@@ -46,6 +40,10 @@ import at.gv.egovernment.moa.spss.api.xmlverify.SupplementProfile;
 import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureInfo;
 import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureLocation;
 import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest;
+import at.gv.egovernment.moaspss.util.BoolUtils;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.DOMUtils;
+import at.gv.egovernment.moaspss.util.XPathUtils;
 
 /**
  * @author Patrick Peck
@@ -53,32 +51,28 @@ import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest;
  */
 public class VerifyXMLSignatureRequestParser {
 
-  //
-  // XPath expressions for parsing parts of the request
-  //
-  private static final String MOA = Constants.MOA_PREFIX + ":";
-  private static final String DATE_TIME_XPATH = MOA + "DateTime";
-  private static final String RETURN_HASH_INPUT_DATA_XPATH =
-    MOA + "ReturnHashInputData";
-  private static final String TRUST_PROFILE_ID_XPATH = MOA + "TrustProfileID";
-  private static final String VERIFY_SIGNATURE_ENVIRONMENT_XPATH =
-    MOA + "VerifySignatureInfo/" + MOA + "VerifySignatureEnvironment";
-  private static final String VERIFY_SIGNATURE_LOCATION_XPATH =
-    MOA + "VerifySignatureInfo/" + MOA + "VerifySignatureLocation";
-  private static final String SUPPLEMENT_PROFILE_XPATH =
-    MOA + "SupplementProfile | " + MOA + "SupplementProfileID";
-  private static final String SIGNATURE_MANIFEST_CHECK_PARAMS_XPATH =
-    MOA + "SignatureManifestCheckParams";
-  private static final String VERIFY_TRANSFORMS_INFO_PROFILE_XPATH =
-    (MOA + "VerifyTransformsInfoProfile | ")
-      + (MOA + "VerifyTransformsInfoProfileID");
-  private static final String REFERENCE_INFO_XPATH = MOA + "ReferenceInfo";
-
-  /** The <code>SPSSFactory</code> for creating new API objects. */
-  private SPSSFactory factory = SPSSFactory.getInstance();
-
-
-  /**
+	//
+	// XPath expressions for parsing parts of the request
+	//
+	private static final String MOA = Constants.MOA_PREFIX + ":";
+	private static final String DATE_TIME_XPATH = MOA + "DateTime";
+	private static final String EXTENDED_VALIDATION_XPATH = MOA + "ExtendedValidation";
+	private static final String RETURN_HASH_INPUT_DATA_XPATH = MOA + "ReturnHashInputData";
+	private static final String TRUST_PROFILE_ID_XPATH = MOA + "TrustProfileID";
+	private static final String VERIFY_SIGNATURE_ENVIRONMENT_XPATH = MOA + "VerifySignatureInfo/" + MOA
+			+ "VerifySignatureEnvironment";
+	private static final String VERIFY_SIGNATURE_LOCATION_XPATH = MOA + "VerifySignatureInfo/" + MOA
+			+ "VerifySignatureLocation";
+	private static final String SUPPLEMENT_PROFILE_XPATH = MOA + "SupplementProfile | " + MOA + "SupplementProfileID";
+	private static final String SIGNATURE_MANIFEST_CHECK_PARAMS_XPATH = MOA + "SignatureManifestCheckParams";
+	private static final String VERIFY_TRANSFORMS_INFO_PROFILE_XPATH = (MOA + "VerifyTransformsInfoProfile | ")
+			+ (MOA + "VerifyTransformsInfoProfileID");
+	private static final String REFERENCE_INFO_XPATH = MOA + "ReferenceInfo";
+
+	/** The <code>SPSSFactory</code> for creating new API objects. */
+	private SPSSFactory factory = SPSSFactory.getInstance();
+
+	/**
    * Parse a <code>VerifyXMLSignatureRequest</code> DOM element, as defined
    * by the MOA schema.
    * 
@@ -94,6 +88,10 @@ public class VerifyXMLSignatureRequestParser {
 
     Date dateTime =
       RequestParserUtils.parseDateTime(requestElem, DATE_TIME_XPATH);
+    
+    boolean extendedValidation = 
+    		RequestParserUtils.parseExtendedValidation(requestElem, EXTENDED_VALIDATION_XPATH, false);
+    
     VerifySignatureInfo verifySignatureInfo =
       parseVerifySignatureInfo(requestElem);
     List supplementProfiles = parseSupplementProfiles(requestElem);
@@ -111,189 +109,178 @@ public class VerifyXMLSignatureRequestParser {
       supplementProfiles,
       signatureManifestCheckParams,
       returnHashInputData,
-      trustProfileID);
-  }
-
-  /**
-   * Parse the <code>VerifySignatureInfo</code> DOM element contained in
-   * the <code>VerifyXMLSignatureRequest</code> DOM element.
-   * 
-   * @param requestElem The <code>VerifyXMLSignatureRequest</code> DOM element
-   * containing the <code>VerifySignatureInfo</code> DOM element.
-   * @return The <code>VerifySignatureInfo</code> API object containing the
-   * data from the DOM element.
-   */
-  private VerifySignatureInfo parseVerifySignatureInfo(Element requestElem) {
-    Element verifySignatureEnvironmentElem =
-      (Element) XPathUtils.selectSingleNode(
-        requestElem,
-        VERIFY_SIGNATURE_ENVIRONMENT_XPATH);
-    Content verifySignatureEnvironment =
-      RequestParserUtils.parseContent(verifySignatureEnvironmentElem);
-    VerifySignatureLocation verifySignatureLocation =
-      parseVerifySignatureLocation(requestElem);
-
-    return factory.createVerifySignatureInfo(
-      verifySignatureEnvironment,
-      verifySignatureLocation);
-  }
-
-  /**
-   * Parse the <code>VerifySignatureLocation</code> DOM element contained
-   * in the given <code>VerifyXMLSignatureRequest</code> DOM element.
-   * 
-   * @param requestElem The <code>VerifyXMLSignatureRequst</code> DOM element.
-   * @return The <code>VerifySignatureLocation</code> API object containing the
-   * data from the DOM element.
-   */
-  private VerifySignatureLocation parseVerifySignatureLocation(Element requestElem) {
-    Element locationElem =
-      (Element) XPathUtils.selectSingleNode(
-        requestElem,
-        VERIFY_SIGNATURE_LOCATION_XPATH);
-    String xPathExpression = DOMUtils.getText(locationElem);
-    Map namespaceDeclarations = DOMUtils.getNamespaceDeclarations(locationElem);
-
-    return factory.createVerifySignatureLocation(
-      xPathExpression,
-      namespaceDeclarations);
-  }
-
-  /**
-   * Parse the supplement profiles contained in the given 
-   * <code>VerifyXMLSignatureRequest</code> DOM element.
-   * 
-   * @param requestElem The <code>VerifyXMLSignatureRequest</code> DOM element.
-   * @return A <code>List</code> of <code>SupplementProfile</code> API objects
-   * containing the data from the <code>SupplementProfile</code> DOM elements.
-   */
-  private List parseSupplementProfiles(Element requestElem) {
-    List supplementProfiles = new ArrayList();
-    NodeIterator profileElems =
-      XPathUtils.selectNodeIterator(requestElem, SUPPLEMENT_PROFILE_XPATH);
-    Element profileElem;
-
-    while ((profileElem = (Element) profileElems.nextNode()) != null) {
-      SupplementProfile profile;
-
-      if ("SupplementProfile".equals(profileElem.getLocalName())) {
-        ProfileParser profileParser = new ProfileParser();
-        profile = profileParser.parseSupplementProfile(profileElem);
-      } else {
-        String profileID = DOMUtils.getText(profileElem);
-        profile = factory.createSupplementProfile(profileID);
-      }
-      supplementProfiles.add(profile);
-    }
-    return supplementProfiles;
-  }
-
-  /**
-   * Parse the <code>SignatureManifestCheckParams</code> DOM element contained
-   * in the given <code>VerifyXMLSignatureRequest</code> DOM element.
-   * @param requestElem The <code>VerifyXMLSignatureRequest</code> DOM element.
-   * @return The <code>SignatureManifestCheckParams</code> API object containing
-   * the data from the <code>SignatureManifestCheckParams</code> DOM element.
-   * @throws MOAApplicationException An error occurred parsing the
-   * <code>SignatureManifestCheckParams</code> DOM element.
-   */
-  private SignatureManifestCheckParams parseSignatureManifestCheckParams(Element requestElem)
-    throws MOAApplicationException {
-    Element paramsElem =
-      (Element) XPathUtils.selectSingleNode(
-        requestElem,
-        SIGNATURE_MANIFEST_CHECK_PARAMS_XPATH);
-
-    if (paramsElem != null) {
-      String returnReferenceInputDataStr =
-        paramsElem.getAttribute("ReturnReferenceInputData");
-      boolean returnReferencInputData =
-        BoolUtils.valueOf(returnReferenceInputDataStr);
-      List referenceInfos = parseReferenceInfos(paramsElem);
-
-      return factory.createSignatureManifestCheckParams(
-        referenceInfos,
-        returnReferencInputData);
-    } else {
-      return null;
-    }
+      trustProfileID,
+      extendedValidation);
   }
 
-  /**
-   * Parse the <code>ReferenceInfo</code> DOM elements contained in a
-   * <code>SignatureManifestCheckParams</code> DOM element.
-   * 
-   * @param paramsElem The <code>SignatureManifestCheckParams</code> DOM element
-   * containing the <code>ReferenceInfo</code> DOM elements.
-   * @return A <code>List</code> of <code>RefernceInfo</code> API objects
-   * containing the data from the <code>ReferenceInfo</code> DOM elements.
-   * @throws MOAApplicationException An error occurred parsing the 
-   * <code>ReferenceInfo</code> DOM elements.
-   */
-  private List parseReferenceInfos(Element paramsElem)
-    throws MOAApplicationException {
-
-    List referenceInfos = new ArrayList();
-    NodeIterator refInfoElems =
-      XPathUtils.selectNodeIterator(paramsElem, REFERENCE_INFO_XPATH);
-    Element refInfoElem;
-
-    while ((refInfoElem = (Element) refInfoElems.nextNode()) != null) {
-      ReferenceInfo referenceInfo = parseReferenceInfo(refInfoElem);
-
-      referenceInfos.add(referenceInfo);
-    }
-
-    return referenceInfos;
-  }
-
-  /**
-   * Parse a <code>ReferenceInfo</code> DOM element.
-   *  
-   * @param refInfoElem The <code>ReferenceInfo</code> DOM element to parse.
-   * @return The <code>ReferenceInfo</code> API object containing the data
-   * from the given <code>ReferenceInfo</code> DOM element.
-   * @throws MOAApplicationException An error occurred parsing the
-   * <code>ReferenceInfo</code> DOM element.
-   */
-  private ReferenceInfo parseReferenceInfo(Element refInfoElem)
-    throws MOAApplicationException {
-    List profiles = parseVerifyTransformsInfoProfiles(refInfoElem);
-    return factory.createReferenceInfo(profiles);
-  }
-
-  /**
-   * Parse the <code>VerifyTransformsInfoProfile</code> DOM elements contained
-   * in a <code>ReferenceInfo</code> DOM element.
-   * 
-   * @param refInfoElem <code>ReferenceInfo</code> DOM element containing
-   * the <code>VerifyTransformsInfoProfile</code> DOM elements.
-   * @return A <code>List</code> of <code>VerifyTransformsInfoProfile</code>
-   * API objects containing the profile data.
-   * @throws MOAApplicationException An error occurred building the
-   * <code>VerifyTransformsInfoProfile</code>s.
-   */
-  private List parseVerifyTransformsInfoProfiles(Element refInfoElem)
-    throws MOAApplicationException {
-
-    List profiles = new ArrayList();
-    NodeIterator profileElems =
-      XPathUtils.selectNodeIterator(
-        refInfoElem,
-        VERIFY_TRANSFORMS_INFO_PROFILE_XPATH);
-    Element profileElem;
-
-    while ((profileElem = (Element) profileElems.nextNode()) != null) {
-      if ("VerifyTransformsInfoProfile".equals(profileElem.getLocalName())) {
-        ProfileParser profileParser = new ProfileParser();
-        profiles.add(
-          profileParser.parseVerifyTransformsInfoProfile(profileElem));
-      } else {
-        String profileID = DOMUtils.getText(profileElem);
-        profiles.add(factory.createVerifyTransformsInfoProfile(profileID));
-      }
-    }
-    return profiles;
-  }
+	/**
+	 * Parse the <code>VerifySignatureInfo</code> DOM element contained in the
+	 * <code>VerifyXMLSignatureRequest</code> DOM element.
+	 * 
+	 * @param requestElem
+	 *            The <code>VerifyXMLSignatureRequest</code> DOM element
+	 *            containing the <code>VerifySignatureInfo</code> DOM element.
+	 * @return The <code>VerifySignatureInfo</code> API object containing the
+	 *         data from the DOM element.
+	 */
+	private VerifySignatureInfo parseVerifySignatureInfo(Element requestElem) {
+		Element verifySignatureEnvironmentElem = (Element) XPathUtils.selectSingleNode(requestElem,
+				VERIFY_SIGNATURE_ENVIRONMENT_XPATH);
+		Content verifySignatureEnvironment = RequestParserUtils.parseContent(verifySignatureEnvironmentElem);
+		VerifySignatureLocation verifySignatureLocation = parseVerifySignatureLocation(requestElem);
+
+		return factory.createVerifySignatureInfo(verifySignatureEnvironment, verifySignatureLocation);
+	}
+
+	/**
+	 * Parse the <code>VerifySignatureLocation</code> DOM element contained in
+	 * the given <code>VerifyXMLSignatureRequest</code> DOM element.
+	 * 
+	 * @param requestElem
+	 *            The <code>VerifyXMLSignatureRequst</code> DOM element.
+	 * @return The <code>VerifySignatureLocation</code> API object containing
+	 *         the data from the DOM element.
+	 */
+	private VerifySignatureLocation parseVerifySignatureLocation(Element requestElem) {
+		Element locationElem = (Element) XPathUtils.selectSingleNode(requestElem, VERIFY_SIGNATURE_LOCATION_XPATH);
+		String xPathExpression = DOMUtils.getText(locationElem);
+		Map namespaceDeclarations = DOMUtils.getNamespaceDeclarations(locationElem);
+
+		return factory.createVerifySignatureLocation(xPathExpression, namespaceDeclarations);
+	}
+
+	/**
+	 * Parse the supplement profiles contained in the given
+	 * <code>VerifyXMLSignatureRequest</code> DOM element.
+	 * 
+	 * @param requestElem
+	 *            The <code>VerifyXMLSignatureRequest</code> DOM element.
+	 * @return A <code>List</code> of <code>SupplementProfile</code> API objects
+	 *         containing the data from the <code>SupplementProfile</code> DOM
+	 *         elements.
+	 */
+	private List parseSupplementProfiles(Element requestElem) {
+		List supplementProfiles = new ArrayList();
+		NodeIterator profileElems = XPathUtils.selectNodeIterator(requestElem, SUPPLEMENT_PROFILE_XPATH);
+		Element profileElem;
+
+		while ((profileElem = (Element) profileElems.nextNode()) != null) {
+			SupplementProfile profile;
+
+			if ("SupplementProfile".equals(profileElem.getLocalName())) {
+				ProfileParser profileParser = new ProfileParser();
+				profile = profileParser.parseSupplementProfile(profileElem);
+			} else {
+				String profileID = DOMUtils.getText(profileElem);
+				profile = factory.createSupplementProfile(profileID);
+			}
+			supplementProfiles.add(profile);
+		}
+		return supplementProfiles;
+	}
+
+	/**
+	 * Parse the <code>SignatureManifestCheckParams</code> DOM element contained
+	 * in the given <code>VerifyXMLSignatureRequest</code> DOM element.
+	 * 
+	 * @param requestElem
+	 *            The <code>VerifyXMLSignatureRequest</code> DOM element.
+	 * @return The <code>SignatureManifestCheckParams</code> API object
+	 *         containing the data from the
+	 *         <code>SignatureManifestCheckParams</code> DOM element.
+	 * @throws MOAApplicationException
+	 *             An error occurred parsing the
+	 *             <code>SignatureManifestCheckParams</code> DOM element.
+	 */
+	private SignatureManifestCheckParams parseSignatureManifestCheckParams(Element requestElem)
+			throws MOAApplicationException {
+		Element paramsElem = (Element) XPathUtils.selectSingleNode(requestElem, SIGNATURE_MANIFEST_CHECK_PARAMS_XPATH);
+
+		if (paramsElem != null) {
+			String returnReferenceInputDataStr = paramsElem.getAttribute("ReturnReferenceInputData");
+			boolean returnReferencInputData = BoolUtils.valueOf(returnReferenceInputDataStr);
+			List referenceInfos = parseReferenceInfos(paramsElem);
+
+			return factory.createSignatureManifestCheckParams(referenceInfos, returnReferencInputData);
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Parse the <code>ReferenceInfo</code> DOM elements contained in a
+	 * <code>SignatureManifestCheckParams</code> DOM element.
+	 * 
+	 * @param paramsElem
+	 *            The <code>SignatureManifestCheckParams</code> DOM element
+	 *            containing the <code>ReferenceInfo</code> DOM elements.
+	 * @return A <code>List</code> of <code>RefernceInfo</code> API objects
+	 *         containing the data from the <code>ReferenceInfo</code> DOM
+	 *         elements.
+	 * @throws MOAApplicationException
+	 *             An error occurred parsing the <code>ReferenceInfo</code> DOM
+	 *             elements.
+	 */
+	private List parseReferenceInfos(Element paramsElem) throws MOAApplicationException {
+
+		List referenceInfos = new ArrayList();
+		NodeIterator refInfoElems = XPathUtils.selectNodeIterator(paramsElem, REFERENCE_INFO_XPATH);
+		Element refInfoElem;
+
+		while ((refInfoElem = (Element) refInfoElems.nextNode()) != null) {
+			ReferenceInfo referenceInfo = parseReferenceInfo(refInfoElem);
+
+			referenceInfos.add(referenceInfo);
+		}
+
+		return referenceInfos;
+	}
+
+	/**
+	 * Parse a <code>ReferenceInfo</code> DOM element.
+	 * 
+	 * @param refInfoElem
+	 *            The <code>ReferenceInfo</code> DOM element to parse.
+	 * @return The <code>ReferenceInfo</code> API object containing the data
+	 *         from the given <code>ReferenceInfo</code> DOM element.
+	 * @throws MOAApplicationException
+	 *             An error occurred parsing the <code>ReferenceInfo</code> DOM
+	 *             element.
+	 */
+	private ReferenceInfo parseReferenceInfo(Element refInfoElem) throws MOAApplicationException {
+		List profiles = parseVerifyTransformsInfoProfiles(refInfoElem);
+		return factory.createReferenceInfo(profiles);
+	}
+
+	/**
+	 * Parse the <code>VerifyTransformsInfoProfile</code> DOM elements contained
+	 * in a <code>ReferenceInfo</code> DOM element.
+	 * 
+	 * @param refInfoElem
+	 *            <code>ReferenceInfo</code> DOM element containing the
+	 *            <code>VerifyTransformsInfoProfile</code> DOM elements.
+	 * @return A <code>List</code> of <code>VerifyTransformsInfoProfile</code>
+	 *         API objects containing the profile data.
+	 * @throws MOAApplicationException
+	 *             An error occurred building the
+	 *             <code>VerifyTransformsInfoProfile</code>s.
+	 */
+	private List parseVerifyTransformsInfoProfiles(Element refInfoElem) throws MOAApplicationException {
+
+		List profiles = new ArrayList();
+		NodeIterator profileElems = XPathUtils.selectNodeIterator(refInfoElem, VERIFY_TRANSFORMS_INFO_PROFILE_XPATH);
+		Element profileElem;
+
+		while ((profileElem = (Element) profileElems.nextNode()) != null) {
+			if ("VerifyTransformsInfoProfile".equals(profileElem.getLocalName())) {
+				ProfileParser profileParser = new ProfileParser();
+				profiles.add(profileParser.parseVerifyTransformsInfoProfile(profileElem));
+			} else {
+				String profileID = DOMUtils.getText(profileElem);
+				profiles.add(factory.createVerifyTransformsInfoProfile(profileID));
+			}
+		}
+		return profiles;
+	}
 
 }
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java
index bc949fa..2109b35 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java
@@ -32,9 +32,9 @@ import org.w3c.dom.DocumentFragment;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
-import at.gv.egovernment.moa.util.Base64Utils;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.util.Base64Utils;
+import at.gv.egovernment.moaspss.util.Constants;
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.MOASystemException;
 import at.gv.egovernment.moa.spss.api.common.Content;
@@ -137,23 +137,18 @@ public class VerifyXMLSignatureResponseBuilder {
 		ResponseBuilderUtils.addCodeInfoElement(responseDoc, responseElem, "CertificateCheck",
 				response.getCertificateCheck().getCode(), response.getCertificateCheck().getInfo());
 
-		try {
-			if (ConfigurationProvider.getInstance().getAdesFormResults() && response.getAdESFormResults() != null) {
+		if (response.getAdESFormResults() != null) {
 
-				Iterator formIterator = response.getAdESFormResults().iterator();
+			Iterator formIterator = response.getAdESFormResults().iterator();
 
-				while (formIterator.hasNext()) {
-					AdESFormResults adESFormResult = (AdESFormResults) formIterator.next();
-					// add the CertificateCheck
-					ResponseBuilderUtils.addFormCheckElement(responseDoc, responseElem, "FormCheckResult",
-							adESFormResult.getCode().intValue(), adESFormResult.getName());
+			while (formIterator.hasNext()) {
+				AdESFormResults adESFormResult = (AdESFormResults) formIterator.next();
+				// add the CertificateCheck
+				ResponseBuilderUtils.addFormCheckElement(responseDoc, responseElem, "FormCheckResult",
+						adESFormResult.getCode().intValue(), adESFormResult.getName());
 
-				}
 			}
-		} catch (ConfigurationException e) {
-			Logger.warn("Failed to access configuration to determine if we should return AdES Form Results");
 		}
-
 		return responseDoc;
 	}
 
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureRequest.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureRequest.java
index a6272d5..c4a0fd1 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureRequest.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureRequest.java
@@ -76,4 +76,12 @@ public interface VerifyXMLSignatureRequest {
    * @return The id of the trusted certificates.
    */
   public String getTrustProfileId();
+  
+  /**
+   * Should perform extended validation
+   * 
+   * @return <code>true</code>, if signed data will be returned,
+   * otherwise <code>false</code>.
+   */
+  public boolean getExtendedValidaiton();
 }
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/CRLDistributionPoint.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/CRLDistributionPoint.java
index bb2589a..b2389a4 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/CRLDistributionPoint.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/CRLDistributionPoint.java
@@ -31,10 +31,9 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
-
 import at.gv.egovernment.moa.spss.util.MessageProvider;
+import at.gv.egovernment.moaspss.logging.LogMsg;
+import at.gv.egovernment.moaspss.logging.Logger;
 
 /**
  * A class representing a CRL distribution point.
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
index 6bc6f0b..3c7bf6a 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
@@ -31,6 +31,7 @@ import iaik.pki.revocation.RevocationSourceTypes;
 import iaik.server.modules.xml.BlackListEntry;
 import iaik.server.modules.xml.ExternalReferenceChecker;
 import iaik.server.modules.xml.WhiteListEntry;
+import iaik.util.logging.Log;
 import iaik.utils.RFC2253NameParser;
 import iaik.utils.RFC2253NameParserException;
 import iaik.xml.crypto.utils.URI;
@@ -62,16 +63,16 @@ import org.w3c.dom.Element;
 import org.w3c.dom.traversal.NodeIterator;
 import org.xml.sax.SAXException;
 
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.spss.api.common.TSLConfiguration;
 import at.gv.egovernment.moa.spss.api.impl.TSLConfigurationImpl;
 import at.gv.egovernment.moa.spss.util.MessageProvider;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.FileUtils;
-import at.gv.egovernment.moa.util.StringUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
+import at.gv.egovernment.moaspss.logging.LogMsg;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.DOMUtils;
+import at.gv.egovernment.moaspss.util.FileUtils;
+import at.gv.egovernment.moaspss.util.StringUtils;
+import at.gv.egovernment.moaspss.util.XPathUtils;
 
 /**
  * A class that builds configuration data from a DOM based representation.
@@ -259,6 +260,16 @@ public class ConfigurationPartsBuilder {
 	    ROOT + CONF + "SignatureVerification/" 
 	    + CONF + "PermitFileURIs";
   
+  private static final String CONNECTION_TIMEOUT_XPATH_ =
+		    ROOT + CONF + "SignatureVerification/" 
+		    + CONF + "CertificateValidation/"
+		    + CONF + "ConnectionTimeout";
+		    
+  private static final String READ_TIMEOUT_XPATH_ =
+    ROOT + CONF + "SignatureVerification/" 
+    + CONF + "CertificateValidation/"
+    + CONF + "ReadTimeout";
+  
   private static final String TSL_CONFIGURATION_XPATH = 
 	  ROOT + CONF + "SignatureVerification/"
 	  + CONF + "CertificateValidation/" 
@@ -408,6 +419,51 @@ public class ConfigurationPartsBuilder {
     return pdfasConfiguration;
   }
   
+  /**
+   * Returns the digest method algorithm name.
+   * 
+   * @return The digest method algorithm name from the configuration.
+   */
+  public int getConnectionTimeout() 
+  {
+    String connectionTimeout = getElementValue(getConfigElem(), CONNECTION_TIMEOUT_XPATH_, "30");
+    int defaultConnectionTimeout = 30;
+    
+    if(connectionTimeout != null) {
+    	try {
+    		defaultConnectionTimeout = Integer.parseInt(connectionTimeout);
+    	} catch(NumberFormatException e) {
+    		Log.warn("Configuration value " + CONNECTION_TIMEOUT_XPATH_ + " should be a number defaulting to 30");
+    	}
+    }
+    
+    if(defaultConnectionTimeout < 0) {
+    	defaultConnectionTimeout = 30;
+    }
+    
+    return defaultConnectionTimeout;
+  }
+  
+  public int getReadTimeout() 
+  {
+    String connectionTimeout = getElementValue(getConfigElem(), READ_TIMEOUT_XPATH_, "30");
+    int defaultConnectionTimeout = 30;
+    
+    if(connectionTimeout != null) {
+    	try {
+    		defaultConnectionTimeout = Integer.parseInt(connectionTimeout);
+    	} catch(NumberFormatException e) {
+    		Log.warn("Configuration value " + READ_TIMEOUT_XPATH_ + " should be a number defaulting to 30");
+    	}
+    }
+    
+    if(defaultConnectionTimeout < 0) {
+    	defaultConnectionTimeout = 30;
+    }
+    
+    return defaultConnectionTimeout;
+  }
+  
   public boolean getAdesFormResult()
   {
 	  String enableArchiving = getElementValue(getConfigElem(), FORMRESULT_CONFIGURATION_XPATH, null);
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
index 578f2fd..d777d8f 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
@@ -46,11 +46,11 @@ import java.util.Set;
 
 import org.w3c.dom.Element;
 
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.spss.api.common.TSLConfiguration;
 import at.gv.egovernment.moa.spss.util.MessageProvider;
-import at.gv.egovernment.moa.util.DOMUtils;
+import at.gv.egovernment.moaspss.logging.LogMsg;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.util.DOMUtils;
 
 /**
  * A class providing access to the MOA configuration data.
@@ -107,6 +107,9 @@ public class ConfigurationProvider
   /** PDF AS Configuration */
   private String pdfAsConfiguration;
   
+  private int connectionTimeout;
+  private int readTimeout;
+  
   /** 
    * A <code>List</code> of <code>HardwareCryptoModule</code> objects for 
    * configuring hardware modules.
@@ -376,6 +379,8 @@ public class ConfigurationProvider
       keyGroupMappings =
         builder.buildKeyGroupMappings(keyGroups, ANONYMOUS_ISSUER_SERIAL);
       
+      connectionTimeout = builder.getConnectionTimeout();
+      readTimeout = builder.getReadTimeout();
       pdfAsConfiguration = builder.getPDFASConfiguration();
       adesFormResults = builder.getAdesFormResult();
       xadesVersion = builder.getXAdESVersion();
@@ -553,8 +558,16 @@ public class ConfigurationProvider
   }
   
   public String getPDFASConfiguration() {
-	    return pdfAsConfiguration;
-	  }
+	return pdfAsConfiguration;
+  }
+  
+  public int getConnectionTimeout() {
+	  return this.connectionTimeout;
+  }
+  
+  public int getReadTimeout() {
+	  return this.readTimeout;
+  }
  
   public boolean getAdesFormResults() {
 	  return this.adesFormResults;
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmssign/CMSSignatureCreationProfileImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmssign/CMSSignatureCreationProfileImpl.java
index 49e5ecc..2dc047a 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmssign/CMSSignatureCreationProfileImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmssign/CMSSignatureCreationProfileImpl.java
@@ -35,10 +35,10 @@ import iaik.server.modules.keys.UnknownKeyException;
 import java.util.List;
 import java.util.Set;
 
-import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.spss.server.logging.TransactionId;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
+import at.gv.egovernment.moaspss.logging.Logger;
 
 /**
  * An object providing auxiliary information for creating a CMS signature.
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmsverify/PDFSignatureVerificationProfileImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmsverify/PDFSignatureVerificationProfileImpl.java
index 9189597..785c85b 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmsverify/PDFSignatureVerificationProfileImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmsverify/PDFSignatureVerificationProfileImpl.java
@@ -1,6 +1,6 @@
 package at.gv.egovernment.moa.spss.server.iaik.cmsverify;
 
-import iaik.server.modules.cmsverify.PDFSignatureVerificationProfile;
+import iaik.server.modules.pdfverify.PDFSignatureVerificationProfile;
 
 public class PDFSignatureVerificationProfileImpl extends CMSSignatureVerificationProfileImpl
 		implements PDFSignatureVerificationProfile {
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/CRLRetriever.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/CRLRetriever.java
index 304a7d3..d752a63 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/CRLRetriever.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/CRLRetriever.java
@@ -33,11 +33,12 @@ import iaik.pki.ldap.Handler;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.net.URLConnection;
 import java.net.URLStreamHandler;
 import java.util.Collection;
 import java.util.Date;
 
-import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moaspss.logging.Logger;
 
 /**
  * A customized implementation of
@@ -51,6 +52,11 @@ import at.gv.egovernment.moa.logging.Logger;
  * @version $$
  */
 public class CRLRetriever implements RevocationInfoRetriever {
+	
+	private int connectTimeout = 5;
+	private int readTimeout = 5;
+	
+	
 	public void update(RevocationSource source, Collection supplementalRequestData, TransactionId tid)
 			throws RevocationStoreException {
 		if (source == null) {
@@ -70,8 +76,10 @@ public class CRLRetriever implements RevocationInfoRetriever {
 				URLStreamHandler handler = new Handler();
 				crlUrl = new URL(null, source.getUri(), handler);
 			}
-
-			InputStream crlInputStream = crlUrl.openStream();
+			URLConnection con = crlUrl.openConnection();
+			con.setConnectTimeout(connectTimeout);
+			con.setReadTimeout(readTimeout);
+			InputStream crlInputStream = con.getInputStream();
 			source.readFrom(crlInputStream, tid);
 			source.setDownloadTime(new Date());
 			crlInputStream.close();
@@ -83,11 +91,11 @@ public class CRLRetriever implements RevocationInfoRetriever {
 
 	@Override
 	public void setConnectTimeout(int arg0) {
-		// TODO AFITZEK IMPLEMENT THIS METHOD
+		this.connectTimeout = arg0;
 	}
 
 	@Override
 	public void setReadTimeout(int arg0) {
-		// TODO AFITZEK IMPLEMENT THIS METHOD
+		this.readTimeout = arg0;
 	}
 }
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java
index ef9ddeb..c49004b 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java
@@ -43,8 +43,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationException;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
 import at.gv.egovernment.moa.spss.server.config.KeyGroup;
@@ -53,6 +51,8 @@ import at.gv.egovernment.moa.spss.server.logging.TransactionId;
 import at.gv.egovernment.moa.spss.util.CertStoreConverter;
 import at.gv.egovernment.moa.spss.util.MessageProvider;
 import at.gv.egovernment.moa.spss.util.SecProviderUtils;
+import at.gv.egovernment.moaspss.logging.LogMsg;
+import at.gv.egovernment.moaspss.logging.Logger;
 
 /**
  * A class responsible for configuring the IAIK MOA modules.
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/LoggerConfigImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/LoggerConfigImpl.java
index 3fb842f..317fcca 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/LoggerConfigImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/LoggerConfigImpl.java
@@ -26,11 +26,10 @@ package at.gv.egovernment.moa.spss.server.iaik.config;
 
 import java.util.Properties;
 
+import at.gv.egovernment.moaspss.logging.LoggingContextManager;
 import iaik.logging.LogConfigurationException;
 import iaik.logging.LoggerConfig;
 
-import at.gv.egovernment.moa.logging.LoggingContextManager;
-
 /**
  * Default implementation of the <code>LoggerConfig</code> interface.
  * 
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/PKIConfigurationImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/PKIConfigurationImpl.java
index fe0de1f..6341609 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/PKIConfigurationImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/PKIConfigurationImpl.java
@@ -47,6 +47,8 @@ public class PKIConfigurationImpl implements PKIConfiguration {
 	private ArchiveConfiguration archiveConfiguration;
 	/** The certificate validation configuration. */
 	private ValidationConfiguration validationConfiguration;
+	private int connectionTimeout;
+	private int readTimeout;
 
 	/**
 	 * Create a new <code>PKIConfigurationImpl</code>.
@@ -68,6 +70,8 @@ public class PKIConfigurationImpl implements PKIConfiguration {
 		}
 
 		this.validationConfiguration = new ValidationConfigurationImpl(config);
+		this.connectionTimeout = config.getConnectionTimeout();
+		this.readTimeout = config.getReadTimeout();
 	}
 
 	/**
@@ -100,14 +104,12 @@ public class PKIConfigurationImpl implements PKIConfiguration {
 
 	@Override
 	public int getConnectTimeout() {
-		// TODO AFITZEK IMPLEMENT THIS METHOD
-		return 0;
+		return this.connectionTimeout;
 	}
 
 	@Override
 	public int getReadTimeout() {
-		// TODO AFITZEK IMPLEMENT THIS METHOD
-		return 0;
+		return this.readTimeout;
 	}
 
 }
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/RevocationConfigurationImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/RevocationConfigurationImpl.java
index a09a701..5df84c9 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/RevocationConfigurationImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/RevocationConfigurationImpl.java
@@ -27,6 +27,7 @@ import iaik.pki.revocation.RevocationConfiguration;
 import iaik.pki.revocation.dbcrl.config.DBCrlConfig;
 
 import java.security.cert.X509Certificate;
+import java.util.Collections;
 import java.util.Date;
 import java.util.Map;
 import java.util.Set;
@@ -100,7 +101,7 @@ public class RevocationConfigurationImpl extends AbstractObservableConfiguration
 	@Override
 	public Set getPositiveOCSPResponders() {
 		// TODO AFITZEK IMPLEMENT THIS METHOD
-		return null;
+		return Collections.EMPTY_SET;
 	}
 
 	@Override
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/SoftwareKeyModuleConfigurationImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/SoftwareKeyModuleConfigurationImpl.java
index 937f32f..1aed76e 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/SoftwareKeyModuleConfigurationImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/SoftwareKeyModuleConfigurationImpl.java
@@ -30,12 +30,10 @@ import java.io.InputStream;
 
 import iaik.server.modules.keys.ConfigurationException;
 import iaik.server.modules.keys.SoftwareKeyModuleConfiguration;
-
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
-
 import at.gv.egovernment.moa.spss.server.config.SoftwareKeyModule;
 import at.gv.egovernment.moa.spss.util.MessageProvider;
+import at.gv.egovernment.moaspss.logging.LogMsg;
+import at.gv.egovernment.moaspss.logging.Logger;
 
 /**
  * An implementation of the <code>SoftwareKeyModuleConfiguration</code> wrapping
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XSLTTransformationImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XSLTTransformationImpl.java
index 1c5d26a..9e6ed6d 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XSLTTransformationImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XSLTTransformationImpl.java
@@ -39,12 +39,16 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
 import at.gv.egovernment.moa.spss.util.NodeListToNodeSetDataAdapter;
-import at.gv.egovernment.moa.util.NodeListAdapter;
-import at.gv.egovernment.moa.util.StreamUtils;
-import at.gv.egovernment.moa.util.XPathException;
-import at.gv.egovernment.moa.util.XPathUtils;
+import at.gv.egovernment.moaspss.util.NodeListAdapter;
+import at.gv.egovernment.moaspss.util.StreamUtils;
+import at.gv.egovernment.moaspss.util.XPathException;
+import at.gv.egovernment.moaspss.util.XPathUtils;
+import iaik.server.modules.xml.MOAXSecProvider;
 import iaik.server.modules.xml.XSLTTransformation;
 import iaik.xml.crypto.dsig.XMLSignatureFactory;
+import iaik.xml.filter.impl.dsig.CanonInputStream;
+import iaik.xml.filter.impl.dsig.Canonicalizer;
+import iaik.xml.filter.impl.dsig.Traverser;
 
 /**
  * A <code>Transformation</code> containing an XSLT transformation.
@@ -195,12 +199,18 @@ public class XSLTTransformationImpl extends TransformationImpl implements XSLTTr
    */
   private static InputStream canonicalize(Element element)
     throws NoSuchAlgorithmException, InvalidAlgorithmParameterException, IOException, TransformException {
-	  CanonicalizationMethod canonicalizationMethod = XMLSignatureFactory.getInstance().newCanonicalizationMethod(
-			  CanonicalizationMethod.EXCLUSIVE, new ExcC14NParameterSpec());
+	 // CanonicalizationMethod canonicalizationMethod = 
+		//	  MOAXSecProvider.getXMLSignatureFactory().newCanonicalizationMethod(
+		//	  CanonicalizationMethod.EXCLUSIVE, new ExcC14NParameterSpec());
 	  
     //CanonicalizationAlgorithm c14n =
      // new CanonicalizationAlgorithmImplExclusiveCanonicalXML();
-    NodeList nodeList;
+	Traverser traverser = new Traverser(element, true, true); 
+	Canonicalizer canonicalizer = new Canonicalizer(traverser, false, true, null); 
+	
+	return new CanonInputStream(canonicalizer); 
+	/*
+	NodeList nodeList;
   
     try {
       nodeList = XPathUtils.selectNodeList(element, XPathUtils.ALL_NODES_XPATH);
@@ -211,7 +221,7 @@ public class XSLTTransformationImpl extends TransformationImpl implements XSLTTr
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     canonicalizationMethod.transform(new NodeListToNodeSetDataAdapter(nodeList), null, baos);
     baos.close();
-    return new ByteArrayInputStream(baos.toByteArray());
+    return new ByteArrayInputStream(baos.toByteArray());*/
   }
 
 }
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xmlsign/XMLSignatureCreationProfileImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xmlsign/XMLSignatureCreationProfileImpl.java
index 7d0c5a0..9d6e3d2 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xmlsign/XMLSignatureCreationProfileImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xmlsign/XMLSignatureCreationProfileImpl.java
@@ -37,11 +37,11 @@ import iaik.server.modules.xmlsign.XMLSignatureInsertionLocation;
 import java.util.List;
 import java.util.Set;
 
-import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.spss.server.logging.TransactionId;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
 import at.gv.egovernment.moa.spss.server.util.IdGenerator;
+import at.gv.egovernment.moaspss.logging.Logger;
 
 /**
  * An object providing auxiliary information for creating an XML signature.
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java
index 37569c5..094e446 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java
@@ -36,25 +36,28 @@ import java.util.Timer;
 
 import org.slf4j.LoggerFactory;
 
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.logging.LoggingContext;
-import at.gv.egovernment.moa.logging.LoggingContextManager;
 import at.gv.egovernment.moa.spss.MOAException;
 import at.gv.egovernment.moa.spss.api.common.TSLConfiguration;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
 import at.gv.egovernment.moa.spss.server.iaik.config.IaikConfigurator;
 import at.gv.egovernment.moa.spss.server.service.RevocationArchiveCleaner;
+import at.gv.egovernment.moa.spss.tsl.connector.MOATSLVerifier;
 import at.gv.egovernment.moa.spss.tsl.connector.TSLConnector;
 import at.gv.egovernment.moa.spss.tsl.timer.TSLUpdaterTimerTask;
 import at.gv.egovernment.moa.spss.util.MessageProvider;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
+import at.gv.egovernment.moaspss.logging.LogMsg;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.logging.LoggingContext;
+import at.gv.egovernment.moaspss.logging.LoggingContextManager;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.DOMUtils;
 import iaik.pki.store.certstore.CertStoreException;
 import iaik.pki.store.truststore.TrustStoreException;
 import iaik.server.ConfigurationData;
+import iaik.xml.crypto.tsl.SecuredSAXParserFactoryImpl;
 import iaik.xml.crypto.tsl.ex.TSLEngineDiedException;
 import iaik.xml.crypto.tsl.ex.TSLSearchException;
+import iaik.xml.crypto.tsl.verify.ITSLVerifierFactory;
 
 /**
  * MOA SP/SS web service initialization.
@@ -93,8 +96,8 @@ public class SystemInitializer {
 	  logger.info("##############################################################################");
 	  logger.info("##############################################################################");
 	  logger.info("###                                                                        ###");
-	  logger.info("###                          LOADING MOA-SIG                               ###");
-	  logger.info("###                          ===============                               ###");
+	  logger.info("###                          LOADING MOA-SPSS                              ###");
+	  logger.info("###                          ================                              ###");
 	  logger.info("###                                                                        ###");
 	  logger.info("##############################################################################");
 	  logger.info("##############################################################################");
@@ -153,7 +156,11 @@ public class SystemInitializer {
       TSLConnector tslconnector = new TSLConnector();
       if (tslconfig != null) {
     	  //Logger.info(new LogMsg(msg.getMessage("init.01", null)));
+    	  SecuredSAXParserFactoryImpl.newInstance();
     	  Logger.info(new LogMsg(msg.getMessage("config.41", null)));
+    	  
+    	  ITSLVerifierFactory.setITSLVerifier(new MOATSLVerifier());
+    	  
     	  tslconnector.initialize(tslconfig.getEuTSLUrl(), tslconfig.getWorkingDirectory(), null, null);
   		  
       }
@@ -188,6 +195,11 @@ public class SystemInitializer {
     	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
     } catch (CertificateException e) {
     	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
+	} catch (Throwable e) {
+    	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
+    	throw e;
+	} finally {
+		logger.info("Configuration initialized");
 	}
 
     
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureCreationInvoker.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureCreationInvoker.java
index df04434..8e9380e 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureCreationInvoker.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureCreationInvoker.java
@@ -52,8 +52,6 @@ import java.util.Set;
 
 import org.apache.commons.io.IOUtils;
 
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.MOAException;
 import at.gv.egovernment.moa.spss.MOASystemException;
@@ -75,7 +73,9 @@ import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
 import at.gv.egovernment.moa.spss.util.FilteredOutputStream;
 import at.gv.egovernment.moa.spss.util.MessageProvider;
-import at.gv.egovernment.moa.util.Constants;
+import at.gv.egovernment.moaspss.logging.LogMsg;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.util.Constants;
 
 /**
  * A class providing an API based interface to the
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java
index 905254e..906abbe 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java
@@ -21,7 +21,6 @@
  * that you distribute must include a readable copy of the "NOTICE" text file.
  */
 
-
 package at.gv.egovernment.moa.spss.server.invoke;
 
 import iaik.server.modules.AdESFormVerificationResult;
@@ -34,6 +33,11 @@ import iaik.server.modules.cmsverify.CMSSignatureVerificationModuleFactory;
 import iaik.server.modules.cmsverify.CMSSignatureVerificationProfile;
 import iaik.server.modules.cmsverify.CMSSignatureVerificationResult;
 import iaik.server.modules.cmsverify.ExtendedCMSSignatureVerificationResult;
+import iaik.server.modules.pdfverify.PDFSignatureVerificationProfile;
+import iaik.server.modules.pdfverify.PDFSignatureVerificationResult;
+import iaik.util.logging.Log;
+import iaik.server.modules.pdfverify.ExtendedPDFSignatureVerificationResult;
+import iaik.server.modules.pdfverify.PDFSignatureVerificationModule;
 import iaik.x509.X509Certificate;
 
 import java.io.ByteArrayInputStream;
@@ -50,10 +54,8 @@ import java.util.List;
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.io.HexDump;
 import org.apache.commons.io.IOUtils;
+import org.slf4j.LoggerFactory;
 
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.logging.LoggingContext;
-import at.gv.egovernment.moa.logging.LoggingContextManager;
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.MOAException;
 import at.gv.egovernment.moa.spss.api.cmsverify.CMSContent;
@@ -70,14 +72,17 @@ import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
 import at.gv.egovernment.moa.spss.util.CertificateUtils;
 import at.gv.egovernment.moa.spss.util.QCSSCDResult;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.logging.LoggingContext;
+import at.gv.egovernment.moaspss.logging.LoggingContextManager;
 
 /**
  * A class providing an interface to the
  * <code>CMSSignatureVerificationModule</code>.
  * 
- * This class performs the invocation of the 
+ * This class performs the invocation of the
  * <code>iaik.server.modules.cmsverify.CMSSignatureVerificationModule</code>
- * from a <code>VerifyCMSSignatureRequest</code>. The result of the invocation 
+ * from a <code>VerifyCMSSignatureRequest</code>. The result of the invocation
  * is integrated into a <code>VerifyCMSSignatureResponse</code> returned.
  * 
  * @author Patrick Peck
@@ -85,338 +90,414 @@ import at.gv.egovernment.moa.spss.util.QCSSCDResult;
  */
 public class CMSSignatureVerificationInvoker {
 
-  /** The single instance of this class. */
-  private static CMSSignatureVerificationInvoker instance = null;
-
-  /**
-   * Return the only instance of this class.
-   * 
-   * @return The only instance of this class.
-   */
-  public static synchronized CMSSignatureVerificationInvoker getInstance() {
-    if (instance == null) {
-      instance = new CMSSignatureVerificationInvoker();
-    }
-    return instance;
-  }
-
-  /**
-   * Create a new <code>CMSSignatureVerificationInvoker</code>.
-   * 
-   * Protected to disallow multiple instances.
-   */
-  protected CMSSignatureVerificationInvoker() {
-  }
-
-  /**
-   * Verify a CMS signature.
-   * 
-   * @param request The <code>VerifyCMSSignatureRequest</code> containing the
-   * CMS signature, as well as additional data needed for verification.
-   * @return Element A <code>VerifyCMSSignatureResponse</code> containing the
-   * answer to the <code>VerifyCMSSignatureRequest</code>.
-   * @throws MOAException An error occurred while processing the request.
-   */
-  public VerifyCMSSignatureResponse verifyCMSSignature(VerifyCMSSignatureRequest request)
-    throws MOAException {
-	  
-    CMSSignatureVerificationProfileFactory profileFactory =
-      new CMSSignatureVerificationProfileFactory(request);
-    VerifyCMSSignatureResponseBuilder responseBuilder =
-      new VerifyCMSSignatureResponseBuilder();
-    TransactionContext context =
-      TransactionContextManager.getInstance().getTransactionContext();
-    LoggingContext loggingCtx =
-      LoggingContextManager.getInstance().getLoggingContext();
-    InputStream signature;
-    InputStream signedContent = null;
-    CMSSignatureVerificationProfile profile;
-    Date signingTime;
-    List results;
-    ExtendedCMSSignatureVerificationResult result;
-    int[] signatories;
-    InputStream input;
-    byte[] buf = new byte[2048];
-
-    // get the signature
-    signature = request.getCMSSignature();
-    
- // get the actual trustprofile
-    TrustProfile trustProfile = context.getConfiguration().getTrustProfile(request.getTrustProfileId());
-    
-    try {
-      // get the signed content
-      signedContent = getSignedContent(request);
-      
-      // build the profile
-      if(request.isPDF()) {
-    	  profile = profileFactory.createPDFProfile();
-      } else {
-    	  profile = profileFactory.createProfile();
-      }
-
-      // get the signing time
-      signingTime = request.getDateTime();
-
-      // verify the signature
-      CMSSignatureVerificationModule module =
-        CMSSignatureVerificationModuleFactory.getInstance();
-
-      module.setLog(new IaikLog(loggingCtx.getNodeID()));
-      
-      module.init(
-        signature,
-        signedContent,
-        profile,
-        new TransactionId(context.getTransactionID()));
-      input = module.getInputStream();
-
-      while (input.read(buf) > 0);
-      //results = module.verifyCAdESSignature(signingTime);
-      results = module.verifySignature(signingTime);
-      
-    } catch (IAIKException e) {
-      MOAException moaException = IaikExceptionMapper.getInstance().map(e);
-      throw moaException;
-    } catch (IAIKRuntimeException e) {
-      MOAException moaException = IaikExceptionMapper.getInstance().map(e);
-      throw moaException;
-    } catch (IOException e) {
-      throw new MOAApplicationException("2244", null, e);
-    } catch (MOAException e)
-    {
-      throw e;
-    }
-    finally
-    {
-      try
-      {
-        if (signedContent != null) signedContent.close();
-      }
-      catch (Throwable t)
-      {
-        // Intentionally do nothing here
-      }
-    }
-
-    QCSSCDResult qcsscdresult = new QCSSCDResult();
-    
-    // build the response: for each signatory add the result to the response
-    signatories = request.getSignatories();
-    if (signatories == VerifyCMSSignatureRequest.ALL_SIGNATORIES) {
-      Iterator resultIter;
-
-      for (resultIter = results.iterator(); resultIter.hasNext();) {
-    	  Object resultObject = resultIter.next();
-    	  CMSSignatureVerificationResult cmsResult = null;
-    	  List adesResults = null;
-    	  if(resultObject instanceof ExtendedCMSSignatureVerificationResult) {
-    		  result = (ExtendedCMSSignatureVerificationResult) resultObject;
-
-    		  adesResults = getAdESResult(result.getFormVerificationResult());
-
-    			if (adesResults != null) {
-    				Iterator adesIterator = adesResults.iterator();
-    				while (adesIterator.hasNext()) {
-    					Logger.info("ADES Formresults: " + adesIterator.next().toString());
-    				}
-    			}
-    	  } else {
-    		  cmsResult = (CMSSignatureVerificationResult)resultObject;
-    	  }
-    	  
-        
-        String issuerCountryCode = null;
-        // QC/SSCD check
-        
-        List list = cmsResult.getCertificateValidationResult().getCertificateChain();
-        if (list != null) {
-            X509Certificate[] chain = new X509Certificate[list.size()];
-            
-            Iterator it = list.iterator();
-            int i = 0;
-            while(it.hasNext()) {
-            	chain[i] = (X509Certificate)it.next();
-            	i++;
-            }
-            
-            
-            qcsscdresult = CertificateUtils.checkQCSSCD(chain, trustProfile.isTSLEnabled());
-
-            // get signer certificate issuer country code
-            issuerCountryCode = CertificateUtils.getIssuerCountry((X509Certificate)list.get(0));
-
-        }
-        
-        responseBuilder.addResult(cmsResult, trustProfile, qcsscdresult.isQC(), qcsscdresult.isQCSourceTSL(), qcsscdresult.isSSCD(), qcsscdresult.isSSCDSourceTSL(), issuerCountryCode, adesResults);
-      }
-    } else {
-      int i;
-
-      for (i = 0; i < signatories.length; i++) {
-        int sigIndex = signatories[i] - 1;
-
-        try {
-          result =
-            (ExtendedCMSSignatureVerificationResult) results.get(signatories[i] - 1);
-          
-          String issuerCountryCode = null;
-          
-          CMSSignatureVerificationResult cmsResult = result.getCMSSignatureVerificationResult();
-          
-          List adesResults = getAdESResult(result.getFormVerificationResult());
-
-  		if (adesResults != null) {
-  			Iterator adesIterator = adesResults.iterator();
-  			while (adesIterator.hasNext()) {
-  				Logger.info("ADES Formresults: " + adesIterator.next().toString());
-  			}
-  		}
-          
-          // QC/SSCD check
-          List list = cmsResult.getCertificateValidationResult().getCertificateChain();
-          if (list != null) {
-              X509Certificate[] chain = new X509Certificate[list.size()];
-              
-              Iterator it = list.iterator();
-              int j = 0;
-              while(it.hasNext()) {
-              	chain[j] = (X509Certificate)it.next();
-              	j++;
-              }
-              
-              
-              qcsscdresult = CertificateUtils.checkQCSSCD(chain, trustProfile.isTSLEnabled());
-              
-              issuerCountryCode = CertificateUtils.getIssuerCountry((X509Certificate)list.get(0)); 
-          }
-            
-          responseBuilder.addResult(cmsResult, trustProfile, qcsscdresult.isQC(), qcsscdresult.isQCSourceTSL(), qcsscdresult.isSSCD(), qcsscdresult.isSSCDSourceTSL(), issuerCountryCode, adesResults);
-        } catch (IndexOutOfBoundsException e) {
-          throw new MOAApplicationException(
-            "2249",
-            new Object[] { new Integer(sigIndex)});
-        }
-      }
-    }
-    
-    return responseBuilder.getResponse();
-  }
-
- 
-  /**
-   * Get the signed content contained either in the request itself or given as a
-   * reference to external data.
-   * 
-   * @param request The <code>VerifyCMSSignatureRequest</code> containing the
-   * signed content (or the reference to the signed content).
-   * @return InputStream A stream providing the signed content data, or
-   * <code>null</code> if no signed content was provided with the request.
-   * @throws MOAApplicationException An error occurred building the stream.
-   */
-  private InputStream getSignedContent(VerifyCMSSignatureRequest request)
-    throws MOAApplicationException {
-
-	  InputStream is = null;
-    CMSDataObject dataObj;
-    CMSContent content;
-
-    // select the Content element
-    dataObj = request.getDataObject();
-    if (dataObj == null) {
-      return null;
-    }
-    content = dataObj.getContent();
-    
-    // build the content data
-    switch (content.getContentType()) {
-      case CMSContent.EXPLICIT_CONTENT :
-        is = ((CMSContentExcplicit) content).getBinaryContent();
-        is = excludeByteRange(is, request);
-        return is;
-      case CMSContent.REFERENCE_CONTENT :
-        String reference = ((CMSContentReference) content).getReference();
-        if (!"".equals(reference)) {
-          ExternalURIResolver resolver = new ExternalURIResolver();
-          is = resolver.resolve(reference);
-          is = excludeByteRange(is, request);
-          return is;          
-        } else {
-          return null;
-        }
-      default :
-        return null;
-    }
-    
-
-
-  }
-  
-  private InputStream excludeByteRange(InputStream contentIs, VerifyCMSSignatureRequest request) throws MOAApplicationException {
-	  
-	  int byteRead;
-	  
-	  ByteArrayOutputStream contentOs = new ByteArrayOutputStream();
-	  
-	  CMSDataObject dataobject = request.getDataObject();
-	  BigDecimal from = dataobject.getExcludeByteRangeFrom();
-	  BigDecimal to = dataobject.getExcludeByteRangeTo();
-	  
-	  if ( (from == null) || (to == null))
-		  return contentIs;
-	  
-	  BigDecimal counter = new BigDecimal("0");
-	  BigDecimal one = new BigDecimal("1");
-	  
-	  try {
-		while ((byteRead=contentIs.read()) >= 0) {
-			
-			if (inRange(counter, dataobject)) {
-				  // if byte is in byte range, set byte to 0x00
-				  contentOs.write(0);
-			  }
-			  else
-				  contentOs.write(byteRead);
-			  
-			  counter = counter.add(one);				  
+	/** The single instance of this class. */
+	private static CMSSignatureVerificationInvoker instance = null;
+
+	/**
+	 * Return the only instance of this class.
+	 * 
+	 * @return The only instance of this class.
+	 */
+	public static synchronized CMSSignatureVerificationInvoker getInstance() {
+		if (instance == null) {
+			instance = new CMSSignatureVerificationInvoker();
+		}
+		return instance;
+	}
+
+	/**
+	 * Create a new <code>CMSSignatureVerificationInvoker</code>.
+	 * 
+	 * Protected to disallow multiple instances.
+	 */
+	protected CMSSignatureVerificationInvoker() {
+	}
+
+	/**
+	 * Verify a CMS signature.
+	 * 
+	 * @param request
+	 *            The <code>VerifyCMSSignatureRequest</code> containing the CMS
+	 *            signature, as well as additional data needed for verification.
+	 * @return Element A <code>VerifyCMSSignatureResponse</code> containing the
+	 *         answer to the <code>VerifyCMSSignatureRequest</code>.
+	 * @throws MOAException
+	 *             An error occurred while processing the request.
+	 */
+	public VerifyCMSSignatureResponse verifyCMSSignature(VerifyCMSSignatureRequest request) throws MOAException {
+
+		CMSSignatureVerificationProfileFactory profileFactory = new CMSSignatureVerificationProfileFactory(request);
+		VerifyCMSSignatureResponseBuilder responseBuilder = new VerifyCMSSignatureResponseBuilder();
+		TransactionContext context = TransactionContextManager.getInstance().getTransactionContext();
+		LoggingContext loggingCtx = LoggingContextManager.getInstance().getLoggingContext();
+		InputStream signature;
+		InputStream signedContent = null;
+		Date signingTime;
+		List results;
+		int[] signatories;
+		InputStream input;
+		byte[] buf = new byte[2048];
+
+		// get the signature
+		signature = request.getCMSSignature();
+
+		// get the actual trustprofile
+		TrustProfile trustProfile = context.getConfiguration().getTrustProfile(request.getTrustProfileId());
+
+		try {
+			// get the signing time
+			signingTime = request.getDateTime();
+
+			// build the profile
+			if (request.isPDF()) {
+				PDFSignatureVerificationProfile profile = profileFactory.createPDFProfile();
+				Logger.info("Sending PDFSignatureVerificationProfile to IAIK-MOA");
+
+				PDFSignatureVerificationModule module = iaik.server.modules.pdfverify.PDFSignatureVerificationModuleFactory
+						.getInstance();
+
+				module.setLog(new IaikLog(loggingCtx.getNodeID()));
+
+				module.init(signature, profile, new TransactionId(context.getTransactionID()));
+
+				// input = module.getInputStream();
+
+				// while (input.read(buf) > 0);
+				if(request.isExtended()) {
+					results = module.verifyPAdESSignature(signingTime);
+				} else {
+					results = module.verifySignature(signingTime);
+				}
+
+			} else {
+				// get the signed content
+				signedContent = getSignedContent(request);
+				CMSSignatureVerificationProfile profile = profileFactory.createProfile();
+				Logger.info("Sending CMSSignatureVerificationProfile to IAIK-MOA");
+
+				// verify the signature
+				CMSSignatureVerificationModule module = CMSSignatureVerificationModuleFactory.getInstance();
+
+				module.setLog(new IaikLog(loggingCtx.getNodeID()));
+
+				module.init(signature, signedContent, profile, new TransactionId(context.getTransactionID()));
+				input = module.getInputStream();
+
+				while (input.read(buf) > 0)
+					;
+				
+				if(request.isExtended()) {
+					results = module.verifyCAdESSignature(signingTime);
+				} else {
+					results = module.verifySignature(signingTime);
+				}
+				// results = module.verifySignature(signingTime);
+			}
+
+		} catch (IAIKException e) {
+			MOAException moaException = IaikExceptionMapper.getInstance().map(e);
+			throw moaException;
+		} catch (IAIKRuntimeException e) {
+			MOAException moaException = IaikExceptionMapper.getInstance().map(e);
+			throw moaException;
+		} catch (IOException e) {
+			throw new MOAApplicationException("2244", null, e);
+		} catch (MOAException e) {
+			throw e;
+		} finally {
+			try {
+				if (signedContent != null)
+					signedContent.close();
+			} catch (Throwable t) {
+				// Intentionally do nothing here
+			}
+		}
+
+		QCSSCDResult qcsscdresult = new QCSSCDResult();
+
+		// build the response: for each signatory add the result to the response
+		signatories = request.getSignatories();
+		if (signatories == VerifyCMSSignatureRequest.ALL_SIGNATORIES) {
+			Iterator resultIter;
+
+			for (resultIter = results.iterator(); resultIter.hasNext();) {
+				Object resultObject = resultIter.next();
+				if (!request.isPDF()) {
+					handleCMSResult(resultObject, responseBuilder, trustProfile);
+				} else {
+					handlePDFResult(resultObject, responseBuilder, trustProfile);
+				}
+			}
+		} else {
+			int i;
+
+			for (i = 0; i < signatories.length; i++) {
+				int sigIndex = signatories[i] - 1;
+
+				try {
+					Object resultObject = results.get(signatories[i] - 1);
+					if (!request.isPDF()) {
+						handleCMSResult(resultObject, responseBuilder, trustProfile);
+					} else {
+						handlePDFResult(resultObject, responseBuilder, trustProfile);
+					}
+				} catch (IndexOutOfBoundsException e) {
+					throw new MOAApplicationException("2249", new Object[] { new Integer(sigIndex) });
+				}
+			}
+		}
+
+		return responseBuilder.getResponse();
+	}
+
+	private void handleCMSResult(Object resultObject, VerifyCMSSignatureResponseBuilder responseBuilder,
+			TrustProfile trustProfile) throws MOAException {
+		QCSSCDResult qcsscdresult = new QCSSCDResult();
+
+		CMSSignatureVerificationResult cmsResult = null;
+		List adesResults = null;
+		if (resultObject instanceof ExtendedCMSSignatureVerificationResult) {
+			ExtendedCMSSignatureVerificationResult result = (ExtendedCMSSignatureVerificationResult) resultObject;
+
+			adesResults = getAdESResult(result.getFormVerificationResult());
+
+			if (adesResults != null) {
+				Iterator adesIterator = adesResults.iterator();
+				while (adesIterator.hasNext()) {
+					Logger.info("ADES Formresults: " + adesIterator.next().toString());
+				}
+			}
+		} else {
+			cmsResult = (CMSSignatureVerificationResult) resultObject;
+		}
+
+		String issuerCountryCode = null;
+		// QC/SSCD check
+
+		List list = cmsResult.getCertificateValidationResult().getCertificateChain();
+		if (list != null) {
+			X509Certificate[] chain = new X509Certificate[list.size()];
+
+			Iterator it = list.iterator();
+			int i = 0;
+			while (it.hasNext()) {
+				chain[i] = (X509Certificate) it.next();
+				i++;
+			}
+
+			qcsscdresult = CertificateUtils.checkQCSSCD(chain, trustProfile.isTSLEnabled());
+
+			// get signer certificate issuer country code
+			issuerCountryCode = CertificateUtils.getIssuerCountry((X509Certificate) list.get(0));
+
 		}
-		
-		InputStream is = new ByteArrayInputStream(contentOs.toByteArray());
-		
-		return is;
-		
-		
-	} catch (IOException e) {
-		  throw new MOAApplicationException("2301", null, e);			  
+
+		responseBuilder.addResult(cmsResult, trustProfile, qcsscdresult.isQC(), qcsscdresult.isQCSourceTSL(),
+				qcsscdresult.isSSCD(), qcsscdresult.isSSCDSourceTSL(), issuerCountryCode, adesResults);
 	}
-	  
-  }
-  
- 
-  private boolean inRange(BigDecimal counter, CMSDataObject dataobject) {
-	  BigDecimal from = dataobject.getExcludeByteRangeFrom();
-	  BigDecimal to = dataobject.getExcludeByteRangeTo();
-	  
-	  if ( (from == null) || (to == null))
-		  return false;
-	  
-	  int compare = counter.compareTo(from);
-	  if (compare == -1)
-		  return false;
-	  else {
-		  compare = counter.compareTo(to);
-		  if (compare == 1)
-			  return false;
-		  else
-			  return true;
-	  }
-				  
-	  
-	  
-  }
-
-  
-  private List getAdESResult(AdESFormVerificationResult adesFormVerification) {
+
+	private void handleCMSEXTResult(Object resultObject, VerifyCMSSignatureResponseBuilder responseBuilder,
+			TrustProfile trustProfile) throws MOAException {
+		QCSSCDResult qcsscdresult = new QCSSCDResult();
+
+		CMSSignatureVerificationResult cmsResult = null;
+		List adesResults = null;
+		if (resultObject instanceof ExtendedCMSSignatureVerificationResult) {
+			ExtendedCMSSignatureVerificationResult result = (ExtendedCMSSignatureVerificationResult) resultObject;
+
+			adesResults = getAdESResult(result.getFormVerificationResult());
+
+			if (adesResults != null) {
+				Iterator adesIterator = adesResults.iterator();
+				while (adesIterator.hasNext()) {
+					Logger.info("ADES Formresults: " + adesIterator.next().toString());
+				}
+			}
+			cmsResult = result.getCMSSignatureVerificationResult();
+		} else {
+			cmsResult = (CMSSignatureVerificationResult) resultObject;
+		}
+
+		String issuerCountryCode = null;
+		// QC/SSCD check
+
+		List list = cmsResult.getCertificateValidationResult().getCertificateChain();
+		if (list != null) {
+			X509Certificate[] chain = new X509Certificate[list.size()];
+
+			Iterator it = list.iterator();
+			int i = 0;
+			while (it.hasNext()) {
+				chain[i] = (X509Certificate) it.next();
+				i++;
+			}
+
+			qcsscdresult = CertificateUtils.checkQCSSCD(chain, trustProfile.isTSLEnabled());
+
+			// get signer certificate issuer country code
+			issuerCountryCode = CertificateUtils.getIssuerCountry((X509Certificate) list.get(0));
+
+		}
+
+		responseBuilder.addResult(cmsResult, trustProfile, qcsscdresult.isQC(), qcsscdresult.isQCSourceTSL(),
+				qcsscdresult.isSSCD(), qcsscdresult.isSSCDSourceTSL(), issuerCountryCode, adesResults);
+	}
+
+	private void handlePDFResult(Object resultObject, VerifyCMSSignatureResponseBuilder responseBuilder,
+			TrustProfile trustProfile) throws MOAException {
+		QCSSCDResult qcsscdresult = new QCSSCDResult();
+
+		PDFSignatureVerificationResult cmsResult = null;
+		List adesResults = null;
+		if (resultObject instanceof ExtendedPDFSignatureVerificationResult) {
+			ExtendedPDFSignatureVerificationResult result = (ExtendedPDFSignatureVerificationResult) resultObject;
+
+			adesResults = getAdESResult(result.getFormVerificationResult());
+
+			if (adesResults != null) {
+				Iterator adesIterator = adesResults.iterator();
+				while (adesIterator.hasNext()) {
+					Logger.info("ADES Formresults: " + adesIterator.next().toString());
+				}
+			}
+			cmsResult = result.getPDFSignatureVerificationResult();
+		} else {
+			cmsResult = (PDFSignatureVerificationResult) resultObject;
+		}
+
+		String issuerCountryCode = null;
+		// QC/SSCD check
+
+		List list = cmsResult.getCertificateValidationResult().getCertificateChain();
+		if (list != null) {
+			X509Certificate[] chain = new X509Certificate[list.size()];
+
+			Iterator it = list.iterator();
+			int i = 0;
+			while (it.hasNext()) {
+				chain[i] = (X509Certificate) it.next();
+				i++;
+			}
+
+			qcsscdresult = CertificateUtils.checkQCSSCD(chain, trustProfile.isTSLEnabled());
+
+			// get signer certificate issuer country code
+			issuerCountryCode = CertificateUtils.getIssuerCountry((X509Certificate) list.get(0));
+
+		}
+
+		responseBuilder.addResult(cmsResult, trustProfile, qcsscdresult.isQC(), qcsscdresult.isQCSourceTSL(),
+				qcsscdresult.isSSCD(), qcsscdresult.isSSCDSourceTSL(), issuerCountryCode, adesResults);
+	}
+
+	/**
+	 * Get the signed content contained either in the request itself or given as
+	 * a reference to external data.
+	 * 
+	 * @param request
+	 *            The <code>VerifyCMSSignatureRequest</code> containing the
+	 *            signed content (or the reference to the signed content).
+	 * @return InputStream A stream providing the signed content data, or
+	 *         <code>null</code> if no signed content was provided with the
+	 *         request.
+	 * @throws MOAApplicationException
+	 *             An error occurred building the stream.
+	 */
+	private InputStream getSignedContent(VerifyCMSSignatureRequest request) throws MOAApplicationException {
+
+		InputStream is = null;
+		CMSDataObject dataObj;
+		CMSContent content;
+
+		// select the Content element
+		dataObj = request.getDataObject();
+		if (dataObj == null) {
+			return null;
+		}
+		content = dataObj.getContent();
+
+		// build the content data
+		switch (content.getContentType()) {
+		case CMSContent.EXPLICIT_CONTENT:
+			is = ((CMSContentExcplicit) content).getBinaryContent();
+			is = excludeByteRange(is, request);
+			return is;
+		case CMSContent.REFERENCE_CONTENT:
+			String reference = ((CMSContentReference) content).getReference();
+			if (!"".equals(reference)) {
+				ExternalURIResolver resolver = new ExternalURIResolver();
+				is = resolver.resolve(reference);
+				is = excludeByteRange(is, request);
+				return is;
+			} else {
+				return null;
+			}
+		default:
+			return null;
+		}
+
+	}
+
+	private InputStream excludeByteRange(InputStream contentIs, VerifyCMSSignatureRequest request)
+			throws MOAApplicationException {
+
+		int byteRead;
+
+		ByteArrayOutputStream contentOs = new ByteArrayOutputStream();
+
+		CMSDataObject dataobject = request.getDataObject();
+		BigDecimal from = dataobject.getExcludeByteRangeFrom();
+		BigDecimal to = dataobject.getExcludeByteRangeTo();
+
+		if ((from == null) || (to == null))
+			return contentIs;
+
+		BigDecimal counter = new BigDecimal("0");
+		BigDecimal one = new BigDecimal("1");
+
+		try {
+			while ((byteRead = contentIs.read()) >= 0) {
+
+				if (inRange(counter, dataobject)) {
+					// if byte is in byte range, set byte to 0x00
+					contentOs.write(0);
+				} else
+					contentOs.write(byteRead);
+
+				counter = counter.add(one);
+			}
+
+			InputStream is = new ByteArrayInputStream(contentOs.toByteArray());
+
+			return is;
+
+		} catch (IOException e) {
+			throw new MOAApplicationException("2301", null, e);
+		}
+
+	}
+
+	private boolean inRange(BigDecimal counter, CMSDataObject dataobject) {
+		BigDecimal from = dataobject.getExcludeByteRangeFrom();
+		BigDecimal to = dataobject.getExcludeByteRangeTo();
+
+		if ((from == null) || (to == null))
+			return false;
+
+		int compare = counter.compareTo(from);
+		if (compare == -1)
+			return false;
+		else {
+			compare = counter.compareTo(to);
+			if (compare == 1)
+				return false;
+			else
+				return true;
+		}
+
+	}
+
+	private List getAdESResult(AdESFormVerificationResult adesFormVerification) {
 		if (adesFormVerification == null) {
 			// no form information
 			return null;
@@ -451,5 +532,5 @@ public class CMSSignatureVerificationInvoker {
 			}
 		}
 	}
-  
+
 }
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationProfileFactory.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationProfileFactory.java
index 74b2a89..bd5db6d 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationProfileFactory.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationProfileFactory.java
@@ -33,6 +33,7 @@ import at.gv.egovernment.moa.spss.server.iaik.pki.PKIProfileImpl;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
 import iaik.server.modules.cmsverify.CMSSignatureVerificationProfile;
+import iaik.server.modules.pdfverify.PDFSignatureVerificationProfile;
 
 /**
  * A factory to create a <code>CMSSignatureVerificationProfile</code> from a
@@ -65,7 +66,7 @@ public class CMSSignatureVerificationProfileFactory {
    * <code>request</code>, based on the current configuration.
    * @throws MOAException An error occurred creating the profile.
    */
-  public CMSSignatureVerificationProfile createPDFProfile()
+  public PDFSignatureVerificationProfile createPDFProfile()
     throws MOAException {
     TransactionContext context =
       TransactionContextManager.getInstance().getTransactionContext();
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java
index d775fdb..1eca7d2 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java
@@ -49,8 +49,6 @@ import org.w3c.dom.NodeList;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.SAXException;
 
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.MOASystemException;
 import at.gv.egovernment.moa.spss.api.common.Content;
@@ -70,13 +68,15 @@ import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
 import at.gv.egovernment.moa.spss.util.MOASPSSEntityResolver;
 import at.gv.egovernment.moa.spss.util.MessageProvider;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.EntityResolverChain;
-import at.gv.egovernment.moa.util.MOAErrorHandler;
-import at.gv.egovernment.moa.util.StreamEntityResolver;
-import at.gv.egovernment.moa.util.StreamUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
+import at.gv.egovernment.moaspss.logging.LogMsg;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.DOMUtils;
+import at.gv.egovernment.moaspss.util.EntityResolverChain;
+import at.gv.egovernment.moaspss.util.MOAErrorHandler;
+import at.gv.egovernment.moaspss.util.StreamEntityResolver;
+import at.gv.egovernment.moaspss.util.StreamUtils;
+import at.gv.egovernment.moaspss.util.XPathUtils;
 import iaik.server.modules.xml.DataObject;
 import iaik.server.modules.xml.NodeListImplementation;
 import iaik.server.modules.xml.URIReferenceImpl;
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/InvokerUtils.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/InvokerUtils.java
index 0bca8ae..0128e6a 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/InvokerUtils.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/InvokerUtils.java
@@ -28,11 +28,10 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import at.gv.egovernment.moa.util.XPathException;
-import at.gv.egovernment.moa.util.XPathUtils;
-
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.api.common.ElementSelector;
+import at.gv.egovernment.moaspss.util.XPathException;
+import at.gv.egovernment.moaspss.util.XPathUtils;
 
 /**
  * Utility methods for invoking the IAIK MOA modules.
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/ServiceContextUtils.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/ServiceContextUtils.java
index 8f3c075..330ffdd 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/ServiceContextUtils.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/ServiceContextUtils.java
@@ -24,13 +24,12 @@
 
 package at.gv.egovernment.moa.spss.server.invoke;
 
-import at.gv.egovernment.moa.logging.LoggingContext;
-import at.gv.egovernment.moa.logging.LoggingContextManager;
-
 import at.gv.egovernment.moa.spss.server.config.ConfigurationException;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
+import at.gv.egovernment.moaspss.logging.LoggingContext;
+import at.gv.egovernment.moaspss.logging.LoggingContextManager;
 
 /**
  * A utility class for setting up and tearing down thread-local context 
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java
index f32093a..3e18c2a 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java
@@ -25,7 +25,8 @@
 package at.gv.egovernment.moa.spss.server.invoke;
 
 import iaik.server.modules.cmsverify.CMSSignatureVerificationResult;
-import iaik.server.modules.cmsverify.CertificateValidationResult;
+import iaik.server.modules.pdfverify.PDFSignatureVerificationResult;
+import iaik.server.cmspdfverify.CertificateValidationResult;
 
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
@@ -123,6 +124,61 @@ public class VerifyCMSSignatureResponseBuilder {
     responseElements.add(responseElement);
   }
   
- 
+  /**
+   * Add a verification result to the response.
+   * 
+   * @param result The result to add.
+   * @param trustprofile The actual trustprofile
+   * @param checkQCFromTSL <code>true</code>, if the TSL check verifies the 
+   * 		certificate as qualified, otherwise <code>false</code>.
+   * @param checkSSCD <code>true</code>, if the TSL check verifies the 
+   * 		signature based on a SSDC, otherwise <code>false</code>.
+   * @param sscdSourceTSL <code>true</code>, if the SSCD information comes from the TSL, 
+   * 		otherwise <code>false</code>.
+ * @throws MOAException 
+   */
+  public void addResult(PDFSignatureVerificationResult result, TrustProfile trustProfile, boolean checkQC, boolean qcSourceTSL, boolean checkSSCD, boolean sscdSourceTSL, String issuerCountryCode, List adesResults)
+    throws MOAException {
+	  
+    CertificateValidationResult certResult =
+      result.getCertificateValidationResult();
+    int signatureCheckCode =
+      result.getSignatureValueVerificationCode().intValue();
+    int certificateCheckCode = certResult.getValidationResultCode().intValue();
+         
+    VerifyCMSSignatureResponseElement responseElement;
+    SignerInfo signerInfo;
+    CheckResult signatureCheck;
+    CheckResult certificateCheck;
+
+    boolean qualifiedCertificate = checkQC;
+    
+    // add SignerInfo element
+    signerInfo =
+      factory.createSignerInfo(
+        (X509Certificate) certResult.getCertificateChain().get(0),
+        qualifiedCertificate,
+        qcSourceTSL,
+        certResult.isPublicAuthorityCertificate(),
+        certResult.getPublicAuthorityID(),
+        checkSSCD,
+        sscdSourceTSL,
+        issuerCountryCode);
+
+    // add SignatureCheck element
+    signatureCheck = factory.createCheckResult(signatureCheckCode, null);
+
+    // add CertificateCheck element
+    certificateCheck = factory.createCheckResult(certificateCheckCode, null);
+    
+    // build the response element
+    responseElement =
+      factory.createVerifyCMSSignatureResponseElement(
+        signerInfo,
+        signatureCheck,
+        certificateCheck, 
+        adesResults);
+    responseElements.add(responseElement);
+  }
 
 }
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java
index 7bcf723..a6e8971 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java
@@ -50,9 +50,9 @@ import at.gv.egovernment.moa.spss.api.xmlverify.ManifestRefsCheckResultInfo;
 import at.gv.egovernment.moa.spss.api.xmlverify.ReferencesCheckResult;
 import at.gv.egovernment.moa.spss.api.xmlverify.ReferencesCheckResultInfo;
 import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
-import at.gv.egovernment.moa.util.CollectionUtils;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.NodeListAdapter;
+import at.gv.egovernment.moaspss.util.CollectionUtils;
+import at.gv.egovernment.moaspss.util.DOMUtils;
+import at.gv.egovernment.moaspss.util.NodeListAdapter;
 import iaik.server.modules.xml.BinaryDataObject;
 import iaik.server.modules.xml.DataObject;
 import iaik.server.modules.xml.XMLDataObject;
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvoker.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvoker.java
index 7debb7b..ecdd811 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvoker.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvoker.java
@@ -46,9 +46,6 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.logging.LoggingContext;
-import at.gv.egovernment.moa.logging.LoggingContextManager;
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.MOAException;
 import at.gv.egovernment.moa.spss.MOASystemException;
@@ -69,8 +66,11 @@ import at.gv.egovernment.moa.spss.server.logging.TransactionId;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
 import at.gv.egovernment.moa.spss.server.util.IdGenerator;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.XPathUtils;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.logging.LoggingContext;
+import at.gv.egovernment.moaspss.logging.LoggingContextManager;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.XPathUtils;
 
 /**
  * A class providing an API based interface to the
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java
index 6a85415..cb77ad1 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java
@@ -44,8 +44,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.MOASystemException;
 import at.gv.egovernment.moa.spss.api.common.XMLDataObjectAssociation;
@@ -67,7 +65,9 @@ import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
 import at.gv.egovernment.moa.spss.server.util.IdGenerator;
 import at.gv.egovernment.moa.spss.util.MessageProvider;
-import at.gv.egovernment.moa.util.Constants;
+import at.gv.egovernment.moaspss.logging.LogMsg;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.util.Constants;
 
 /**
  * A factory to create <code>XMLSignatureCreationProfile</code>s from a
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java
index c09740c..a8c3ea0 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java
@@ -40,10 +40,6 @@ import java.util.Set;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.logging.LoggingContext;
-import at.gv.egovernment.moa.logging.LoggingContextManager;
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.MOAException;
 import at.gv.egovernment.moa.spss.MOASystemException;
@@ -71,8 +67,12 @@ import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
 import at.gv.egovernment.moa.spss.util.CertificateUtils;
 import at.gv.egovernment.moa.spss.util.MessageProvider;
 import at.gv.egovernment.moa.spss.util.QCSSCDResult;
-import at.gv.egovernment.moa.util.CollectionUtils;
-import at.gv.egovernment.moa.util.Constants;
+import at.gv.egovernment.moaspss.logging.LogMsg;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.logging.LoggingContext;
+import at.gv.egovernment.moaspss.logging.LoggingContextManager;
+import at.gv.egovernment.moaspss.util.CollectionUtils;
+import at.gv.egovernment.moaspss.util.Constants;
 import iaik.server.modules.AdESFormVerificationResult;
 import iaik.server.modules.AdESVerificationResult;
 import iaik.server.modules.IAIKException;
@@ -162,7 +162,8 @@ public class XMLSignatureVerificationInvoker {
 		LoggingContext loggingCtx = LoggingContextManager.getInstance().getLoggingContext();
 		XMLSignatureVerificationProfileFactory profileFactory = new XMLSignatureVerificationProfileFactory(request);
 		VerifyXMLSignatureResponseBuilder responseBuilder = new VerifyXMLSignatureResponseBuilder();
-		ExtendedXMLSignatureVerificationResult result;
+		ExtendedXMLSignatureVerificationResult result = null;
+		XMLSignatureVerificationResult plainResult;
 		XMLSignatureVerificationProfile profile;
 		ReferencesCheckResult signatureManifestCheck;
 		DataObjectFactory dataObjFactory;
@@ -215,8 +216,14 @@ public class XMLSignatureVerificationInvoker {
 
 			module.setLog(new IaikLog(loggingCtx.getNodeID()));
 
-			result = module.verifyXAdESSignature(xmlSignature, dataObjectList, profile, signingTime,
+			if(request.getExtendedValidaiton()) {
+				result = module.verifyXAdESSignature(xmlSignature, dataObjectList, profile, signingTime,
 					new TransactionId(context.getTransactionID()));
+				plainResult = result.getXMLSignatureVerificationResult();
+			} else {
+				plainResult = module.verifySignature(xmlSignature, dataObjectList, profile, signingTime,
+						new TransactionId(context.getTransactionID()));
+			}
 		} catch (IAIKException e) {
 			MOAException moaException = IaikExceptionMapper.getInstance().map(e);
 			throw moaException;
@@ -225,19 +232,20 @@ public class XMLSignatureVerificationInvoker {
 			throw moaException;
 		}
 
-		List adesResults = getAdESResult(result.getFormVerificationResult());
+		if(result != null) {
+			List adesResults = getAdESResult(result.getFormVerificationResult());
 
-		if (adesResults != null) {
-			Iterator adesIterator = adesResults.iterator();
-			while (adesIterator.hasNext()) {
-				Logger.info("ADES Formresults: " + adesIterator.next().toString());
+			if (adesResults != null) {
+				Iterator adesIterator = adesResults.iterator();
+				while (adesIterator.hasNext()) {
+					Logger.info("ADES Formresults: " + adesIterator.next().toString());
+				}
 			}
-		}
-
-		responseBuilder.setAdESFormResults(adesResults);
 
+			responseBuilder.setAdESFormResults(adesResults);
+		}
 		// QC/SSCD check
-		List list = result.getXMLSignatureVerificationResult().getCertificateValidationResult().getCertificateChain();
+		List list = plainResult.getCertificateValidationResult().getCertificateChain();
 		if (list != null) {
 			X509Certificate[] chain = new X509Certificate[list.size()];
 
@@ -261,17 +269,17 @@ public class XMLSignatureVerificationInvoker {
 		}
 
 		// check the result
-		signatureManifestCheck = validateSignatureManifest(request, result.getXMLSignatureVerificationResult(),
+		signatureManifestCheck = validateSignatureManifest(request, plainResult,
 				profile);
 
 		// Check if signer certificate is in trust profile's allowed signer
 		// certificates pool
 		TrustProfile trustProfile = context.getConfiguration().getTrustProfile(request.getTrustProfileId());
-		CheckResult certificateCheck = validateSignerCertificate(result.getXMLSignatureVerificationResult(),
+		CheckResult certificateCheck = validateSignerCertificate(plainResult,
 				trustProfile);
 
 		// build the response
-		responseBuilder.setResult(result.getXMLSignatureVerificationResult(), profile, signatureManifestCheck,
+		responseBuilder.setResult(plainResult, profile, signatureManifestCheck,
 				certificateCheck, qcsscdresult.isQC(), qcsscdresult.isQCSourceTSL(), qcsscdresult.isSSCD(),
 				qcsscdresult.isSSCDSourceTSL(), tp.isTSLEnabled(), issuerCountryCode);
 		return responseBuilder.getResponse();
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java
index 64810a8..cca9117 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java
@@ -24,12 +24,11 @@
 
 package at.gv.egovernment.moa.spss.server.logging;
 
+import at.gv.egovernment.moaspss.logging.LoggingContextManager;
 import iaik.logging.Log;
 import iaik.logging.LogConfigurationException;
 import iaik.logging.LogFactory;
 
-import at.gv.egovernment.moa.logging.LoggingContextManager;
-
 /**
  * An implementation of the <code>iaik.logging.LogFactory</code> abstract
  * class to log messages to the MOA logging subsystem.
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/service/RevocationArchiveCleaner.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/service/RevocationArchiveCleaner.java
index f6d84c7..d3a930c 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/service/RevocationArchiveCleaner.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/service/RevocationArchiveCleaner.java
@@ -30,11 +30,11 @@ import iaik.pki.store.revocation.archive.ArchiveFactory;
 
 import java.util.Date;
 
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
 import at.gv.egovernment.moa.spss.server.logging.TransactionId;
 import at.gv.egovernment.moa.spss.util.MessageProvider;
+import at.gv.egovernment.moaspss.logging.LogMsg;
+import at.gv.egovernment.moaspss.logging.Logger;
 
 /**
  * A <code>Runnable</code> for periodically cleaning up the revocation archive. 
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/transaction/TransactionContext.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/transaction/TransactionContext.java
index 3425dac..4e0d9f6 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/transaction/TransactionContext.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/transaction/TransactionContext.java
@@ -41,9 +41,9 @@ import java.util.Map.Entry;
 
 import org.w3c.dom.Element;
 
-import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
+import at.gv.egovernment.moaspss.logging.Logger;
 
 /**
  * Contains information about the current request.
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/config/Configurator.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/config/Configurator.java
index defaedd..53e023f 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/config/Configurator.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/config/Configurator.java
@@ -1,6 +1,6 @@
 package at.gv.egovernment.moa.spss.tsl.config;

 

-import iaik.util.logging._l;

+import iaik.util.logging.GeneralLog;

 import iaik.xml.crypto.tsl.ex.TSLEngineDiedException;

 

 import java.net.MalformedURLException;

@@ -37,7 +37,7 @@ public class Configurator {
 			try {

 				_euTSLURL = new URL(euTSLURL);

 			} catch (MalformedURLException e) {

-				_l.err("Bad TSL URL: " + euTSLURL, e);

+				GeneralLog.err("Bad TSL URL: " + euTSLURL, e);

 				throw new TSLEngineDiedException(e);

 			}

 			

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/connector/MOATSLVerifier.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/connector/MOATSLVerifier.java
new file mode 100644
index 0000000..39b2f8c
--- /dev/null
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/connector/MOATSLVerifier.java
@@ -0,0 +1,265 @@
+package at.gv.egovernment.moa.spss.tsl.connector;

+

+import java.io.IOException;

+import java.io.OutputStream;

+import java.io.OutputStreamWriter;

+import java.security.cert.X509Certificate;

+import java.util.Iterator;

+import java.util.ListIterator;

+

+import javax.xml.bind.JAXBElement;

+import javax.xml.bind.JAXBIntrospector;

+import javax.xml.crypto.Data;

+import javax.xml.crypto.MarshalException;

+import javax.xml.crypto.NodeSetData;

+import javax.xml.crypto.URIReferenceException;

+import javax.xml.crypto.dom.DOMCryptoContext;

+import javax.xml.crypto.dsig.Reference;

+import javax.xml.crypto.dsig.SignedInfo;

+import javax.xml.crypto.dsig.Transform;

+import javax.xml.crypto.dsig.XMLSignature;

+import javax.xml.crypto.dsig.XMLSignatureException;

+import javax.xml.crypto.dsig.XMLSignatureFactory;

+import javax.xml.crypto.dsig.dom.DOMValidateContext;

+

+import org.slf4j.Logger;

+import org.slf4j.LoggerFactory;

+import org.w3c.dom.Document;

+import org.w3c.dom.Element;

+import org.w3c.dom.Node;

+import org.w3c.dom.NodeList;

+

+import iaik.server.modules.xml.MOAXSecProvider;

+import iaik.xml.crypto.tsl.TSLConstants;

+import iaik.xml.crypto.tsl.TSLContext;

+import iaik.xml.crypto.tsl.TSLEngine;

+import iaik.xml.crypto.tsl.ex.SeverityAspect.Severity;

+import iaik.xml.crypto.tsl.ex.TSLSecurityException;

+import iaik.xml.crypto.tsl.ex.TSLVerificationException;

+import iaik.xml.crypto.tsl.gen.TrustStatusListType;

+import iaik.xml.crypto.tsl.verify.ITSLVerifier;

+import iaik.xml.crypto.utils.URIDereferencerImpl;

+

+public class MOATSLVerifier implements ITSLVerifier {

+

+	private static final Logger logger = LoggerFactory.getLogger(MOATSLVerifier.class);

+	

+	private static iaik.xml.crypto.xmldsig.gen.ObjectFactory dsOf = new iaik.xml.crypto.xmldsig.gen.ObjectFactory();

+

+	private static JAXBIntrospector JI = TSLEngine.jc.createJAXBIntrospector();

+

+	  public Boolean verifyTSL(Document tslDoc, TSLContext tslContext,

+	  	ListIterator<X509Certificate> euTslCertsHash) {

+

+	    boolean coreValidity = false;

+

+	    try {

+	//      Signature s = new Signature();

+	//      TrustServiceStatusList tssl = new TrustServiceStatusList();

+	      JAXBElement<iaik.xml.crypto.xmldsig.gen.SignatureType> s = dsOf.createSignature(new iaik.xml.crypto.xmldsig.gen.SignatureType());

+//	      _l.debug(""+JI.getElementName(s));

+	      JAXBElement<TrustStatusListType> tssl = TSLConstants.TSL_OF.createTrustServiceStatusList(new TrustStatusListType());

+//	      _l.debug(""+JI.getElementName(tssl));

+

+	      Element tsslE = tslDoc.getDocumentElement();

+

+	      if (tsslE == null) {

+	        tslContext.throwException(new TSLVerificationException("Empty XML File", Severity.xml_failed));

+	//      } else if (!tsslE.getNamespaceURI().equals(tssl.getName().getNamespaceURI())) {

+	      } else if (!tsslE.getNamespaceURI().equals(JI.getElementName(tssl).getNamespaceURI())) {

+	        tslContext.throwException(new TSLVerificationException("Incorrect Namespace", Severity.xml_failed));

+	//      } else if (!tsslE.getLocalName().equals(tssl.getName().getLocalPart())) {

+	      } else if (!tsslE.getLocalName().equals(JI.getElementName(tssl).getLocalPart())) {

+	        tslContext.throwException(new TSLVerificationException("Wrong Document Element in document "+tslDoc.getDocumentURI(), Severity.xml_failed));

+	      }

+

+	      //now we can be sure the right document element is in place, Schema validation does not assure this for us

+	      //Schema validation however assures that the internal Structure of TrustServicesStatus List is correct

+

+	      // B.6 1)  It MUST be an enveloped signature.

+

+	      Node n = tsslE.getLastChild();

+

+	      while ( n != null && ! (n instanceof Element) ) {

+	        n = n.getPreviousSibling();

+	      }

+

+	      Element sig = (Element) n;

+

+	      if (sig == null ||

+	//        ! sig.getNamespaceURI().equals(s.getName().getNamespaceURI()) ||

+	//        !  sig.getLocalName().equals(s.getName().getLocalPart())) {

+	        ! sig.getNamespaceURI().equals(JI.getElementName(s).getNamespaceURI()) ||

+	        !  sig.getLocalName().equals(JI.getElementName(s).getLocalPart())) {

+

+	        tslContext.throwException(

+	        	new TSLVerificationException(

+	        		TSLSecurityException.Type.NO_TSL_SIGNATURE)

+	        	);

+

+	      } else {

+

+	        NodeList cn = tsslE.getChildNodes();

+

+	        for (int j = 0; j < cn.getLength(); j++) {

+	          cn.item(j);

+	        }

+

+	        //TODO assure connection with the PKI Module

+	        DOMValidateContext valContext = new DOMValidateContext(

+	        	new MOATslKeySelector(euTslCertsHash, tslContext),

+	        	sig);

+

+	        if (valContext.getURIDereferencer() == null) {

+	          valContext.setURIDereferencer(new URIDereferencerImpl());

+	        }

+

+	  //      valContext.setProperty("iaik.xml.crypto.debug.OutputStream", System.out);

+	        valContext.setProperty("javax.xml.crypto.dsig.cacheReference", Boolean.TRUE);

+

+	        XMLSignatureFactory fac = MOAXSecProvider.getXMLSignatureFactory();

+

+	        // unmarshal the XMLSignature

+	        XMLSignature signature = fac.unmarshalXMLSignature(valContext);

+

+	        // Validate the XMLSignature (generated above)

+	        coreValidity = signature.validate(valContext);

+	        // Check core validation status

+	        if (coreValidity == false) {

+	          debug(valContext, "Signature failed core validation");

+	          boolean sv = signature.getSignatureValue().validate(valContext);

+	          debug(valContext, "signature validation status: " + sv);

+	          // check the validation status of each Reference

+	          Iterator it = signature.getSignedInfo().getReferences().iterator();

+	          for (int j = 0; it.hasNext(); j++) {

+	            boolean refValid = ((Reference) it.next()).validate(valContext);

+	            debug(valContext, "ref[" + j + "] validity status: " + refValid);

+	          }

+

+	          tslContext.throwException(new TSLVerificationException("Signature failed core validation", Severity.signature_failed));

+	        }

+

+	        SignedInfo si = signature.getSignedInfo();

+	        Iterator it = si.getReferences().iterator();

+

+

+	        // 2) Its ds:SignedInfo element MUST contain a ds:Reference element with the

+	        // URI attribute set to a value referencing the TrustServiceStatusList

+	        // element enveloping the signature itself. This ds:Reference element MUST

+	        // satisfy the following requirements:

+	        //  a) It MUST contain only one ds:Transforms element.

+	        //  b) This ds:Transforms element MUST contain two ds:Transform elements. The

+	        //  first one will be one whose Algorithm attribute indicates the enveloped

+	        //  transformation with the value:

+	        //  "http://www.w3.org/2000/09/xmldsig#enveloped-signature". The second one

+	        //  will be one whose Algorithm attribute instructs to perform the exclusive

+	        //  canonicalization "http://www.w3.org/2001/10/xml-exc-c14n#"

+	        

+	        boolean found_proper_tsslE_reference = false;

+

+	        for (int j = 0; it.hasNext(); j++) {

+	          Reference ref = ((Reference) it.next());

+	          Data d = valContext.getURIDereferencer().dereference(ref, valContext);

+

+	          if(!(d instanceof NodeSetData)) {

+	            continue;

+	          } else {

+	            NodeSetData nsd = (NodeSetData) d;

+

+

+	            if (nsd.iterator().next() == tsslE) {

+

+	              //Assured by XMLSchema

+	              //throw new TSLException("B.6 2 a) It MUST contain only one ds:Transforms element.");

+

+	              if(ref.getTransforms().size() != 2) {

+	                tslContext.throwException(

+	                  new TSLVerificationException(TSLSecurityException.Type.NON_CONFORMANT_TRANSFORMS_IN_TSL_SIGNATURE)

+	                );

+	              } else {

+

+	                Transform[] transforms = (Transform[]) ref.getTransforms().toArray(new Transform[2]);

+

+	                //TODO assign severity, code some heuristic showing the problems

+	                if (! transforms[0].getAlgorithm().equals("http://www.w3.org/2000/09/xmldsig#enveloped-signature")) {

+	                  tslContext.throwException(

+	                    new TSLVerificationException(TSLSecurityException.Type.NON_CONFORMANT_TRANSFORM_IN_TSL_SIGNATURE)

+	                  );

+

+	                }

+

+	                //TODO assign severity, code some heuristic showing the problems

+	                if (! transforms[1].getAlgorithm().equals("http://www.w3.org/2001/10/xml-exc-c14n#")) {

+	                  tslContext.throwException(

+	                    new TSLVerificationException(TSLSecurityException.Type.NON_CONFORMANT_C14N_IN_TSL_SIGNATURE)

+	                  );

+	                }

+	              }

+

+	              found_proper_tsslE_reference = true;

+	            }//if (nsd.iterator().next() == tsslE)

+

+	          }

+	        }

+

+	        if(!found_proper_tsslE_reference) {

+	          tslContext.throwException(

+	            new TSLVerificationException(TSLSecurityException.Type.NON_CONFORMANT_REFERENCE_IN_TSL_SIGNATURE)

+	          );

+	        }

+	        

+	        // 3) ds:CanonicalizationMethod MUST be

+	        // "http://www.w3.org/2001/10/xml-exc-c14n#".

+	        if (! si.getCanonicalizationMethod().getAlgorithm().equals("http://www.w3.org/2001/10/xml-exc-c14n#")){

+            tslContext.throwException(

+                new TSLVerificationException(TSLSecurityException.Type.NON_CONFORMANT_C14N_IN_CANONICALIZATION_METHOD)

+              );	        	

+	        }

+	        

+	        // 4) It MAY have other ds:Reference elements.

+

+	      }

+	    } catch (URIReferenceException e) {

+	      tslContext.throwException(new TSLVerificationException(e));

+	    } catch (MarshalException e) {

+	      tslContext.throwException(new TSLVerificationException(e));

+	    } catch (XMLSignatureException e) {

+	    	logger.error("Failed to verify XML Signature for TSL!", e);

+	    	return (Boolean) tslContext.throwException(

+	    			new TSLSecurityException(TSLSecurityException.Type.ERRORS_IN_TSL_SIGNATURE),

+	    			//we need an anonymous class to find the enclosing Method

+	    			(new Object(){}).getClass().getEnclosingMethod(),

+	    			null,

+	    			new Object[] {tslDoc, tslContext, euTslCertsHash}

+	    			);	    		

+	    }

+	    return coreValidity;

+	  }

+

+	public static void debug(DOMCryptoContext context, String message) {

+

+	  Object propDebug = context.getProperty("iaik.xml.crypto.debug.OutputStream");

+

+	  if ( propDebug == null) {

+	    return;

+	  }

+

+	  if (! (propDebug instanceof OutputStream)) {

+	    System.err.println("Failed to write to debug output stream. " +

+	        "DOMCryptoContext's Property (\"iaik.xml.crypto.debug.OutputStream\") " +

+	        "has to be of type OutputStream."

+	      );

+	  } else {

+

+	  OutputStream os = (OutputStream) propDebug;

+	    try {

+	      (new OutputStreamWriter(os)).write(message);

+	    } catch (IOException e) {

+	      System.err.println("Failed to write to debug output stream. " + e.getMessage());

+	      //TODO we cannot close the output stream here ...

+	    }

+	  }

+

+	}

+

+}

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/connector/MOATslKeySelector.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/connector/MOATslKeySelector.java
new file mode 100644
index 0000000..efdd877
--- /dev/null
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/connector/MOATslKeySelector.java
@@ -0,0 +1,123 @@
+package at.gv.egovernment.moa.spss.tsl.connector;

+

+import java.security.cert.X509Certificate;

+import java.util.List;

+import java.util.ListIterator;

+

+import javax.xml.crypto.AlgorithmMethod;

+import javax.xml.crypto.KeySelectorException;

+import javax.xml.crypto.KeySelectorResult;

+import javax.xml.crypto.XMLCryptoContext;

+import javax.xml.crypto.dsig.keyinfo.KeyInfo;

+import javax.xml.crypto.dsig.keyinfo.X509Data;

+

+import iaik.server.modules.xmlverify.MOAKeySelector;

+import iaik.xml.crypto.tsl.TSLContext;

+import iaik.xml.crypto.tsl.ex.TSLSecurityException;

+import iaik.xml.crypto.tsl.ex.TSLVerificationException;

+import iaik.xml.crypto.tsl.verify.TslKeyInfoHints;

+import iaik.xml.crypto.utils.X509KeySelectorResult;

+

+public class MOATslKeySelector extends MOAKeySelector {

+

+	private final ListIterator<X509Certificate> tslSignerCerts_;

+	private TSLContext tslContextI_;

+

+	public MOATslKeySelector(ListIterator<X509Certificate> euTslCertsHash, TSLContext tslContext) {

+		if(euTslCertsHash == null){

+			tslContext.throwException(

+				new TSLVerificationException(

+					TSLSecurityException.Type.MISSING_INFO_ON_TSL_SIGNER)

+			);

+		}

+		tslSignerCerts_ = euTslCertsHash;

+		tslContextI_ = tslContext;

+		tslContext.toString();

+	}

+

+	@Override

+	protected KeyInfoHints newKeyInfoHints(KeyInfo keyInfo,

+		XMLCryptoContext context)

+		throws KeySelectorException {

+

+		return new TslKeyInfoHints(keyInfo, context, tslContextI_, tslSignerCerts_);

+

+	}

+

+	@Override

+	protected KeySelectorResult select(KeyInfoHints hints,

+		KeySelectorResult[] results) {

+

+		if (results.length > 1){

+

+			return (KeySelectorResult) tslContextI_.throwException(

+				new TSLSecurityException(TSLSecurityException.Type.UNTRUSTED_TSL_SIGNER),

+				//we need an anonymous class to find the enclosing Method

+        (new Object(){}).getClass().getEnclosingMethod(),

+        this,

+        new Object[] {hints, results}

+			);

+

+		} else {

+			KeySelectorResult result = results[0];

+			  if (result instanceof X509KeySelectorResult) {

+			    result = new MOAX509KeySelectorResult((X509KeySelectorResult)result);

+			  } else {

+			    result = new MOAKeySelectorResult(result.getKey());

+			  }

+			  return result;

+		}

+	}

+	

+	@Override

+  public KeySelectorResult select(X509Data x509Data,

+    Purpose purpose,

+    AlgorithmMethod method,

+    XMLCryptoContext context) throws KeySelectorException {

+

+		X509KeySelectorResult ksr;

+		try {

+			ksr = (X509KeySelectorResult) super.select(x509Data, purpose, method, context);

+		} catch (ClassCastException e) {

+			ksr = (X509KeySelectorResult) tslContextI_.throwException(

+				e,

+				//we need an anonymous class to find the enclosing Method

+				(new Object(){}).getClass().getEnclosingMethod(),

+				this,

+				new Object[]{x509Data, purpose, method, context});

+		}

+

+		if (ksr == null){

+			//there has been a Problem with the X509Data

+			ksr = (X509KeySelectorResult) tslContextI_.throwException(

+				new KeySelectorException(failReason_.replace(". ", ".\n")),

+				//we need an anonymous class to find the enclosing Method

+				(new Object(){}).getClass().getEnclosingMethod(),

+				this,

+				new Object[]{x509Data, purpose, method, context});

+		}

+

+		List l = ksr.getCertificates();

+		tslContextI_.securityCheck(

+			TSLSecurityException.Type.UNTRUSTED_TSL_SIGNER,

+			(X509Certificate[]) l.toArray(new X509Certificate[l.size()]),

+			tslSignerCerts_

+		);

+

+		return ksr;

+  }

+

+	@Override

+	protected KeySelectorResult select(X509Certificate cert, Purpose purpose,

+		AlgorithmMethod method, XMLCryptoContext context)

+		throws KeySelectorException {

+

+		tslContextI_.securityCheck(

+			TSLSecurityException.Type.UNTRUSTED_TSL_SIGNER,

+			cert,

+			tslSignerCerts_

+		);

+

+		return super.select(cert, purpose, method, context);

+	}

+}
\ No newline at end of file
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/connector/TSLConnector.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/connector/TSLConnector.java
index 82df37b..fee6ebe 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/connector/TSLConnector.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/connector/TSLConnector.java
@@ -29,8 +29,8 @@ import at.gv.egovernment.moa.spss.tsl.utils.TSLEUImportFromFileContext;
 import at.gv.egovernment.moa.spss.tsl.utils.TSLEvaluationContext;

 import at.gv.egovernment.moa.spss.tsl.utils.TSLImportFromFileContext;

 import iaik.asn1.ObjectID;

-import iaik.util._15;

-import iaik.util.logging._l;

+import iaik.util.GeneralUtils15;

+import iaik.util.logging.GeneralLog;

 import iaik.utils.RFC2253NameParser;

 import iaik.xml.crypto.EccProviderAdapter;

 import iaik.xml.crypto.XSecProvider;

@@ -314,7 +314,7 @@ public class TSLConnector implements TSLConnectorInterface {
 		log.debug(Thread.currentThread() + " waiting for other threads ...");

 		topLevelTslContext.waitForAllOtherThreads();

 

-		log.debug(_15.dumpAllThreads());

+		log.debug(GeneralUtils15.dumpAllThreads());

 		log.debug(Thread.currentThread() + " reactivated after other threads finished ...");

 		

 		connection = null;

@@ -395,7 +395,7 @@ public class TSLConnector implements TSLConnectorInterface {
 		log.debug("### SURNAME registered as " + ObjectID.surName + " ###");

 		RFC2253NameParser.register("SURNAME", ObjectID.surName);

 

-		XSecProvider.addAsProvider(false);

+		//XSecProvider.addAsProvider(false);

 

 		TSLEngine tslEngine;

 		TslSqlConnectionWrapper connection = null;

@@ -557,7 +557,7 @@ public class TSLConnector implements TSLConnectorInterface {
 		log.debug(Thread.currentThread() + " waiting for other threads ...");

 		topLevelTslContext.waitForAllOtherThreads();

 

-		log.debug(_15.dumpAllThreads());

+		log.debug(GeneralUtils15.dumpAllThreads());

 		log.debug(Thread.currentThread() + " reactivated after other threads finished ...");

 		

 		connection = null;

@@ -635,7 +635,7 @@ public class TSLConnector implements TSLConnectorInterface {
 				 

 			 } catch (TSLEngineFatalException e) {

 				 e.printStackTrace();

-				 _l.err("could not export Certs", e);

+				 GeneralLog.err("could not export Certs", e);

 				 throw new TSLEngineDiedException(e);

 			 }

 			

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/timer/TSLUpdaterTimerTask.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/timer/TSLUpdaterTimerTask.java
index e06abe4..5139469 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/timer/TSLUpdaterTimerTask.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/timer/TSLUpdaterTimerTask.java
@@ -21,8 +21,6 @@ import java.util.Iterator;
 import java.util.Map;

 import java.util.TimerTask;

 

-import at.gv.egovernment.moa.logging.LogMsg;

-import at.gv.egovernment.moa.logging.Logger;

 import at.gv.egovernment.moa.spss.MOAApplicationException;

 import at.gv.egovernment.moa.spss.api.common.TSLConfiguration;

 import at.gv.egovernment.moa.spss.server.config.ConfigurationException;

@@ -33,7 +31,9 @@ import at.gv.egovernment.moa.spss.server.iaik.pki.store.truststore.TrustStorePro
 import at.gv.egovernment.moa.spss.server.logging.TransactionId;

 import at.gv.egovernment.moa.spss.tsl.connector.TSLConnector;

 import at.gv.egovernment.moa.spss.util.MessageProvider;

-import at.gv.egovernment.moa.util.StringUtils;

+import at.gv.egovernment.moaspss.logging.LogMsg;

+import at.gv.egovernment.moaspss.logging.Logger;

+import at.gv.egovernment.moaspss.util.StringUtils;

 

 

 public class TSLUpdaterTimerTask extends TimerTask {

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/utils/TSLEUImportFromFileContext.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/utils/TSLEUImportFromFileContext.java
index 453ee2b..e0fff56 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/utils/TSLEUImportFromFileContext.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/utils/TSLEUImportFromFileContext.java
@@ -1,6 +1,7 @@
 package at.gv.egovernment.moa.spss.tsl.utils;

 

 import java.io.File;

+import java.io.FileFilter;

 import java.io.IOException;

 import java.lang.reflect.Method;

 import java.net.URL;

@@ -11,7 +12,7 @@ import java.util.List;
 import org.sqlite.SQLiteErrorCode;

 

 import iaik.util.logging.Log;

-import iaik.util.logging._l;

+import iaik.util.logging.GeneralLog;

 import iaik.util.logging.Log.MultiThreadLoggingGroup;

 import iaik.xml.crypto.tsl.DbTables;

 import iaik.xml.crypto.tsl.TSLImportFromFileContext;

@@ -76,7 +77,7 @@ public class TSLEUImportFromFileContext extends TopLevelTslFetchContext {
 				parameters[0] instanceof URL

 			){

 

-				_l.err("Ignoring download error using old: " + parameters[0],null);

+				GeneralLog.err("Ignoring download error using old: " + parameters[0],null);

 				wrapException(e);

 				return parameters[1];

 			}

@@ -87,7 +88,7 @@ public class TSLEUImportFromFileContext extends TopLevelTslFetchContext {
 			TSLExceptionB ve = (TSLExceptionB) e;

 			Severity s = ve.getSeverity();

 			if ( s != null && s.ordinal() < Severity.insecure.ordinal()){

-				_l.err("Ignored Exception: ",ve);

+				GeneralLog.err("Ignored Exception: ",ve);

 //			    if(logExceptions_){

 		    	warnings_.add(

 		    		new ThrowableAndLocatorAndMitigation(

@@ -136,5 +137,10 @@ public class TSLEUImportFromFileContext extends TopLevelTslFetchContext {
 		public void print(Object msg) {

 		  Log.print(msg);

 	  }

+		

+		@Override

+		public FileFilter getCertificateFileFilter() {

+			return null;

+		}

 

 }

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/utils/TSLEvaluationContext.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/utils/TSLEvaluationContext.java
index a656f11..f0723a1 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/utils/TSLEvaluationContext.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/utils/TSLEvaluationContext.java
@@ -2,7 +2,7 @@ package at.gv.egovernment.moa.spss.tsl.utils;
 

 import iaik.util.logging.Log.MultiThreadLoggingGroup;

 import iaik.util.logging.Log;

-import iaik.util.logging._l;

+import iaik.util.logging.GeneralLog;

 import iaik.xml.crypto.tsl.BaseClass;

 import iaik.xml.crypto.tsl.SIEExtensionChecker;

 import iaik.xml.crypto.tsl.constants.Countries;

@@ -42,7 +42,7 @@ public final class TSLEvaluationContext extends iaik.xml.crypto.tsl.TSLEvaluatio
 

 			CriteriaListType criteriaList = (CriteriaListType) parameters[1];

 

-			_l.warn(criteriaList.getDescription());

+			GeneralLog.warn(criteriaList.getDescription());

 

 			String description = criteriaList.getDescription();

 			if (description

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/utils/TSLImportFromFileContext.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/utils/TSLImportFromFileContext.java
index 5d69f69..eda2b34 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/utils/TSLImportFromFileContext.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/utils/TSLImportFromFileContext.java
@@ -2,6 +2,7 @@ package at.gv.egovernment.moa.spss.tsl.utils;
 

 import java.io.BufferedOutputStream;

 import java.io.File;

+import java.io.FileFilter;

 import java.io.FileNotFoundException;

 import java.io.FileOutputStream;

 import java.io.OutputStream;

@@ -36,10 +37,10 @@ import org.xml.sax.SAXParseException;
 

 import at.gv.egovernment.moa.spss.tsl.exception.MitigatedTSLSecurityException;

 import iaik.util.logging.Log.MultiThreadLoggingGroup;

-import iaik.util.logging._l;

+import iaik.util.logging.GeneralLog;

 import iaik.utils.RFC2253NameParserException;

 import iaik.utils.Util;

-import iaik.util._15;

+import iaik.util.GeneralUtils15;

 import iaik.xml.crypto.dsig.keyinfo.X509DataImpl;

 import iaik.xml.crypto.tsl.DbTables;

 import iaik.xml.crypto.tsl.TSLConstants;

@@ -243,7 +244,7 @@ public class TSLImportFromFileContext extends iaik.xml.crypto.tsl.TSLImportFromF
 				if (parameters[0] instanceof DOMError) {

 					DOMError domError = (DOMError) parameters[0];

 

-					_l.warn(""+domError.getRelatedData());

+					GeneralLog.warn(""+domError.getRelatedData());

 

 					//					domError.getRelatedData().getClass().getField("")

 

@@ -277,9 +278,9 @@ public class TSLImportFromFileContext extends iaik.xml.crypto.tsl.TSLImportFromF
 

 					String[] rdns = subDN.substring(1, subDN.length()).split("/");

 

-					rdns = (String[]) _15.reverseInPlace(rdns);

+					rdns = (String[]) GeneralUtils15.reverseInPlace(rdns);

 

-					subDN = "/"+_15.implode("/", rdns);

+					subDN = "/"+GeneralUtils15.implode("/", rdns);

 

 					//for now we only support properly quoted values or such without quotes

 

@@ -375,7 +376,7 @@ public class TSLImportFromFileContext extends iaik.xml.crypto.tsl.TSLImportFromF
 					}

 				}

 

-				_l.err("Ignoring download error using old: " + parameters[0], null);

+				GeneralLog.err("Ignoring download error using old: " + parameters[0], null);

 				wrapException(e);

 				return parameters[1];

 			}

@@ -448,7 +449,7 @@ public class TSLImportFromFileContext extends iaik.xml.crypto.tsl.TSLImportFromF
 				X509Certificate crt = (X509Certificate)parameters[1];

 

 		    File f = new File("./wrong/"+expectedTerritory_+"/",

-		    	iaik.util._15.toHexString(getFingerPrint(crt,

+		    	iaik.util.GeneralUtils15.toHexString(getFingerPrint(crt,

 		    		new byte[TSLConstants.CertHash.LENGTH]))+".der");

 		    File parent = f.getParentFile();

 		    if(!parent.exists() && !parent.mkdirs()){

@@ -571,7 +572,7 @@ public class TSLImportFromFileContext extends iaik.xml.crypto.tsl.TSLImportFromF
 			    	li.next();

 			    	String sn = (String) li.next();

 			    	

-			    	_l.err(sn, null);

+			    	GeneralLog.err(sn, null);

 			    	

 			    	System.exit(1);

 			    	

@@ -796,7 +797,7 @@ public class TSLImportFromFileContext extends iaik.xml.crypto.tsl.TSLImportFromF
 

 		String msg = e.getMessage();

 

-		_l.info(msg);

+		GeneralLog.info(msg);

 		return(

 			msg.startsWith("["+SQLiteErrorCode.SQLITE_CONSTRAINT.name()+"]") &&

 			msg.contains("column " + DbTables.TSLDownload.C.rawHash + " is not unique")

@@ -804,7 +805,7 @@ public class TSLImportFromFileContext extends iaik.xml.crypto.tsl.TSLImportFromF
 	}

 

 	@Override

-	protected Long getLocalLastModified(File targetFile) {

+	protected File getLocalLastModified(File targetFile) {

 		return super.getLocalLastModified(targetFile);

 	}

 	@Override

@@ -830,7 +831,7 @@ public class TSLImportFromFileContext extends iaik.xml.crypto.tsl.TSLImportFromF
 			synchronized (log) {

 				parentContext_.print("<" + ncName + " state=\"" + currentThread.getState()

 				    + "\" " + " id=\"" + currentThread.getId() + "\">\n" + log.toString() + "</"

-				    + ncName + ">" + _15.LB);

+				    + ncName + ">" + GeneralUtils15.LB);

 				parentContext_.flushLog();

 				log.setLength(0);

 			}

@@ -846,5 +847,9 @@ public class TSLImportFromFileContext extends iaik.xml.crypto.tsl.TSLImportFromF
 			log.append(msg);

 		}

 	}

+	@Override

+	public FileFilter getCertificateFileFilter() {

+		return null;

+	}

 	

 }
\ No newline at end of file
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/CertificateUtils.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/CertificateUtils.java
index 544ea91..358524d 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/CertificateUtils.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/CertificateUtils.java
@@ -17,9 +17,9 @@ import iaik.xml.crypto.tsl.ex.TSLSearchException;
 
 import java.security.Principal;
 
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.spss.tsl.timer.TSLUpdaterTimerTask;
+import at.gv.egovernment.moaspss.logging.LogMsg;
+import at.gv.egovernment.moaspss.logging.Logger;
 
 public class CertificateUtils {
 	
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/ExternalURIVerifier.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/ExternalURIVerifier.java
index 219bb7c..859e7e9 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/ExternalURIVerifier.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/ExternalURIVerifier.java
@@ -5,11 +5,11 @@ import java.net.UnknownHostException;
 import java.util.Iterator;

 import java.util.List;

 

-import at.gv.egovernment.moa.logging.LogMsg;

-import at.gv.egovernment.moa.logging.Logger;

 import at.gv.egovernment.moa.spss.MOAApplicationException;

 import at.gv.egovernment.moa.spss.server.config.ConfigurationException;

 import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;

+import at.gv.egovernment.moaspss.logging.LogMsg;

+import at.gv.egovernment.moaspss.logging.Logger;

 

 public class ExternalURIVerifier {

 	

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/MOASPSSEntityResolver.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/MOASPSSEntityResolver.java
index b5f72c4..ee6fe0a 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/MOASPSSEntityResolver.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/MOASPSSEntityResolver.java
@@ -31,10 +31,10 @@ import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;

 import org.xml.sax.SAXException;

 

-import at.gv.egovernment.moa.logging.LogMsg;

-import at.gv.egovernment.moa.logging.Logger;

 import at.gv.egovernment.moa.spss.MOAApplicationException;

-import at.gv.egovernment.moa.util.Constants;

+import at.gv.egovernment.moaspss.logging.LogMsg;

+import at.gv.egovernment.moaspss.logging.Logger;

+import at.gv.egovernment.moaspss.util.Constants;

 

 

 /**

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/MessageProvider.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/MessageProvider.java
index 6c8a833..47b8d36 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/MessageProvider.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/MessageProvider.java
@@ -26,7 +26,7 @@ package at.gv.egovernment.moa.spss.util;
 
 import java.util.Locale;
 
-import at.gv.egovernment.moa.util.Messages;
+import at.gv.egovernment.moaspss.util.Messages;
 
 /**
  * Singleton wrapper around a <code>Messages</code> object.
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/ResetableInputStreamWrapper.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/ResetableInputStreamWrapper.java
new file mode 100644
index 0000000..243cd5d
--- /dev/null
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/ResetableInputStreamWrapper.java
@@ -0,0 +1,59 @@
+package at.gv.egovernment.moa.spss.util;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class ResetableInputStreamWrapper extends InputStream {
+
+	private ByteArrayInputStream bais;
+	
+	public ResetableInputStreamWrapper(ByteArrayInputStream bais) {
+		this.bais = bais;
+	}
+	
+	@Override
+	public int read() throws IOException {
+		return this.bais.read();
+	}
+
+	@Override
+	public int read(byte[] b) throws IOException {
+		return this.bais.read(b);
+	}
+
+	@Override
+	public int read(byte[] b, int off, int len) throws IOException {
+		return this.bais.read(b, off, len);
+	}
+
+	@Override
+	public long skip(long n) throws IOException {
+		return this.bais.skip(n);
+	}
+
+	@Override
+	public int available() throws IOException {
+		return this.bais.available();
+	}
+
+	@Override
+	public void close() throws IOException {
+		this.bais.close();
+	}
+
+	@Override
+	public synchronized void mark(int readlimit) {
+		this.bais.mark(readlimit);
+	}
+
+	@Override
+	public synchronized void reset() throws IOException {
+		this.bais.reset();
+	}
+
+	@Override
+	public boolean markSupported() {
+		return this.bais.markSupported();
+	}
+}
diff --git a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/AllTests.java b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/AllTests.java
index 16d9dc9..3d0d7da 100644
--- a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/AllTests.java
+++ b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/AllTests.java
@@ -28,7 +28,7 @@ import test.at.gv.egovernment.moa.spss.server.iaik.config.ConfigurationDataImplT
 import test.at.gv.egovernment.moa.spss.server.iaik.config.IaikConfiguratorTest;
 import test.at.gv.egovernment.moa.spss.server.tools.CertToolTest;
 
-import junit.awtui.TestRunner;
+//import junit.awtui.TestRunner;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
@@ -43,7 +43,7 @@ public class AllTests {
   public static Test suite() {
     TestSuite suite = new TestSuite();
 
-    suite.addTestSuite(test.at.gv.egovernment.moa.spss.server.config.AllTests.class);
+    //suite.addTestSuite(test.at.gv.egovernment.moa.spss.server.config.AllTests.class);
     suite.addTestSuite(ConfigurationDataImplTest.class);
     suite.addTestSuite(IaikConfiguratorTest.class);
     suite.addTest(
@@ -56,7 +56,7 @@ public class AllTests {
 
   public static void main(String[] args) {
     try {
-      TestRunner.run(AllTests.class);
+      //TestRunner.run(AllTests.class);
     } catch (Exception e) {
       e.printStackTrace();
     }
diff --git a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/SPSSTestCase.java b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/SPSSTestCase.java
index 64ab7db..9a55e27 100644
--- a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/SPSSTestCase.java
+++ b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/SPSSTestCase.java
@@ -27,12 +27,10 @@ package test.at.gv.egovernment.moa.spss;
 import java.security.Security;
 
 import test.at.gv.egovernment.moa.MOATestCase;
-
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.logging.LoggingContext;
-import at.gv.egovernment.moa.logging.LoggingContextManager;
-import at.gv.egovernment.moa.util.MessageProvider;
-
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.logging.LoggingContext;
+import at.gv.egovernment.moaspss.logging.LoggingContextManager;
+import at.gv.egovernment.moaspss.util.MessageProvider;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
 import at.gv.egovernment.moa.spss.server.iaik.config.IaikConfigurator;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
diff --git a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java
index 73bf54f..3b1022e 100644
--- a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java
+++ b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java
@@ -26,14 +26,13 @@ package test.at.gv.egovernment.moa.spss.api.xmlbind;
 
 import org.w3c.dom.Element;
 
-import at.gv.egovernment.moa.util.DateTimeUtils;
-
 import test.at.gv.egovernment.moa.spss.SPSSTestCase;
 
 import at.gv.egovernment.moa.spss.api.cmsverify.CMSContentExcplicit;
 import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest;
 import at.gv.egovernment.moa.spss.api.common.MetaInfo;
 import at.gv.egovernment.moa.spss.api.xmlbind.VerifyCMSSignatureRequestParser;
+import at.gv.egovernment.moaspss.util.DateTimeUtils;
 
 /**
  * Test the <code>VerifyCMSSignatureRequestParserTest</code>.
diff --git a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java
index 66d7efa..ceb50fb 100644
--- a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java
+++ b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java
@@ -27,9 +27,6 @@ package test.at.gv.egovernment.moa.spss.api.xmlbind;
 import org.w3c.dom.Element;
 
 import test.at.gv.egovernment.moa.spss.SPSSTestCase;
-
-import at.gv.egovernment.moa.util.DateTimeUtils;
-
 import at.gv.egovernment.moa.spss.api.xmlbind.VerifyXMLSignatureRequestParser;
 import at.gv.egovernment.moa.spss.api.xmlverify.ReferenceInfo;
 import at.gv.egovernment.moa.spss.api.xmlverify.SignatureManifestCheckParams;
@@ -37,6 +34,7 @@ import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureInfo;
 import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureLocation;
 import at.gv.egovernment.moa.spss.api.xmlverify.VerifyTransformsInfoProfileExplicit;
 import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest;
+import at.gv.egovernment.moaspss.util.DateTimeUtils;
 
 /**
  * Test the <code>VerifyXMLSignatureRequestParserTest</code>.
diff --git a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest1.java b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest1.java
index 180b94d..c277de5 100644
--- a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest1.java
+++ b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest1.java
@@ -51,7 +51,7 @@ import at.gv.egovernment.moa.spss.server.config.KeyGroupEntry;
 import at.gv.egovernment.moa.spss.server.config.OCSPDistributionPoint;
 import at.gv.egovernment.moa.spss.server.config.SoftwareKeyModule;
 import at.gv.egovernment.moa.spss.server.config.TrustProfile;
-import at.gv.egovernment.moa.util.Constants;
+import at.gv.egovernment.moaspss.util.Constants;
 
 /**
  * @author Gregor Karlinger
diff --git a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest2.java b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest2.java
index 45cae37..6bf1c9d 100644
--- a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest2.java
+++ b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest2.java
@@ -42,7 +42,7 @@ import at.gv.egovernment.moa.spss.MOAException;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationException;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
 import at.gv.egovernment.moa.spss.server.config.TrustProfile;
-import at.gv.egovernment.moa.util.Constants;
+import at.gv.egovernment.moaspss.util.Constants;
 
 /**
  * @author Gregor Karlinger
diff --git a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest3.java b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest3.java
index 59fa200..33be7f0 100644
--- a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest3.java
+++ b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest3.java
@@ -39,7 +39,7 @@ import org.w3c.dom.Element;
 import at.gv.egovernment.moa.spss.MOAException;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationException;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-import at.gv.egovernment.moa.util.Constants;
+import at.gv.egovernment.moaspss.util.Constants;
 
 /**
  * @author Gregor Karlinger
diff --git a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java
index 11b0294..2deb180 100644
--- a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java
+++ b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java
@@ -45,7 +45,7 @@ import iaik.pki.revocation.RevocationConfiguration;
 import iaik.pki.store.certstore.CertStoreConfiguration;
 import iaik.pki.store.certstore.CertStoreTypes;
 import iaik.pki.store.revocation.archive.ArchiveConfiguration;
-import iaik.pki.store.revocation.archive.db.DataBaseArchiveParameter;
+//import iaik.pki.store.revocation.archive.db.DataBaseArchiveParameter;
 import iaik.server.ConfigurationData;
 import iaik.server.modules.keys.HardwareKeyModuleConfiguration;
 import iaik.server.modules.keys.SoftwareKeyModuleConfiguration;
@@ -101,18 +101,18 @@ public class ConfigurationDataImplTest extends SPSSTestCase {
       pkiConfig.getRevocationConfiguration();
     ValidationConfiguration validationConfig =
       pkiConfig.getValidationConfiguration();
-    DataBaseArchiveParameter archiveParam;
+    //DataBaseArchiveParameter archiveParam;
     Set distributionPoints;
     Iterator iter;
     boolean found;
 
     // test archive parameters
-    archiveParam =
+   /* archiveParam =
       (DataBaseArchiveParameter) archiveConfig.getArchiveParameters();
     assertEquals(
       archiveParam.getJDBCUrl(),
       "jdbc:postgresql://10.16.46.108/moa?user=moa&password=moatest");
-
+	*/
     // test cert store configuration
     assertEquals(1, certStoreConfig.getParameters().length);
     assertEquals(
diff --git a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java
index 0db5dbc..4bdf62a 100644
--- a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java
+++ b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java
@@ -28,14 +28,12 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import test.at.gv.egovernment.moa.spss.SPSSTestCase;
-
-import at.gv.egovernment.moa.util.DOMUtils;
-
 import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest;
 import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse;
 import at.gv.egovernment.moa.spss.api.xmlbind.VerifyCMSSignatureRequestParser;
 import at.gv.egovernment.moa.spss.api.xmlbind.VerifyCMSSignatureResponseBuilder;
 import at.gv.egovernment.moa.spss.server.invoke.CMSSignatureVerificationInvoker;
+import at.gv.egovernment.moaspss.util.DOMUtils;
 
 /**
  * Mainly a smoke test for debugging the CMSSignatureVerificationInvoker.
diff --git a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java
index 602393c..3d3e884 100644
--- a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java
+++ b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java
@@ -35,9 +35,6 @@ import test.at.gv.egovernment.moa.spss.SPSSTestCase;
 import iaik.server.modules.xml.BinaryDataObject;
 import iaik.server.modules.xml.DataObject;
 import iaik.server.modules.xml.XMLDataObject;
-
-import at.gv.egovernment.moa.util.Base64Utils;
-
 import at.gv.egovernment.moa.spss.MOAException;
 import at.gv.egovernment.moa.spss.api.SPSSFactory;
 import at.gv.egovernment.moa.spss.api.common.Content;
@@ -46,6 +43,7 @@ import at.gv.egovernment.moa.spss.server.iaik.xml.ByteStreamDataObjectImpl;
 import at.gv.egovernment.moa.spss.server.iaik.xml.XMLDataObjectImpl;
 import at.gv.egovernment.moa.spss.server.iaik.xml.XMLNodeListDataObjectImpl;
 import at.gv.egovernment.moa.spss.server.invoke.DataObjectFactory;
+import at.gv.egovernment.moaspss.util.Base64Utils;
 
 /**
  * Test cases for the <code>DataObjectFactory</code> class.
diff --git a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java
index 52f8038..64c0c8b 100644
--- a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java
+++ b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java
@@ -33,7 +33,7 @@ import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.api.common.Transform;
 import at.gv.egovernment.moa.spss.api.xmlbind.TransformParser;
 import at.gv.egovernment.moa.spss.server.invoke.TransformationFactory;
-import at.gv.egovernment.moa.util.Constants;
+import at.gv.egovernment.moaspss.util.Constants;
 import iaik.server.modules.xml.Base64Transformation;
 import iaik.server.modules.xml.Canonicalization;
 import iaik.server.modules.xml.EnvelopedSignatureTransformation;
diff --git a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java
index 8b3e6b0..e862e2c 100644
--- a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java
+++ b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java
@@ -30,14 +30,12 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import test.at.gv.egovernment.moa.spss.SPSSTestCase;
-
-import at.gv.egovernment.moa.util.DOMUtils;
-
 import at.gv.egovernment.moa.spss.api.xmlbind.CreateXMLSignatureRequestParser;
 import at.gv.egovernment.moa.spss.api.xmlbind.CreateXMLSignatureResponseBuilder;
 import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest;
 import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponse;
 import at.gv.egovernment.moa.spss.server.invoke.XMLSignatureCreationInvoker;
+import at.gv.egovernment.moaspss.util.DOMUtils;
 
 /**
  * Mainly a smoke test for debugging the XMLSignatureCreationInvoker.
diff --git a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java
index 7ea63e2..565ea27 100644
--- a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java
+++ b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java
@@ -27,14 +27,12 @@ package test.at.gv.egovernment.moa.spss.server.invoke;
 import org.w3c.dom.Document;
 
 import test.at.gv.egovernment.moa.spss.SPSSTestCase;
-
-import at.gv.egovernment.moa.util.DOMUtils;
-
 import at.gv.egovernment.moa.spss.api.xmlbind.VerifyXMLSignatureRequestParser;
 import at.gv.egovernment.moa.spss.api.xmlbind.VerifyXMLSignatureResponseBuilder;
 import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest;
 import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
 import at.gv.egovernment.moa.spss.server.invoke.XMLSignatureVerificationInvoker;
+import at.gv.egovernment.moaspss.util.DOMUtils;
 
 /**
  * Mainly a smoke test for debugging the XMLSignatureVerificationInvoker.
diff --git a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java
index 296ba00..9b2fd32 100644
--- a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java
+++ b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java
@@ -27,7 +27,7 @@ package test.at.gv.egovernment.moa.spss.server.tools;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 
-import at.gv.egovernment.moa.spss.server.tools.CertTool;
+//import at.gv.egovernment.moa.spss.server.tools.CertTool;
 import test.at.gv.egovernment.moa.MOATestCase;
 
 /**
@@ -45,7 +45,7 @@ public class CertToolTest extends MOATestCase {
       + " CN=Patrick Peck,OU=MOA Team,O=BRZ,L=Vienna,ST=Vienna,C=AT\r\n"
       + "Serial Number      :"
       + " 1047548672\r\n";
-  private CertTool certTool;
+  //private CertTool certTool;
 
   /**
    * Constructor for CertToolTest.
@@ -56,7 +56,7 @@ public class CertToolTest extends MOATestCase {
   }
 
   protected void setUp() {
-    certTool = new CertTool();
+    //certTool = new CertTool();
   }
 
   public void testPrintCertInfo() {
@@ -64,7 +64,7 @@ public class CertToolTest extends MOATestCase {
     PrintStream ps = new PrintStream(bos);
     String result;
 
-    certTool.printCertInfo(TESTDATA_ROOT + "security/server.cer", ps);
+    //certTool.printCertInfo(TESTDATA_ROOT + "security/server.cer", ps);
     result = new String(bos.toByteArray());
     System.out.println(result);
     assertEquals(EXPECTED_RESULT, result);
diff --git a/moaSig/moa-sig/build.gradle b/moaSig/moa-sig/build.gradle
index c366cf0..cfee94b 100644
--- a/moaSig/moa-sig/build.gradle
+++ b/moaSig/moa-sig/build.gradle
@@ -1,5 +1,6 @@
 apply plugin: 'war'
 apply plugin: 'eclipse-wtp'
+apply from: 'https://raw.github.com/akhikhl/gretty/master/pluginScripts/gretty.plugin'
 
 repositories {
     maven {
@@ -14,14 +15,14 @@ dependencies {
 	compile 'commons-discovery:commons-discovery:0.5'
 	compile 'org.slf4j:slf4j-log4j12:1.7.12'
 	
-	compile 'org.apache.cxf:cxf-rt-frontend-jaxws:3.1.4'
-	compile 'org.apache.cxf:cxf-rt-transports-http:3.1.4'
-	compile 'org.aspectj:aspectjrt:1.8.7'
-	compile 'org.aspectj:aspectjweaver:1.8.7'
+	//compile 'org.apache.cxf:cxf-rt-frontend-jaxws:3.1.4'
+	//compile 'org.apache.cxf:cxf-rt-transports-http:3.1.4'
+	//compile 'org.aspectj:aspectjrt:1.8.7'
+	//compile 'org.aspectj:aspectjweaver:1.8.7'
 	
-	compile 'at.gv.egiz.pdfas:pdf-as-lib:4.0.7'
-	compile 'at.gv.egiz.pdfas:pdf-as-pdfbox:4.0.7'
-	compile 'at.gv.egiz.pdfas:sigs-pades:4.0.7'
+	//compile 'at.gv.egiz.pdfas:pdf-as-lib:4.0.7'
+	//compile 'at.gv.egiz.pdfas:pdf-as-pdfbox:4.0.7'
+	//compile 'at.gv.egiz.pdfas:sigs-pades:4.0.7'
 }
 
 sourceSets {
@@ -38,6 +39,20 @@ configurations {
 
 dependencies {
     jaxb group: 'com.sun.xml.bind', name: 'jaxb-xjc', version: '2.2.4-1'
+    //compile 'ch.qos.logback:logback-classic:1.1.5'
+    //compile 'ch.qos.logback:logback-core:1.1.5'
+    //def tomcatVersion = '7.0.59'
+    //tomcat "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}",
+    //       "org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}",
+    //       "org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}"
+}
+
+gretty {
+	jvmArgs = [
+		'-Dmoa.spss.server.configuration=/home/afitzek/server/moa-spss/apache-tomcat-8.0.0-RC3/conf/moa-spss/spss.config.xml',
+		'-Dlog4j.configuration=/home/afitzek/server/moa-spss/apache-tomcat-8.0.0-RC3/conf/moa-spss/log4j.properties'
+	]
+	loggingLevel = "TRACE"
 }
 
 task jaxb () {
@@ -62,3 +77,14 @@ task jaxb () {
 }
 
 //compileJava.dependsOn jaxb
+// context where tomcat is deployed, by defautl localhost:8080/
+
+//tomcat {
+//	stopKey = 'x'
+	//daemon = true
+//}
+//System.setProperty('moa.spss.server.configuration', '/home/afitzek/server/moa-spss/apache-tomcat-8.0.0-RC3/conf/moa-spss/spss.config.xml')
+//	System.setProperty('log4j.configuration', '/home/afitzek/server/moa-spss/apache-tomcat-8.0.0-RC3/conf/moa-spss/log4j.properties')
+
+//tomcatRun.contextPath = '/'
+//tomcatRunWar.contextPath = '/'
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AllSignatoriesType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AllSignatoriesType.java
index 0faa261..7c355f1 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AllSignatoriesType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AllSignatoriesType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AnyChildrenType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AnyChildrenType.java
index c305a51..6c91ce0 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AnyChildrenType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AnyChildrenType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
@@ -43,8 +43,8 @@ import org.w3c.dom.Element;
     "content"
 })
 @XmlSeeAlso({
-    ReferencesCheckResultInfoType.class,
-    ManifestRefsCheckResultInfoType.class
+    ManifestRefsCheckResultInfoType.class,
+    ReferencesCheckResultInfoType.class
 })
 public class AnyChildrenType {
 
@@ -70,9 +70,9 @@ public class AnyChildrenType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
+     * {@link Element }
      * {@link Object }
      * {@link String }
-     * {@link Element }
      * 
      * 
      */
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSContentBaseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSContentBaseType.java
index 86b030d..7427e70 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSContentBaseType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSContentBaseType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectInfoType.java
index 69a89bb..9def3b2 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectInfoType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectInfoType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectOptionalMetaType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectOptionalMetaType.java
index fda13bb..12d377f 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectOptionalMetaType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectOptionalMetaType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectRequiredMetaType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectRequiredMetaType.java
index b3155c2..2b756d5 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectRequiredMetaType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectRequiredMetaType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CanonicalizationMethodType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CanonicalizationMethodType.java
index 196446d..14b7625 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CanonicalizationMethodType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CanonicalizationMethodType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
@@ -70,8 +70,8 @@ public class CanonicalizationMethodType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link String }
      * {@link Object }
+     * {@link String }
      * 
      * 
      */
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CheckResultType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CheckResultType.java
index 93e4362..aaa6c0e 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CheckResultType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CheckResultType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
@@ -43,8 +43,8 @@ import javax.xml.bind.annotation.XmlType;
     "info"
 })
 @XmlSeeAlso({
-    ManifestRefsCheckResultType.class,
-    ReferencesCheckResultType.class
+    ReferencesCheckResultType.class,
+    ManifestRefsCheckResultType.class
 })
 public class CheckResultType {
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentBaseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentBaseType.java
index 692110e..e5b064e 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentBaseType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentBaseType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentExLocRefBaseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentExLocRefBaseType.java
index 7c0dd25..1b660d8 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentExLocRefBaseType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentExLocRefBaseType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentOptionalRefType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentOptionalRefType.java
index aa09c98..46db140 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentOptionalRefType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentOptionalRefType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
@@ -36,9 +36,9 @@ import javax.xml.bind.annotation.XmlType;
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "ContentOptionalRefType")
 @XmlSeeAlso({
+    at.gv.egiz.moasig.DataObjectInfoType.DataObject.class,
     CMSContentBaseType.class,
-    ContentRequiredRefType.class,
-    at.gv.egiz.moasig.DataObjectInfoType.DataObject.class
+    ContentRequiredRefType.class
 })
 public class ContentOptionalRefType
     extends ContentBaseType
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentRequiredRefType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentRequiredRefType.java
index 09e8af8..6a57050 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentRequiredRefType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentRequiredRefType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequest.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequest.java
index 4d166e7..89c8944 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequest.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequest.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequestType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequestType.java
index b74132f..14b54c3 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequestType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequestType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureResponseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureResponseType.java
index 7e4d9a5..ef473ce 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureResponseType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureResponseType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureRequest.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureRequest.java
index 3ee7507..c66580d 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureRequest.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureRequest.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2015.12.09 at 08:47:56 AM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureRequestType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureRequestType.java
index c69738c..b6b4b2c 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureRequestType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureRequestType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2015.12.09 at 08:47:56 AM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureResponseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureResponseType.java
index eace92c..5bd70ac 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureResponseType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureResponseType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2015.12.09 at 08:47:56 AM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureEnvironmentProfile.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureEnvironmentProfile.java
index e3ee7fd..3a6f743 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureEnvironmentProfile.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureEnvironmentProfile.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureLocationType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureLocationType.java
index f5e40af..5a1bd95 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureLocationType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureLocationType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateTransformsInfoProfile.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateTransformsInfoProfile.java
index 74f0ad1..5277571 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateTransformsInfoProfile.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateTransformsInfoProfile.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequest.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequest.java
index 3953720..1b4755e 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequest.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequest.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequestType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequestType.java
index c19c1fa..0dd5bc0 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequestType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequestType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureResponseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureResponseType.java
index fb00cd5..f7f38a4 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureResponseType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureResponseType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DSAKeyValueType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DSAKeyValueType.java
index e3ee203..241cbe9 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DSAKeyValueType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DSAKeyValueType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DataObjectInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DataObjectInfoType.java
index f5853e5..068751c 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DataObjectInfoType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DataObjectInfoType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DigestMethodType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DigestMethodType.java
index 2fc5bc8..038ce1c 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DigestMethodType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DigestMethodType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
@@ -71,9 +71,9 @@ public class DigestMethodType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
+     * {@link Element }
      * {@link Object }
      * {@link String }
-     * {@link Element }
      * 
      * 
      */
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ErrorResponseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ErrorResponseType.java
index 29e36c8..6bed498 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ErrorResponseType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ErrorResponseType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FinalDataMetaInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FinalDataMetaInfoType.java
index 829ba47..70afe1d 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FinalDataMetaInfoType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FinalDataMetaInfoType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FormResultType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FormResultType.java
index dd6b787..0d61c08 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FormResultType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FormResultType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/InputDataType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/InputDataType.java
index 6c24b40..477927d 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/InputDataType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/InputDataType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyInfoType.java
index ea2b0a8..4663f48 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyInfoType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyInfoType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
@@ -60,13 +60,13 @@ import org.w3c.dom.Element;
 public class KeyInfoType {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
         @XmlElementRef(name = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
         @XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
+        @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
     })
     @XmlMixed
     @XmlAnyElement(lax = true)
@@ -95,16 +95,16 @@ public class KeyInfoType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
-     * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
+     * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
      * {@link Element }
+     * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
+     * {@link JAXBElement }{@code <}{@link String }{@code >}
      * {@link Object }
+     * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
      * {@link String }
+     * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
      * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
-     * {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
-     * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
      * 
      * 
      */
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyStorageType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyStorageType.java
index de9229e..0968c74 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyStorageType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyStorageType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyValueType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyValueType.java
index 962acfd..993d15c 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyValueType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyValueType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
@@ -74,11 +74,11 @@ public class KeyValueType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
      * {@link Element }
+     * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
+     * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}
      * {@link Object }
      * {@link String }
-     * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}
      * 
      * 
      */
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultInfoType.java
index 802500b..64cba47 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultInfoType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultInfoType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultType.java
index 6cb8b6e..3a61f4d 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestType.java
index 00b879c..3cf35aa 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MetaInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MetaInfoType.java
index 5f7f52a..321d5d6 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MetaInfoType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MetaInfoType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MoaTransformType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MoaTransformType.java
index 36797df..3874e8a 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MoaTransformType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MoaTransformType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
@@ -50,8 +50,8 @@ import javax.xml.bind.annotation.XmlType;
 public class MoaTransformType {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "transformData", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "XPath", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class, required = false)
+        @XmlElementRef(name = "XPath", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "transformData", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class, required = false)
     })
     @XmlMixed
     protected List<Serializable> content;
@@ -78,8 +78,8 @@ public class MoaTransformType {
      * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
      * {@link String }
+     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
      * 
      * 
      */
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MoaTransformsType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MoaTransformsType.java
index e262b9c..1deb142 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MoaTransformsType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MoaTransformsType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/NamespaceDeclarationType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/NamespaceDeclarationType.java
new file mode 100644
index 0000000..751ba8c
--- /dev/null
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/NamespaceDeclarationType.java
@@ -0,0 +1,99 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
+//
+
+
+package at.gv.egiz.moasig;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * <p>Java class for NamespaceDeclarationType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="NamespaceDeclarationType">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>token">
+ *       &lt;attribute name="prefix" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "NamespaceDeclarationType", propOrder = {
+    "value"
+})
+public class NamespaceDeclarationType {
+
+    @XmlValue
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String value;
+    @XmlAttribute(name = "prefix", required = true)
+    protected String prefix;
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the prefix property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getPrefix() {
+        return prefix;
+    }
+
+    /**
+     * Sets the value of the prefix property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPrefix(String value) {
+        this.prefix = value;
+    }
+
+}
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectFactory.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectFactory.java
index 5fcafb9..beae6d9 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectFactory.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectFactory.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
@@ -34,61 +34,60 @@ import javax.xml.namespace.QName;
 @XmlRegistry
 public class ObjectFactory {
 
-    private final static QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath");
-    private final static QName _Signature_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Signature");
-    private final static QName _PGPData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPData");
-    private final static QName _DSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DSAKeyValue");
+    private final static QName _SupplementProfile_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "SupplementProfile");
     private final static QName _SPKIData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKIData");
+    private final static QName _CreateXMLSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "CreateXMLSignatureResponse");
+    private final static QName _KeyInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyInfo");
+    private final static QName _SignatureValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureValue");
     private final static QName _ErrorResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "ErrorResponse");
-    private final static QName _SignedInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignedInfo");
-    private final static QName _RetrievalMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RetrievalMethod");
+    private final static QName _KeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyValue");
     private final static QName _VerifyXMLSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "VerifyXMLSignatureResponse");
-    private final static QName _CanonicalizationMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "CanonicalizationMethod");
-    private final static QName _Object_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Object");
-    private final static QName _VerifyPDFSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "VerifyPDFSignatureResponse");
-    private final static QName _FailedReference_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "FailedReference");
-    private final static QName _Supplement_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "Supplement");
-    private final static QName _SignatureProperty_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperty");
     private final static QName _Transforms_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transforms");
-    private final static QName _SignatureValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureValue");
-    private final static QName _Manifest_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Manifest");
-    private final static QName _Transform_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transform");
+    private final static QName _DigestMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestMethod");
+    private final static QName _Supplement_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "Supplement");
+    private final static QName _MoaTransforms_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "MoaTransforms");
     private final static QName _X509Data_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Data");
-    private final static QName _IssuingCountry_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "IssuingCountry");
-    private final static QName _CreateXMLSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "CreateXMLSignatureResponse");
-    private final static QName _SignatureMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureMethod");
-    private final static QName _KeyInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyInfo");
-    private final static QName _SupplementProfile_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "SupplementProfile");
+    private final static QName _SignatureProperty_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperty");
     private final static QName _CreateCMSSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "CreateCMSSignatureResponse");
-    private final static QName _VerifyCMSSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "VerifyCMSSignatureResponse");
-    private final static QName _DigestMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestMethod");
-    private final static QName _DigestValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestValue");
+    private final static QName _FailedReference_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "FailedReference");
+    private final static QName _KeyName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyName");
+    private final static QName _RSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RSAKeyValue");
+    private final static QName _Signature_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Signature");
     private final static QName _MgmtData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "MgmtData");
+    private final static QName _SignatureMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureMethod");
+    private final static QName _Object_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Object");
+    private final static QName _VerifyCMSSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "VerifyCMSSignatureResponse");
     private final static QName _SignatureProperties_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperties");
-    private final static QName _KeyName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyName");
-    private final static QName _KeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyValue");
+    private final static QName _ReferringSigReference_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "ReferringSigReference");
+    private final static QName _Transform_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transform");
+    private final static QName _VerifyPDFSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "VerifyPDFSignatureResponse");
+    private final static QName _MoaTransform_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "MoaTransform");
+    private final static QName _PGPData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPData");
     private final static QName _Reference_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Reference");
+    private final static QName _RetrievalMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RetrievalMethod");
+    private final static QName _DSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DSAKeyValue");
+    private final static QName _DigestValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestValue");
     private final static QName _PublicAuthority_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "PublicAuthority");
-    private final static QName _CreatePDFSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "CreatePDFSignatureResponse");
-    private final static QName _MoaTransform_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "MoaTransform");
-    private final static QName _ReferringSigReference_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "ReferringSigReference");
-    private final static QName _RSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RSAKeyValue");
-    private final static QName _MoaTransforms_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "MoaTransforms");
+    private final static QName _CanonicalizationMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "CanonicalizationMethod");
+    private final static QName _SignedInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignedInfo");
+    private final static QName _IssuingCountry_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "IssuingCountry");
+    private final static QName _Manifest_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Manifest");
+    private final static QName _MoaTransformTypeXPath_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "XPath");
+    private final static QName _MoaTransformTypeTransformData_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "transformData");
+    private final static QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath");
+    private final static QName _PGPDataTypePGPKeyID_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyID");
+    private final static QName _PGPDataTypePGPKeyPacket_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyPacket");
     private final static QName _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp");
+    private final static QName _X509DataTypeX509IssuerSerial_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509IssuerSerial");
+    private final static QName _X509DataTypeX509CRL_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509CRL");
+    private final static QName _X509DataTypeX509SubjectName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SubjectName");
+    private final static QName _X509DataTypeX509SKI_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SKI");
+    private final static QName _X509DataTypeX509Certificate_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Certificate");
     private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength");
-    private final static QName _VerifyCMSSignatureResponseTypeSignatureCheck_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "SignatureCheck");
     private final static QName _VerifyCMSSignatureResponseTypeCertificateCheck_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "CertificateCheck");
     private final static QName _VerifyCMSSignatureResponseTypeSignerInfo_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "SignerInfo");
+    private final static QName _VerifyCMSSignatureResponseTypeSignatureCheck_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "SignatureCheck");
     private final static QName _VerifyCMSSignatureResponseTypeFormCheckResult_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "FormCheckResult");
-    private final static QName _X509DataTypeX509IssuerSerial_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509IssuerSerial");
-    private final static QName _X509DataTypeX509Certificate_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Certificate");
-    private final static QName _X509DataTypeX509SKI_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SKI");
-    private final static QName _X509DataTypeX509SubjectName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SubjectName");
-    private final static QName _X509DataTypeX509CRL_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509CRL");
-    private final static QName _PGPDataTypePGPKeyID_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyID");
-    private final static QName _PGPDataTypePGPKeyPacket_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyPacket");
-    private final static QName _MoaTransformTypeTransformData_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "transformData");
-    private final static QName _MoaTransformTypeXPath_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "XPath");
 
     /**
      * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.egiz.moasig
@@ -106,14 +105,6 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link CreatePDFSignatureRequestType }
-     * 
-     */
-    public CreatePDFSignatureRequestType createCreatePDFSignatureRequestType() {
-        return new CreatePDFSignatureRequestType();
-    }
-
-    /**
      * Create an instance of {@link CreateCMSSignatureRequestType }
      * 
      */
@@ -146,14 +137,6 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link TransformParameterType }
-     * 
-     */
-    public TransformParameterType createTransformParameterType() {
-        return new TransformParameterType();
-    }
-
-    /**
      * Create an instance of {@link CreateXMLSignatureRequestType.SingleSignatureInfo }
      * 
      */
@@ -162,19 +145,19 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link VerifyXMLSignatureResponseType }
+     * Create an instance of {@link TransformParameterType }
      * 
      */
-    public VerifyXMLSignatureResponseType createVerifyXMLSignatureResponseType() {
-        return new VerifyXMLSignatureResponseType();
+    public TransformParameterType createTransformParameterType() {
+        return new TransformParameterType();
     }
 
     /**
-     * Create an instance of {@link VerifyPDFSignatureResponseType }
+     * Create an instance of {@link QualifiedCertificate }
      * 
      */
-    public VerifyPDFSignatureResponseType createVerifyPDFSignatureResponseType() {
-        return new VerifyPDFSignatureResponseType();
+    public QualifiedCertificate createQualifiedCertificate() {
+        return new QualifiedCertificate();
     }
 
     /**
@@ -186,155 +169,163 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link QualifiedCertificate }
+     * Create an instance of {@link CreateCMSSignatureResponseType }
      * 
      */
-    public QualifiedCertificate createQualifiedCertificate() {
-        return new QualifiedCertificate();
+    public CreateCMSSignatureResponseType createCreateCMSSignatureResponseType() {
+        return new CreateCMSSignatureResponseType();
     }
 
     /**
-     * Create an instance of {@link CreateXMLSignatureRequest }
+     * Create an instance of {@link VerifyPDFSignatureRequest }
      * 
      */
-    public CreateXMLSignatureRequest createCreateXMLSignatureRequest() {
-        return new CreateXMLSignatureRequest();
+    public VerifyPDFSignatureRequest createVerifyPDFSignatureRequest() {
+        return new VerifyPDFSignatureRequest();
     }
 
     /**
-     * Create an instance of {@link CreatePDFSignatureRequest }
+     * Create an instance of {@link VerifyPDFSignatureRequestType }
      * 
      */
-    public CreatePDFSignatureRequest createCreatePDFSignatureRequest() {
-        return new CreatePDFSignatureRequest();
+    public VerifyPDFSignatureRequestType createVerifyPDFSignatureRequestType() {
+        return new VerifyPDFSignatureRequestType();
     }
 
     /**
-     * Create an instance of {@link CreatePDFSignatureRequestType.SingleSignatureInfo }
+     * Create an instance of {@link CreateXMLSignatureResponseType }
      * 
      */
-    public CreatePDFSignatureRequestType.SingleSignatureInfo createCreatePDFSignatureRequestTypeSingleSignatureInfo() {
-        return new CreatePDFSignatureRequestType.SingleSignatureInfo();
+    public CreateXMLSignatureResponseType createCreateXMLSignatureResponseType() {
+        return new CreateXMLSignatureResponseType();
     }
 
     /**
-     * Create an instance of {@link VerifyTransformsInfoProfile }
+     * Create an instance of {@link CreateTransformsInfoProfile }
      * 
      */
-    public VerifyTransformsInfoProfile createVerifyTransformsInfoProfile() {
-        return new VerifyTransformsInfoProfile();
+    public CreateTransformsInfoProfile createCreateTransformsInfoProfile() {
+        return new CreateTransformsInfoProfile();
     }
 
     /**
-     * Create an instance of {@link MoaTransformsType }
+     * Create an instance of {@link TransformsInfoType }
      * 
      */
-    public MoaTransformsType createMoaTransformsType() {
-        return new MoaTransformsType();
+    public TransformsInfoType createTransformsInfoType() {
+        return new TransformsInfoType();
     }
 
     /**
-     * Create an instance of {@link ErrorResponseType }
+     * Create an instance of {@link VerifyCMSSignatureRequest }
      * 
      */
-    public ErrorResponseType createErrorResponseType() {
-        return new ErrorResponseType();
+    public VerifyCMSSignatureRequest createVerifyCMSSignatureRequest() {
+        return new VerifyCMSSignatureRequest();
     }
 
     /**
-     * Create an instance of {@link SecureSignatureCreationDevice }
+     * Create an instance of {@link VerifyCMSSignatureRequestType }
      * 
      */
-    public SecureSignatureCreationDevice createSecureSignatureCreationDevice() {
-        return new SecureSignatureCreationDevice();
+    public VerifyCMSSignatureRequestType createVerifyCMSSignatureRequestType() {
+        return new VerifyCMSSignatureRequestType();
     }
 
     /**
-     * Create an instance of {@link CreateSignatureEnvironmentProfile }
+     * Create an instance of {@link CMSDataObjectOptionalMetaType }
      * 
      */
-    public CreateSignatureEnvironmentProfile createCreateSignatureEnvironmentProfile() {
-        return new CreateSignatureEnvironmentProfile();
+    public CMSDataObjectOptionalMetaType createCMSDataObjectOptionalMetaType() {
+        return new CMSDataObjectOptionalMetaType();
     }
 
     /**
-     * Create an instance of {@link CreateSignatureLocationType }
+     * Create an instance of {@link VerifyCMSSignatureResponseType }
      * 
      */
-    public CreateSignatureLocationType createCreateSignatureLocationType() {
-        return new CreateSignatureLocationType();
+    public VerifyCMSSignatureResponseType createVerifyCMSSignatureResponseType() {
+        return new VerifyCMSSignatureResponseType();
     }
 
     /**
-     * Create an instance of {@link PublicAuthorityType }
+     * Create an instance of {@link SecureSignatureCreationDevice }
      * 
      */
-    public PublicAuthorityType createPublicAuthorityType() {
-        return new PublicAuthorityType();
+    public SecureSignatureCreationDevice createSecureSignatureCreationDevice() {
+        return new SecureSignatureCreationDevice();
     }
 
     /**
-     * Create an instance of {@link VerifyCMSSignatureRequest }
+     * Create an instance of {@link VerifyTransformsInfoProfile }
      * 
      */
-    public VerifyCMSSignatureRequest createVerifyCMSSignatureRequest() {
-        return new VerifyCMSSignatureRequest();
+    public VerifyTransformsInfoProfile createVerifyTransformsInfoProfile() {
+        return new VerifyTransformsInfoProfile();
     }
 
     /**
-     * Create an instance of {@link VerifyCMSSignatureRequestType }
+     * Create an instance of {@link MoaTransformsType }
      * 
      */
-    public VerifyCMSSignatureRequestType createVerifyCMSSignatureRequestType() {
-        return new VerifyCMSSignatureRequestType();
+    public MoaTransformsType createMoaTransformsType() {
+        return new MoaTransformsType();
     }
 
     /**
-     * Create an instance of {@link CMSDataObjectOptionalMetaType }
+     * Create an instance of {@link ErrorResponseType }
      * 
      */
-    public CMSDataObjectOptionalMetaType createCMSDataObjectOptionalMetaType() {
-        return new CMSDataObjectOptionalMetaType();
+    public ErrorResponseType createErrorResponseType() {
+        return new ErrorResponseType();
     }
 
     /**
-     * Create an instance of {@link CreatePDFSignatureResponseType }
+     * Create an instance of {@link MoaTransformType }
      * 
      */
-    public CreatePDFSignatureResponseType createCreatePDFSignatureResponseType() {
-        return new CreatePDFSignatureResponseType();
+    public MoaTransformType createMoaTransformType() {
+        return new MoaTransformType();
     }
 
     /**
-     * Create an instance of {@link MoaTransformType }
+     * Create an instance of {@link VerifyPDFSignatureResponseType }
      * 
      */
-    public MoaTransformType createMoaTransformType() {
-        return new MoaTransformType();
+    public VerifyPDFSignatureResponseType createVerifyPDFSignatureResponseType() {
+        return new VerifyPDFSignatureResponseType();
     }
 
     /**
-     * Create an instance of {@link VerifyPDFSignatureRequest }
+     * Create an instance of {@link VerifyXMLSignatureResponseType }
      * 
      */
-    public VerifyPDFSignatureRequest createVerifyPDFSignatureRequest() {
-        return new VerifyPDFSignatureRequest();
+    public VerifyXMLSignatureResponseType createVerifyXMLSignatureResponseType() {
+        return new VerifyXMLSignatureResponseType();
     }
 
     /**
-     * Create an instance of {@link VerifyPDFSignatureRequestType }
+     * Create an instance of {@link CreateSignatureEnvironmentProfile }
      * 
      */
-    public VerifyPDFSignatureRequestType createVerifyPDFSignatureRequestType() {
-        return new VerifyPDFSignatureRequestType();
+    public CreateSignatureEnvironmentProfile createCreateSignatureEnvironmentProfile() {
+        return new CreateSignatureEnvironmentProfile();
     }
 
     /**
-     * Create an instance of {@link CreateXMLSignatureResponseType }
+     * Create an instance of {@link CreateSignatureLocationType }
      * 
      */
-    public CreateXMLSignatureResponseType createCreateXMLSignatureResponseType() {
-        return new CreateXMLSignatureResponseType();
+    public CreateSignatureLocationType createCreateSignatureLocationType() {
+        return new CreateSignatureLocationType();
+    }
+
+    /**
+     * Create an instance of {@link CreateXMLSignatureRequest }
+     * 
+     */
+    public CreateXMLSignatureRequest createCreateXMLSignatureRequest() {
+        return new CreateXMLSignatureRequest();
     }
 
     /**
@@ -370,99 +361,99 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link CreateCMSSignatureResponseType }
+     * Create an instance of {@link PublicAuthorityType }
      * 
      */
-    public CreateCMSSignatureResponseType createCreateCMSSignatureResponseType() {
-        return new CreateCMSSignatureResponseType();
+    public PublicAuthorityType createPublicAuthorityType() {
+        return new PublicAuthorityType();
     }
 
     /**
-     * Create an instance of {@link VerifyCMSSignatureResponseType }
+     * Create an instance of {@link PDFSignatureResultType }
      * 
      */
-    public VerifyCMSSignatureResponseType createVerifyCMSSignatureResponseType() {
-        return new VerifyCMSSignatureResponseType();
+    public PDFSignatureResultType createPDFSignatureResultType() {
+        return new PDFSignatureResultType();
     }
 
     /**
-     * Create an instance of {@link CreateTransformsInfoProfile }
+     * Create an instance of {@link CheckResultType }
      * 
      */
-    public CreateTransformsInfoProfile createCreateTransformsInfoProfile() {
-        return new CreateTransformsInfoProfile();
+    public CheckResultType createCheckResultType() {
+        return new CheckResultType();
     }
 
     /**
-     * Create an instance of {@link TransformsInfoType }
+     * Create an instance of {@link ManifestRefsCheckResultInfoType }
      * 
      */
-    public TransformsInfoType createTransformsInfoType() {
-        return new TransformsInfoType();
+    public ManifestRefsCheckResultInfoType createManifestRefsCheckResultInfoType() {
+        return new ManifestRefsCheckResultInfoType();
     }
 
     /**
-     * Create an instance of {@link FormResultType }
+     * Create an instance of {@link ContentBaseType }
      * 
      */
-    public FormResultType createFormResultType() {
-        return new FormResultType();
+    public ContentBaseType createContentBaseType() {
+        return new ContentBaseType();
     }
 
     /**
-     * Create an instance of {@link CMSContentBaseType }
+     * Create an instance of {@link VerifyTransformsDataType }
      * 
      */
-    public CMSContentBaseType createCMSContentBaseType() {
-        return new CMSContentBaseType();
+    public VerifyTransformsDataType createVerifyTransformsDataType() {
+        return new VerifyTransformsDataType();
     }
 
     /**
-     * Create an instance of {@link ManifestRefsCheckResultType }
+     * Create an instance of {@link NamespaceDeclarationType }
      * 
      */
-    public ManifestRefsCheckResultType createManifestRefsCheckResultType() {
-        return new ManifestRefsCheckResultType();
+    public NamespaceDeclarationType createNamespaceDeclarationType() {
+        return new NamespaceDeclarationType();
     }
 
     /**
-     * Create an instance of {@link InputDataType }
+     * Create an instance of {@link XMLSignatureLocationType }
      * 
      */
-    public InputDataType createInputDataType() {
-        return new InputDataType();
+    public XMLSignatureLocationType createXMLSignatureLocationType() {
+        return new XMLSignatureLocationType();
     }
 
     /**
-     * Create an instance of {@link CheckResultType }
+     * Create an instance of {@link CMSDataObjectRequiredMetaType }
      * 
      */
-    public CheckResultType createCheckResultType() {
-        return new CheckResultType();
+    public CMSDataObjectRequiredMetaType createCMSDataObjectRequiredMetaType() {
+        return new CMSDataObjectRequiredMetaType();
     }
 
     /**
-     * Create an instance of {@link ContentBaseType }
+     * Create an instance of {@link FormResultType }
      * 
      */
-    public ContentBaseType createContentBaseType() {
-        return new ContentBaseType();
+    public FormResultType createFormResultType() {
+        return new FormResultType();
     }
 
     /**
-     * Create an instance of {@link PDFSignatureResultType }
+     * Create an instance of {@link FinalDataMetaInfoType }
      * 
      */
-    public PDFSignatureResultType createPDFSignatureResultType() {
-        return new PDFSignatureResultType();
+    public FinalDataMetaInfoType createFinalDataMetaInfoType() {
+        return new FinalDataMetaInfoType();
     }
 
     /**
-     * Create an instance of {@link FinalDataMetaInfoType }
+     * Create an instance of {@link MetaInfoType }
      * 
      */
-    public FinalDataMetaInfoType createFinalDataMetaInfoType() {
-        return new FinalDataMetaInfoType();
+    public MetaInfoType createMetaInfoType() {
+        return new MetaInfoType();
     }
 
     /**
@@ -474,51 +465,51 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link ReferencesCheckResultInfoType }
+     * Create an instance of {@link InputDataType }
      * 
      */
-    public ReferencesCheckResultInfoType createReferencesCheckResultInfoType() {
-        return new ReferencesCheckResultInfoType();
+    public InputDataType createInputDataType() {
+        return new InputDataType();
     }
 
     /**
-     * Create an instance of {@link CMSDataObjectRequiredMetaType }
+     * Create an instance of {@link ContentExLocRefBaseType }
      * 
      */
-    public CMSDataObjectRequiredMetaType createCMSDataObjectRequiredMetaType() {
-        return new CMSDataObjectRequiredMetaType();
+    public ContentExLocRefBaseType createContentExLocRefBaseType() {
+        return new ContentExLocRefBaseType();
     }
 
     /**
-     * Create an instance of {@link MetaInfoType }
+     * Create an instance of {@link AnyChildrenType }
      * 
      */
-    public MetaInfoType createMetaInfoType() {
-        return new MetaInfoType();
+    public AnyChildrenType createAnyChildrenType() {
+        return new AnyChildrenType();
     }
 
     /**
-     * Create an instance of {@link ContentExLocRefBaseType }
+     * Create an instance of {@link ContentOptionalRefType }
      * 
      */
-    public ContentExLocRefBaseType createContentExLocRefBaseType() {
-        return new ContentExLocRefBaseType();
+    public ContentOptionalRefType createContentOptionalRefType() {
+        return new ContentOptionalRefType();
     }
 
     /**
-     * Create an instance of {@link AnyChildrenType }
+     * Create an instance of {@link CMSContentBaseType }
      * 
      */
-    public AnyChildrenType createAnyChildrenType() {
-        return new AnyChildrenType();
+    public CMSContentBaseType createCMSContentBaseType() {
+        return new CMSContentBaseType();
     }
 
     /**
-     * Create an instance of {@link ManifestRefsCheckResultInfoType }
+     * Create an instance of {@link ReferencesCheckResultInfoType }
      * 
      */
-    public ManifestRefsCheckResultInfoType createManifestRefsCheckResultInfoType() {
-        return new ManifestRefsCheckResultInfoType();
+    public ReferencesCheckResultInfoType createReferencesCheckResultInfoType() {
+        return new ReferencesCheckResultInfoType();
     }
 
     /**
@@ -530,14 +521,6 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link VerifyTransformsDataType }
-     * 
-     */
-    public VerifyTransformsDataType createVerifyTransformsDataType() {
-        return new VerifyTransformsDataType();
-    }
-
-    /**
      * Create an instance of {@link ContentRequiredRefType }
      * 
      */
@@ -546,11 +529,11 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link ContentOptionalRefType }
+     * Create an instance of {@link ManifestRefsCheckResultType }
      * 
      */
-    public ContentOptionalRefType createContentOptionalRefType() {
-        return new ContentOptionalRefType();
+    public ManifestRefsCheckResultType createManifestRefsCheckResultType() {
+        return new ManifestRefsCheckResultType();
     }
 
     /**
@@ -562,107 +545,99 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link KeyInfoType }
-     * 
-     */
-    public KeyInfoType createKeyInfoType() {
-        return new KeyInfoType();
-    }
-
-    /**
-     * Create an instance of {@link SignedInfoType }
+     * Create an instance of {@link PGPDataType }
      * 
      */
-    public SignedInfoType createSignedInfoType() {
-        return new SignedInfoType();
+    public PGPDataType createPGPDataType() {
+        return new PGPDataType();
     }
 
     /**
-     * Create an instance of {@link RetrievalMethodType }
+     * Create an instance of {@link KeyValueType }
      * 
      */
-    public RetrievalMethodType createRetrievalMethodType() {
-        return new RetrievalMethodType();
+    public KeyValueType createKeyValueType() {
+        return new KeyValueType();
     }
 
     /**
-     * Create an instance of {@link DigestMethodType }
+     * Create an instance of {@link DSAKeyValueType }
      * 
      */
-    public DigestMethodType createDigestMethodType() {
-        return new DigestMethodType();
+    public DSAKeyValueType createDSAKeyValueType() {
+        return new DSAKeyValueType();
     }
 
     /**
-     * Create an instance of {@link SignatureMethodType }
+     * Create an instance of {@link ReferenceType }
      * 
      */
-    public SignatureMethodType createSignatureMethodType() {
-        return new SignatureMethodType();
+    public ReferenceType createReferenceType() {
+        return new ReferenceType();
     }
 
     /**
-     * Create an instance of {@link SPKIDataType }
+     * Create an instance of {@link RetrievalMethodType }
      * 
      */
-    public SPKIDataType createSPKIDataType() {
-        return new SPKIDataType();
+    public RetrievalMethodType createRetrievalMethodType() {
+        return new RetrievalMethodType();
     }
 
     /**
-     * Create an instance of {@link X509DataType }
+     * Create an instance of {@link TransformsType }
      * 
      */
-    public X509DataType createX509DataType() {
-        return new X509DataType();
+    public TransformsType createTransformsType() {
+        return new TransformsType();
     }
 
     /**
-     * Create an instance of {@link PGPDataType }
+     * Create an instance of {@link CanonicalizationMethodType }
      * 
      */
-    public PGPDataType createPGPDataType() {
-        return new PGPDataType();
+    public CanonicalizationMethodType createCanonicalizationMethodType() {
+        return new CanonicalizationMethodType();
     }
 
     /**
-     * Create an instance of {@link SignatureType }
+     * Create an instance of {@link DigestMethodType }
      * 
      */
-    public SignatureType createSignatureType() {
-        return new SignatureType();
+    public DigestMethodType createDigestMethodType() {
+        return new DigestMethodType();
     }
 
     /**
-     * Create an instance of {@link DSAKeyValueType }
+     * Create an instance of {@link ManifestType }
      * 
      */
-    public DSAKeyValueType createDSAKeyValueType() {
-        return new DSAKeyValueType();
+    public ManifestType createManifestType() {
+        return new ManifestType();
     }
 
     /**
-     * Create an instance of {@link ManifestType }
+     * Create an instance of {@link SignaturePropertyType }
      * 
      */
-    public ManifestType createManifestType() {
-        return new ManifestType();
+    public SignaturePropertyType createSignaturePropertyType() {
+        return new SignaturePropertyType();
     }
 
     /**
-     * Create an instance of {@link SignatureValueType }
+     * Create an instance of {@link X509DataType }
      * 
      */
-    public SignatureValueType createSignatureValueType() {
-        return new SignatureValueType();
+    public X509DataType createX509DataType() {
+        return new X509DataType();
     }
 
     /**
-     * Create an instance of {@link TransformsType }
+     * Create an instance of {@link SignedInfoType }
      * 
      */
-    public TransformsType createTransformsType() {
-        return new TransformsType();
+    public SignedInfoType createSignedInfoType() {
+        return new SignedInfoType();
     }
 
     /**
@@ -674,51 +649,51 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link TransformType }
+     * Create an instance of {@link SPKIDataType }
      * 
      */
-    public TransformType createTransformType() {
-        return new TransformType();
+    public SPKIDataType createSPKIDataType() {
+        return new SPKIDataType();
     }
 
     /**
-     * Create an instance of {@link SignaturePropertyType }
+     * Create an instance of {@link SignatureValueType }
      * 
      */
-    public SignaturePropertyType createSignaturePropertyType() {
-        return new SignaturePropertyType();
+    public SignatureValueType createSignatureValueType() {
+        return new SignatureValueType();
     }
 
     /**
-     * Create an instance of {@link KeyValueType }
+     * Create an instance of {@link KeyInfoType }
      * 
      */
-    public KeyValueType createKeyValueType() {
-        return new KeyValueType();
+    public KeyInfoType createKeyInfoType() {
+        return new KeyInfoType();
     }
 
     /**
-     * Create an instance of {@link ReferenceType }
+     * Create an instance of {@link SignatureType }
      * 
      */
-    public ReferenceType createReferenceType() {
-        return new ReferenceType();
+    public SignatureType createSignatureType() {
+        return new SignatureType();
     }
 
     /**
-     * Create an instance of {@link CanonicalizationMethodType }
+     * Create an instance of {@link SignaturePropertiesType }
      * 
      */
-    public CanonicalizationMethodType createCanonicalizationMethodType() {
-        return new CanonicalizationMethodType();
+    public SignaturePropertiesType createSignaturePropertiesType() {
+        return new SignaturePropertiesType();
     }
 
     /**
-     * Create an instance of {@link SignaturePropertiesType }
+     * Create an instance of {@link SignatureMethodType }
      * 
      */
-    public SignaturePropertiesType createSignaturePropertiesType() {
-        return new SignaturePropertiesType();
+    public SignatureMethodType createSignatureMethodType() {
+        return new SignatureMethodType();
     }
 
     /**
@@ -730,6 +705,14 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link TransformType }
+     * 
+     */
+    public TransformType createTransformType() {
+        return new TransformType();
+    }
+
+    /**
      * Create an instance of {@link X509IssuerSerialType }
      * 
      */
@@ -754,14 +737,6 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link TransformParameterType.Hash }
-     * 
-     */
-    public TransformParameterType.Hash createTransformParameterTypeHash() {
-        return new TransformParameterType.Hash();
-    }
-
-    /**
      * Create an instance of {@link CreateXMLSignatureRequestType.SingleSignatureInfo.DataObjectInfo }
      * 
      */
@@ -778,75 +753,74 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * Create an instance of {@link TransformParameterType.Hash }
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class)
-    public JAXBElement<String> createTransformTypeXPath(String value) {
-        return new JAXBElement<String>(_TransformTypeXPath_QNAME, String.class, TransformType.class, value);
+    public TransformParameterType.Hash createTransformParameterTypeHash() {
+        return new TransformParameterType.Hash();
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link XMLDataObjectAssociationType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Signature")
-    public JAXBElement<SignatureType> createSignature(SignatureType value) {
-        return new JAXBElement<SignatureType>(_Signature_QNAME, SignatureType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "SupplementProfile")
+    public JAXBElement<XMLDataObjectAssociationType> createSupplementProfile(XMLDataObjectAssociationType value) {
+        return new JAXBElement<XMLDataObjectAssociationType>(_SupplementProfile_QNAME, XMLDataObjectAssociationType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPData")
-    public JAXBElement<PGPDataType> createPGPData(PGPDataType value) {
-        return new JAXBElement<PGPDataType>(_PGPData_QNAME, PGPDataType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKIData")
+    public JAXBElement<SPKIDataType> createSPKIData(SPKIDataType value) {
+        return new JAXBElement<SPKIDataType>(_SPKIData_QNAME, SPKIDataType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link CreateXMLSignatureResponseType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DSAKeyValue")
-    public JAXBElement<DSAKeyValueType> createDSAKeyValue(DSAKeyValueType value) {
-        return new JAXBElement<DSAKeyValueType>(_DSAKeyValue_QNAME, DSAKeyValueType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "CreateXMLSignatureResponse")
+    public JAXBElement<CreateXMLSignatureResponseType> createCreateXMLSignatureResponse(CreateXMLSignatureResponseType value) {
+        return new JAXBElement<CreateXMLSignatureResponseType>(_CreateXMLSignatureResponse_QNAME, CreateXMLSignatureResponseType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKIData")
-    public JAXBElement<SPKIDataType> createSPKIData(SPKIDataType value) {
-        return new JAXBElement<SPKIDataType>(_SPKIData_QNAME, SPKIDataType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyInfo")
+    public JAXBElement<KeyInfoType> createKeyInfo(KeyInfoType value) {
+        return new JAXBElement<KeyInfoType>(_KeyInfo_QNAME, KeyInfoType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ErrorResponseType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SignatureValueType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "ErrorResponse")
-    public JAXBElement<ErrorResponseType> createErrorResponse(ErrorResponseType value) {
-        return new JAXBElement<ErrorResponseType>(_ErrorResponse_QNAME, ErrorResponseType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureValue")
+    public JAXBElement<SignatureValueType> createSignatureValue(SignatureValueType value) {
+        return new JAXBElement<SignatureValueType>(_SignatureValue_QNAME, SignatureValueType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignedInfoType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ErrorResponseType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignedInfo")
-    public JAXBElement<SignedInfoType> createSignedInfo(SignedInfoType value) {
-        return new JAXBElement<SignedInfoType>(_SignedInfo_QNAME, SignedInfoType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "ErrorResponse")
+    public JAXBElement<ErrorResponseType> createErrorResponse(ErrorResponseType value) {
+        return new JAXBElement<ErrorResponseType>(_ErrorResponse_QNAME, ErrorResponseType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RetrievalMethod")
-    public JAXBElement<RetrievalMethodType> createRetrievalMethod(RetrievalMethodType value) {
-        return new JAXBElement<RetrievalMethodType>(_RetrievalMethod_QNAME, RetrievalMethodType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyValue")
+    public JAXBElement<KeyValueType> createKeyValue(KeyValueType value) {
+        return new JAXBElement<KeyValueType>(_KeyValue_QNAME, KeyValueType.class, null, value);
     }
 
     /**
@@ -859,48 +833,48 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalizationMethodType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link TransformsType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "CanonicalizationMethod")
-    public JAXBElement<CanonicalizationMethodType> createCanonicalizationMethod(CanonicalizationMethodType value) {
-        return new JAXBElement<CanonicalizationMethodType>(_CanonicalizationMethod_QNAME, CanonicalizationMethodType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transforms")
+    public JAXBElement<TransformsType> createTransforms(TransformsType value) {
+        return new JAXBElement<TransformsType>(_Transforms_QNAME, TransformsType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ObjectType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link DigestMethodType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Object")
-    public JAXBElement<ObjectType> createObject(ObjectType value) {
-        return new JAXBElement<ObjectType>(_Object_QNAME, ObjectType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestMethod")
+    public JAXBElement<DigestMethodType> createDigestMethod(DigestMethodType value) {
+        return new JAXBElement<DigestMethodType>(_DigestMethod_QNAME, DigestMethodType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link VerifyPDFSignatureResponseType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link XMLDataObjectAssociationType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "VerifyPDFSignatureResponse")
-    public JAXBElement<VerifyPDFSignatureResponseType> createVerifyPDFSignatureResponse(VerifyPDFSignatureResponseType value) {
-        return new JAXBElement<VerifyPDFSignatureResponseType>(_VerifyPDFSignatureResponse_QNAME, VerifyPDFSignatureResponseType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "Supplement")
+    public JAXBElement<XMLDataObjectAssociationType> createSupplement(XMLDataObjectAssociationType value) {
+        return new JAXBElement<XMLDataObjectAssociationType>(_Supplement_QNAME, XMLDataObjectAssociationType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link MoaTransformsType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "FailedReference")
-    public JAXBElement<BigInteger> createFailedReference(BigInteger value) {
-        return new JAXBElement<BigInteger>(_FailedReference_QNAME, BigInteger.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "MoaTransforms")
+    public JAXBElement<MoaTransformsType> createMoaTransforms(MoaTransformsType value) {
+        return new JAXBElement<MoaTransformsType>(_MoaTransforms_QNAME, MoaTransformsType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link XMLDataObjectAssociationType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "Supplement")
-    public JAXBElement<XMLDataObjectAssociationType> createSupplement(XMLDataObjectAssociationType value) {
-        return new JAXBElement<XMLDataObjectAssociationType>(_Supplement_QNAME, XMLDataObjectAssociationType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Data")
+    public JAXBElement<X509DataType> createX509Data(X509DataType value) {
+        return new JAXBElement<X509DataType>(_X509Data_QNAME, X509DataType.class, null, value);
     }
 
     /**
@@ -913,175 +887,174 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TransformsType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link CreateCMSSignatureResponseType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transforms")
-    public JAXBElement<TransformsType> createTransforms(TransformsType value) {
-        return new JAXBElement<TransformsType>(_Transforms_QNAME, TransformsType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "CreateCMSSignatureResponse")
+    public JAXBElement<CreateCMSSignatureResponseType> createCreateCMSSignatureResponse(CreateCMSSignatureResponseType value) {
+        return new JAXBElement<CreateCMSSignatureResponseType>(_CreateCMSSignatureResponse_QNAME, CreateCMSSignatureResponseType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignatureValueType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureValue")
-    public JAXBElement<SignatureValueType> createSignatureValue(SignatureValueType value) {
-        return new JAXBElement<SignatureValueType>(_SignatureValue_QNAME, SignatureValueType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "FailedReference")
+    public JAXBElement<BigInteger> createFailedReference(BigInteger value) {
+        return new JAXBElement<BigInteger>(_FailedReference_QNAME, BigInteger.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ManifestType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Manifest")
-    public JAXBElement<ManifestType> createManifest(ManifestType value) {
-        return new JAXBElement<ManifestType>(_Manifest_QNAME, ManifestType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyName")
+    public JAXBElement<String> createKeyName(String value) {
+        return new JAXBElement<String>(_KeyName_QNAME, String.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TransformType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transform")
-    public JAXBElement<TransformType> createTransform(TransformType value) {
-        return new JAXBElement<TransformType>(_Transform_QNAME, TransformType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RSAKeyValue")
+    public JAXBElement<RSAKeyValueType> createRSAKeyValue(RSAKeyValueType value) {
+        return new JAXBElement<RSAKeyValueType>(_RSAKeyValue_QNAME, RSAKeyValueType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Data")
-    public JAXBElement<X509DataType> createX509Data(X509DataType value) {
-        return new JAXBElement<X509DataType>(_X509Data_QNAME, X509DataType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Signature")
+    public JAXBElement<SignatureType> createSignature(SignatureType value) {
+        return new JAXBElement<SignatureType>(_Signature_QNAME, SignatureType.class, null, value);
     }
 
     /**
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "IssuingCountry")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    public JAXBElement<String> createIssuingCountry(String value) {
-        return new JAXBElement<String>(_IssuingCountry_QNAME, String.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "MgmtData")
+    public JAXBElement<String> createMgmtData(String value) {
+        return new JAXBElement<String>(_MgmtData_QNAME, String.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CreateXMLSignatureResponseType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SignatureMethodType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "CreateXMLSignatureResponse")
-    public JAXBElement<CreateXMLSignatureResponseType> createCreateXMLSignatureResponse(CreateXMLSignatureResponseType value) {
-        return new JAXBElement<CreateXMLSignatureResponseType>(_CreateXMLSignatureResponse_QNAME, CreateXMLSignatureResponseType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureMethod")
+    public JAXBElement<SignatureMethodType> createSignatureMethod(SignatureMethodType value) {
+        return new JAXBElement<SignatureMethodType>(_SignatureMethod_QNAME, SignatureMethodType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignatureMethodType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ObjectType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureMethod")
-    public JAXBElement<SignatureMethodType> createSignatureMethod(SignatureMethodType value) {
-        return new JAXBElement<SignatureMethodType>(_SignatureMethod_QNAME, SignatureMethodType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Object")
+    public JAXBElement<ObjectType> createObject(ObjectType value) {
+        return new JAXBElement<ObjectType>(_Object_QNAME, ObjectType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link VerifyCMSSignatureResponseType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyInfo")
-    public JAXBElement<KeyInfoType> createKeyInfo(KeyInfoType value) {
-        return new JAXBElement<KeyInfoType>(_KeyInfo_QNAME, KeyInfoType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "VerifyCMSSignatureResponse")
+    public JAXBElement<VerifyCMSSignatureResponseType> createVerifyCMSSignatureResponse(VerifyCMSSignatureResponseType value) {
+        return new JAXBElement<VerifyCMSSignatureResponseType>(_VerifyCMSSignatureResponse_QNAME, VerifyCMSSignatureResponseType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link XMLDataObjectAssociationType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertiesType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "SupplementProfile")
-    public JAXBElement<XMLDataObjectAssociationType> createSupplementProfile(XMLDataObjectAssociationType value) {
-        return new JAXBElement<XMLDataObjectAssociationType>(_SupplementProfile_QNAME, XMLDataObjectAssociationType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperties")
+    public JAXBElement<SignaturePropertiesType> createSignatureProperties(SignaturePropertiesType value) {
+        return new JAXBElement<SignaturePropertiesType>(_SignatureProperties_QNAME, SignaturePropertiesType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CreateCMSSignatureResponseType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "CreateCMSSignatureResponse")
-    public JAXBElement<CreateCMSSignatureResponseType> createCreateCMSSignatureResponse(CreateCMSSignatureResponseType value) {
-        return new JAXBElement<CreateCMSSignatureResponseType>(_CreateCMSSignatureResponse_QNAME, CreateCMSSignatureResponseType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "ReferringSigReference")
+    public JAXBElement<BigInteger> createReferringSigReference(BigInteger value) {
+        return new JAXBElement<BigInteger>(_ReferringSigReference_QNAME, BigInteger.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link VerifyCMSSignatureResponseType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link TransformType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "VerifyCMSSignatureResponse")
-    public JAXBElement<VerifyCMSSignatureResponseType> createVerifyCMSSignatureResponse(VerifyCMSSignatureResponseType value) {
-        return new JAXBElement<VerifyCMSSignatureResponseType>(_VerifyCMSSignatureResponse_QNAME, VerifyCMSSignatureResponseType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transform")
+    public JAXBElement<TransformType> createTransform(TransformType value) {
+        return new JAXBElement<TransformType>(_Transform_QNAME, TransformType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DigestMethodType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link VerifyPDFSignatureResponseType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestMethod")
-    public JAXBElement<DigestMethodType> createDigestMethod(DigestMethodType value) {
-        return new JAXBElement<DigestMethodType>(_DigestMethod_QNAME, DigestMethodType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "VerifyPDFSignatureResponse")
+    public JAXBElement<VerifyPDFSignatureResponseType> createVerifyPDFSignatureResponse(VerifyPDFSignatureResponseType value) {
+        return new JAXBElement<VerifyPDFSignatureResponseType>(_VerifyPDFSignatureResponse_QNAME, VerifyPDFSignatureResponseType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link MoaTransformType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestValue")
-    public JAXBElement<byte[]> createDigestValue(byte[] value) {
-        return new JAXBElement<byte[]>(_DigestValue_QNAME, byte[].class, null, ((byte[]) value));
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "MoaTransform")
+    public JAXBElement<MoaTransformType> createMoaTransform(MoaTransformType value) {
+        return new JAXBElement<MoaTransformType>(_MoaTransform_QNAME, MoaTransformType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "MgmtData")
-    public JAXBElement<String> createMgmtData(String value) {
-        return new JAXBElement<String>(_MgmtData_QNAME, String.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPData")
+    public JAXBElement<PGPDataType> createPGPData(PGPDataType value) {
+        return new JAXBElement<PGPDataType>(_PGPData_QNAME, PGPDataType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertiesType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperties")
-    public JAXBElement<SignaturePropertiesType> createSignatureProperties(SignaturePropertiesType value) {
-        return new JAXBElement<SignaturePropertiesType>(_SignatureProperties_QNAME, SignaturePropertiesType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Reference")
+    public JAXBElement<ReferenceType> createReference(ReferenceType value) {
+        return new JAXBElement<ReferenceType>(_Reference_QNAME, ReferenceType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyName")
-    public JAXBElement<String> createKeyName(String value) {
-        return new JAXBElement<String>(_KeyName_QNAME, String.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RetrievalMethod")
+    public JAXBElement<RetrievalMethodType> createRetrievalMethod(RetrievalMethodType value) {
+        return new JAXBElement<RetrievalMethodType>(_RetrievalMethod_QNAME, RetrievalMethodType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyValue")
-    public JAXBElement<KeyValueType> createKeyValue(KeyValueType value) {
-        return new JAXBElement<KeyValueType>(_KeyValue_QNAME, KeyValueType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DSAKeyValue")
+    public JAXBElement<DSAKeyValueType> createDSAKeyValue(DSAKeyValueType value) {
+        return new JAXBElement<DSAKeyValueType>(_DSAKeyValue_QNAME, DSAKeyValueType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Reference")
-    public JAXBElement<ReferenceType> createReference(ReferenceType value) {
-        return new JAXBElement<ReferenceType>(_Reference_QNAME, ReferenceType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestValue")
+    public JAXBElement<byte[]> createDigestValue(byte[] value) {
+        return new JAXBElement<byte[]>(_DigestValue_QNAME, byte[].class, null, ((byte[]) value));
     }
 
     /**
@@ -1094,102 +1067,94 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CreatePDFSignatureResponseType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalizationMethodType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "CreatePDFSignatureResponse")
-    public JAXBElement<CreatePDFSignatureResponseType> createCreatePDFSignatureResponse(CreatePDFSignatureResponseType value) {
-        return new JAXBElement<CreatePDFSignatureResponseType>(_CreatePDFSignatureResponse_QNAME, CreatePDFSignatureResponseType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "CanonicalizationMethod")
+    public JAXBElement<CanonicalizationMethodType> createCanonicalizationMethod(CanonicalizationMethodType value) {
+        return new JAXBElement<CanonicalizationMethodType>(_CanonicalizationMethod_QNAME, CanonicalizationMethodType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MoaTransformType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SignedInfoType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "MoaTransform")
-    public JAXBElement<MoaTransformType> createMoaTransform(MoaTransformType value) {
-        return new JAXBElement<MoaTransformType>(_MoaTransform_QNAME, MoaTransformType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignedInfo")
+    public JAXBElement<SignedInfoType> createSignedInfo(SignedInfoType value) {
+        return new JAXBElement<SignedInfoType>(_SignedInfo_QNAME, SignedInfoType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "ReferringSigReference")
-    public JAXBElement<BigInteger> createReferringSigReference(BigInteger value) {
-        return new JAXBElement<BigInteger>(_ReferringSigReference_QNAME, BigInteger.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "IssuingCountry")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    public JAXBElement<String> createIssuingCountry(String value) {
+        return new JAXBElement<String>(_IssuingCountry_QNAME, String.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ManifestType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RSAKeyValue")
-    public JAXBElement<RSAKeyValueType> createRSAKeyValue(RSAKeyValueType value) {
-        return new JAXBElement<RSAKeyValueType>(_RSAKeyValue_QNAME, RSAKeyValueType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Manifest")
+    public JAXBElement<ManifestType> createManifest(ManifestType value) {
+        return new JAXBElement<ManifestType>(_Manifest_QNAME, ManifestType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MoaTransformsType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "MoaTransforms")
-    public JAXBElement<MoaTransformsType> createMoaTransforms(MoaTransformsType value) {
-        return new JAXBElement<MoaTransformsType>(_MoaTransforms_QNAME, MoaTransformsType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "XPath", scope = MoaTransformType.class)
+    public JAXBElement<String> createMoaTransformTypeXPath(String value) {
+        return new JAXBElement<String>(_MoaTransformTypeXPath_QNAME, String.class, MoaTransformType.class, value);
     }
 
     /**
      * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class)
-    public JAXBElement<byte[]> createSPKIDataTypeSPKISexp(byte[] value) {
-        return new JAXBElement<byte[]>(_SPKIDataTypeSPKISexp_QNAME, byte[].class, SPKIDataType.class, ((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "HMACOutputLength", scope = SignatureMethodType.class)
-    public JAXBElement<BigInteger> createSignatureMethodTypeHMACOutputLength(BigInteger value) {
-        return new JAXBElement<BigInteger>(_SignatureMethodTypeHMACOutputLength_QNAME, BigInteger.class, SignatureMethodType.class, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "transformData", scope = MoaTransformType.class)
+    public JAXBElement<byte[]> createMoaTransformTypeTransformData(byte[] value) {
+        return new JAXBElement<byte[]>(_MoaTransformTypeTransformData_QNAME, byte[].class, MoaTransformType.class, ((byte[]) value));
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CheckResultType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "SignatureCheck", scope = VerifyCMSSignatureResponseType.class)
-    public JAXBElement<CheckResultType> createVerifyCMSSignatureResponseTypeSignatureCheck(CheckResultType value) {
-        return new JAXBElement<CheckResultType>(_VerifyCMSSignatureResponseTypeSignatureCheck_QNAME, CheckResultType.class, VerifyCMSSignatureResponseType.class, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class)
+    public JAXBElement<String> createTransformTypeXPath(String value) {
+        return new JAXBElement<String>(_TransformTypeXPath_QNAME, String.class, TransformType.class, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CheckResultType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "CertificateCheck", scope = VerifyCMSSignatureResponseType.class)
-    public JAXBElement<CheckResultType> createVerifyCMSSignatureResponseTypeCertificateCheck(CheckResultType value) {
-        return new JAXBElement<CheckResultType>(_VerifyCMSSignatureResponseTypeCertificateCheck_QNAME, CheckResultType.class, VerifyCMSSignatureResponseType.class, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class)
+    public JAXBElement<byte[]> createPGPDataTypePGPKeyID(byte[] value) {
+        return new JAXBElement<byte[]>(_PGPDataTypePGPKeyID_QNAME, byte[].class, PGPDataType.class, ((byte[]) value));
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "SignerInfo", scope = VerifyCMSSignatureResponseType.class)
-    public JAXBElement<KeyInfoType> createVerifyCMSSignatureResponseTypeSignerInfo(KeyInfoType value) {
-        return new JAXBElement<KeyInfoType>(_VerifyCMSSignatureResponseTypeSignerInfo_QNAME, KeyInfoType.class, VerifyCMSSignatureResponseType.class, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class)
+    public JAXBElement<byte[]> createPGPDataTypePGPKeyPacket(byte[] value) {
+        return new JAXBElement<byte[]>(_PGPDataTypePGPKeyPacket_QNAME, byte[].class, PGPDataType.class, ((byte[]) value));
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link FormResultType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "FormCheckResult", scope = VerifyCMSSignatureResponseType.class)
-    public JAXBElement<FormResultType> createVerifyCMSSignatureResponseTypeFormCheckResult(FormResultType value) {
-        return new JAXBElement<FormResultType>(_VerifyCMSSignatureResponseTypeFormCheckResult_QNAME, FormResultType.class, VerifyCMSSignatureResponseType.class, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class)
+    public JAXBElement<byte[]> createSPKIDataTypeSPKISexp(byte[] value) {
+        return new JAXBElement<byte[]>(_SPKIDataTypeSPKISexp_QNAME, byte[].class, SPKIDataType.class, ((byte[]) value));
     }
 
     /**
@@ -1205,9 +1170,18 @@ public class ObjectFactory {
      * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Certificate", scope = X509DataType.class)
-    public JAXBElement<byte[]> createX509DataTypeX509Certificate(byte[] value) {
-        return new JAXBElement<byte[]>(_X509DataTypeX509Certificate_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509CRL", scope = X509DataType.class)
+    public JAXBElement<byte[]> createX509DataTypeX509CRL(byte[] value) {
+        return new JAXBElement<byte[]>(_X509DataTypeX509CRL_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SubjectName", scope = X509DataType.class)
+    public JAXBElement<String> createX509DataTypeX509SubjectName(String value) {
+        return new JAXBElement<String>(_X509DataTypeX509SubjectName_QNAME, String.class, X509DataType.class, value);
     }
 
     /**
@@ -1220,57 +1194,57 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SubjectName", scope = X509DataType.class)
-    public JAXBElement<String> createX509DataTypeX509SubjectName(String value) {
-        return new JAXBElement<String>(_X509DataTypeX509SubjectName_QNAME, String.class, X509DataType.class, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Certificate", scope = X509DataType.class)
+    public JAXBElement<byte[]> createX509DataTypeX509Certificate(byte[] value) {
+        return new JAXBElement<byte[]>(_X509DataTypeX509Certificate_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509CRL", scope = X509DataType.class)
-    public JAXBElement<byte[]> createX509DataTypeX509CRL(byte[] value) {
-        return new JAXBElement<byte[]>(_X509DataTypeX509CRL_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "HMACOutputLength", scope = SignatureMethodType.class)
+    public JAXBElement<BigInteger> createSignatureMethodTypeHMACOutputLength(BigInteger value) {
+        return new JAXBElement<BigInteger>(_SignatureMethodTypeHMACOutputLength_QNAME, BigInteger.class, SignatureMethodType.class, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link CheckResultType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class)
-    public JAXBElement<byte[]> createPGPDataTypePGPKeyID(byte[] value) {
-        return new JAXBElement<byte[]>(_PGPDataTypePGPKeyID_QNAME, byte[].class, PGPDataType.class, ((byte[]) value));
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "CertificateCheck", scope = VerifyCMSSignatureResponseType.class)
+    public JAXBElement<CheckResultType> createVerifyCMSSignatureResponseTypeCertificateCheck(CheckResultType value) {
+        return new JAXBElement<CheckResultType>(_VerifyCMSSignatureResponseTypeCertificateCheck_QNAME, CheckResultType.class, VerifyCMSSignatureResponseType.class, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class)
-    public JAXBElement<byte[]> createPGPDataTypePGPKeyPacket(byte[] value) {
-        return new JAXBElement<byte[]>(_PGPDataTypePGPKeyPacket_QNAME, byte[].class, PGPDataType.class, ((byte[]) value));
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "SignerInfo", scope = VerifyCMSSignatureResponseType.class)
+    public JAXBElement<KeyInfoType> createVerifyCMSSignatureResponseTypeSignerInfo(KeyInfoType value) {
+        return new JAXBElement<KeyInfoType>(_VerifyCMSSignatureResponseTypeSignerInfo_QNAME, KeyInfoType.class, VerifyCMSSignatureResponseType.class, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link CheckResultType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "transformData", scope = MoaTransformType.class)
-    public JAXBElement<byte[]> createMoaTransformTypeTransformData(byte[] value) {
-        return new JAXBElement<byte[]>(_MoaTransformTypeTransformData_QNAME, byte[].class, MoaTransformType.class, ((byte[]) value));
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "SignatureCheck", scope = VerifyCMSSignatureResponseType.class)
+    public JAXBElement<CheckResultType> createVerifyCMSSignatureResponseTypeSignatureCheck(CheckResultType value) {
+        return new JAXBElement<CheckResultType>(_VerifyCMSSignatureResponseTypeSignatureCheck_QNAME, CheckResultType.class, VerifyCMSSignatureResponseType.class, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link FormResultType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "XPath", scope = MoaTransformType.class)
-    public JAXBElement<String> createMoaTransformTypeXPath(String value) {
-        return new JAXBElement<String>(_MoaTransformTypeXPath_QNAME, String.class, MoaTransformType.class, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "FormCheckResult", scope = VerifyCMSSignatureResponseType.class)
+    public JAXBElement<FormResultType> createVerifyCMSSignatureResponseTypeFormCheckResult(FormResultType value) {
+        return new JAXBElement<FormResultType>(_VerifyCMSSignatureResponseTypeFormCheckResult_QNAME, FormResultType.class, VerifyCMSSignatureResponseType.class, value);
     }
 
 }
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectType.java
index 0fc0943..4494f4d 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
@@ -83,9 +83,9 @@ public class ObjectType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
+     * {@link Element }
      * {@link Object }
      * {@link String }
-     * {@link Element }
      * 
      * 
      */
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignatureResultType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignatureResultType.java
index e1567bc..63ca953 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignatureResultType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignatureResultType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignedRepsonse.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignedRepsonse.java
index 8b18768..6af2130 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignedRepsonse.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignedRepsonse.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PGPDataType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PGPDataType.java
index fdade7f..f19eefa 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PGPDataType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PGPDataType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
@@ -88,10 +88,10 @@ public class PGPDataType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
      * {@link Element }
      * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     * {@link Object }
+     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
      * 
      * 
      */
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PublicAuthorityType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PublicAuthorityType.java
index 76049e6..76721ae 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PublicAuthorityType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PublicAuthorityType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/QualifiedCertificate.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/QualifiedCertificate.java
index 9577f98..15404b4 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/QualifiedCertificate.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/QualifiedCertificate.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RSAKeyValueType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RSAKeyValueType.java
index 3a7ba44..9525231 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RSAKeyValueType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RSAKeyValueType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferenceType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferenceType.java
index cf5ff98..611f2c9 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferenceType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferenceType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultInfoType.java
index f6700ce..0260328 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultInfoType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultInfoType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultType.java
index 85c12ea..429cd60 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RetrievalMethodType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RetrievalMethodType.java
index 1ec3d68..a3e6cd3 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RetrievalMethodType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RetrievalMethodType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SPKIDataType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SPKIDataType.java
index 8e8e914..b5e36f3 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SPKIDataType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SPKIDataType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
@@ -67,9 +67,9 @@ public class SPKIDataType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
+     * {@link Element }
      * {@link Object }
      * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link Element }
      * 
      * 
      */
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SecureSignatureCreationDevice.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SecureSignatureCreationDevice.java
index e4f8397..e4b5ca5 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SecureSignatureCreationDevice.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SecureSignatureCreationDevice.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureMethodType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureMethodType.java
index 8a425ed..2829062 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureMethodType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureMethodType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
@@ -75,8 +75,8 @@ public class SignatureMethodType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
      * {@link Object }
+     * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
      * {@link String }
      * 
      * 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertiesType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertiesType.java
index c106440..c4017ef 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertiesType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertiesType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertyType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertyType.java
index 8d58626..6cdb654 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertyType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertyType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
@@ -80,9 +80,9 @@ public class SignaturePropertyType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
+     * {@link Element }
      * {@link Object }
      * {@link String }
-     * {@link Element }
      * 
      * 
      */
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureType.java
index b0da91b..a928b80 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureValueType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureValueType.java
index efb6359..9f8dc29 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureValueType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureValueType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignedInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignedInfoType.java
index b91610b..7ebb177 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignedInfoType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignedInfoType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformParameterType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformParameterType.java
index 3cbc23b..55c2322 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformParameterType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformParameterType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformType.java
index e320b31..9e62836 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
@@ -76,8 +76,8 @@ public class TransformType {
      * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link Element }
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
      * {@link Object }
+     * {@link JAXBElement }{@code <}{@link String }{@code >}
      * {@link String }
      * 
      * 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsInfoType.java
index 102a762..8e8b1df 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsInfoType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsInfoType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsType.java
index 5ad37b8..24c1631 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequest.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequest.java
index fb97464..7b67ffb 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequest.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequest.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequestType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequestType.java
index b970ca6..c9aca2f 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequestType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequestType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
@@ -30,6 +30,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       &lt;sequence>
  *         &lt;element name="DateTime" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
+ *         &lt;element name="ExtendedValidation" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         &lt;element name="CMSSignature" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
  *         &lt;element name="DataObject" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}CMSDataObjectOptionalMetaType" minOccurs="0"/>
  *         &lt;element name="TrustProfileID" type="{http://www.w3.org/2001/XMLSchema}token"/>
@@ -44,6 +45,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "VerifyCMSSignatureRequestType", propOrder = {
     "dateTime",
+    "extendedValidation",
     "cmsSignature",
     "dataObject",
     "trustProfileID"
@@ -56,6 +58,8 @@ public class VerifyCMSSignatureRequestType {
     @XmlElement(name = "DateTime")
     @XmlSchemaType(name = "dateTime")
     protected XMLGregorianCalendar dateTime;
+    @XmlElement(name = "ExtendedValidation", defaultValue = "false")
+    protected Boolean extendedValidation;
     @XmlElement(name = "CMSSignature", required = true)
     protected byte[] cmsSignature;
     @XmlElement(name = "DataObject")
@@ -90,6 +94,30 @@ public class VerifyCMSSignatureRequestType {
     }
 
     /**
+     * Gets the value of the extendedValidation property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public Boolean isExtendedValidation() {
+        return extendedValidation;
+    }
+
+    /**
+     * Sets the value of the extendedValidation property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setExtendedValidation(Boolean value) {
+        this.extendedValidation = value;
+    }
+
+    /**
      * Gets the value of the cmsSignature property.
      * 
      * @return
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureResponseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureResponseType.java
index ece5c9d..e92bd48 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureResponseType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureResponseType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
@@ -47,10 +47,10 @@ import javax.xml.bind.annotation.XmlType;
 public class VerifyCMSSignatureResponseType {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "CertificateCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class),
-        @XmlElementRef(name = "SignatureCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class),
         @XmlElementRef(name = "FormCheckResult", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class),
-        @XmlElementRef(name = "SignerInfo", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class)
+        @XmlElementRef(name = "SignerInfo", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class),
+        @XmlElementRef(name = "CertificateCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class),
+        @XmlElementRef(name = "SignatureCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class)
     })
     protected List<JAXBElement<?>> signerInfoAndSignatureCheckAndCertificateCheck;
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequest.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequest.java
index 045e36f..1a3d824 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequest.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequest.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequestType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequestType.java
index 6487059..3414e94 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequestType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequestType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
@@ -30,6 +30,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       &lt;sequence>
  *         &lt;element name="DateTime" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
+ *         &lt;element name="ExtendedValidation" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         &lt;element name="PDFSignature" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
  *         &lt;element name="TrustProfileID" type="{http://www.w3.org/2001/XMLSchema}token"/>
  *       &lt;/sequence>
@@ -43,6 +44,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "VerifyPDFSignatureRequestType", propOrder = {
     "dateTime",
+    "extendedValidation",
     "pdfSignature",
     "trustProfileID"
 })
@@ -54,6 +56,8 @@ public class VerifyPDFSignatureRequestType {
     @XmlElement(name = "DateTime")
     @XmlSchemaType(name = "dateTime")
     protected XMLGregorianCalendar dateTime;
+    @XmlElement(name = "ExtendedValidation", defaultValue = "false")
+    protected Boolean extendedValidation;
     @XmlElement(name = "PDFSignature", required = true)
     protected byte[] pdfSignature;
     @XmlElement(name = "TrustProfileID", required = true)
@@ -86,6 +90,30 @@ public class VerifyPDFSignatureRequestType {
     }
 
     /**
+     * Gets the value of the extendedValidation property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public Boolean isExtendedValidation() {
+        return extendedValidation;
+    }
+
+    /**
+     * Sets the value of the extendedValidation property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setExtendedValidation(Boolean value) {
+        this.extendedValidation = value;
+    }
+
+    /**
      * Gets the value of the pdfSignature property.
      * 
      * @return
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureResponseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureResponseType.java
index bf344ce..9d2f7ed 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureResponseType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureResponseType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsDataType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsDataType.java
index 35a5366..743e609 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsDataType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsDataType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsInfoProfile.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsInfoProfile.java
index b015978..827b1d9 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsInfoProfile.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsInfoProfile.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequest.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequest.java
index 3187efd..6041b0f 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequest.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequest.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequestType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequestType.java
index 4e4d28d..8b02f1d 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequestType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequestType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
@@ -34,13 +34,14 @@ import javax.xml.datatype.XMLGregorianCalendar;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       &lt;sequence>
  *         &lt;element name="DateTime" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
+ *         &lt;element name="ExtendedValidation" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         &lt;element name="VerifySignatureInfo">
  *           &lt;complexType>
  *             &lt;complexContent>
  *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *                 &lt;sequence>
  *                   &lt;element name="VerifySignatureEnvironment" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}ContentOptionalRefType"/>
- *                   &lt;element name="VerifySignatureLocation" type="{http://www.w3.org/2001/XMLSchema}token"/>
+ *                   &lt;element name="VerifySignatureLocation" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}XMLSignatureLocationType"/>
  *                 &lt;/sequence>
  *               &lt;/restriction>
  *             &lt;/complexContent>
@@ -75,6 +76,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "VerifyXMLSignatureRequestType", propOrder = {
     "dateTime",
+    "extendedValidation",
     "verifySignatureInfo",
     "supplementProfileOrSupplementProfileID",
     "signatureManifestCheckParams",
@@ -89,6 +91,8 @@ public class VerifyXMLSignatureRequestType {
     @XmlElement(name = "DateTime")
     @XmlSchemaType(name = "dateTime")
     protected XMLGregorianCalendar dateTime;
+    @XmlElement(name = "ExtendedValidation", defaultValue = "false")
+    protected Boolean extendedValidation;
     @XmlElement(name = "VerifySignatureInfo", required = true)
     protected VerifyXMLSignatureRequestType.VerifySignatureInfo verifySignatureInfo;
     @XmlElements({
@@ -130,6 +134,30 @@ public class VerifyXMLSignatureRequestType {
     }
 
     /**
+     * Gets the value of the extendedValidation property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public Boolean isExtendedValidation() {
+        return extendedValidation;
+    }
+
+    /**
+     * Sets the value of the extendedValidation property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setExtendedValidation(Boolean value) {
+        this.extendedValidation = value;
+    }
+
+    /**
      * Gets the value of the verifySignatureInfo property.
      * 
      * @return
@@ -358,7 +386,7 @@ public class VerifyXMLSignatureRequestType {
      *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
      *       &lt;sequence>
      *         &lt;element name="VerifySignatureEnvironment" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}ContentOptionalRefType"/>
-     *         &lt;element name="VerifySignatureLocation" type="{http://www.w3.org/2001/XMLSchema}token"/>
+     *         &lt;element name="VerifySignatureLocation" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}XMLSignatureLocationType"/>
      *       &lt;/sequence>
      *     &lt;/restriction>
      *   &lt;/complexContent>
@@ -377,9 +405,7 @@ public class VerifyXMLSignatureRequestType {
         @XmlElement(name = "VerifySignatureEnvironment", required = true)
         protected ContentOptionalRefType verifySignatureEnvironment;
         @XmlElement(name = "VerifySignatureLocation", required = true)
-        @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-        @XmlSchemaType(name = "token")
-        protected String verifySignatureLocation;
+        protected XMLSignatureLocationType verifySignatureLocation;
 
         /**
          * Gets the value of the verifySignatureEnvironment property.
@@ -410,10 +436,10 @@ public class VerifyXMLSignatureRequestType {
          * 
          * @return
          *     possible object is
-         *     {@link String }
+         *     {@link XMLSignatureLocationType }
          *     
          */
-        public String getVerifySignatureLocation() {
+        public XMLSignatureLocationType getVerifySignatureLocation() {
             return verifySignatureLocation;
         }
 
@@ -422,10 +448,10 @@ public class VerifyXMLSignatureRequestType {
          * 
          * @param value
          *     allowed object is
-         *     {@link String }
+         *     {@link XMLSignatureLocationType }
          *     
          */
-        public void setVerifySignatureLocation(String value) {
+        public void setVerifySignatureLocation(XMLSignatureLocationType value) {
             this.verifySignatureLocation = value;
         }
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureResponseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureResponseType.java
index 69cac83..b1fb162 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureResponseType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureResponseType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509DataType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509DataType.java
index a7a7b97..fac1ade 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509DataType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509DataType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
@@ -54,9 +54,9 @@ public class X509DataType {
 
     @XmlElementRefs({
         @XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
         @XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
         @XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
         @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
     })
     @XmlAnyElement(lax = true)
@@ -80,12 +80,12 @@ public class X509DataType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
      * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
      * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
+     * {@link Element }
      * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
+     * {@link Object }
      * {@link JAXBElement }{@code <}{@link String }{@code >}
      * 
      * 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509IssuerSerialType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509IssuerSerialType.java
index 4e066e5..6c4941c 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509IssuerSerialType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509IssuerSerialType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLDataObjectAssociationType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLDataObjectAssociationType.java
index b9b0958..81aaf02 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLDataObjectAssociationType.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLDataObjectAssociationType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLSignatureLocation.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLSignatureLocation.java
new file mode 100644
index 0000000..a82bd26
--- /dev/null
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLSignatureLocation.java
@@ -0,0 +1,102 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2015.12.09 at 08:10:59 AM CET 
+//
+
+
+package at.gv.egiz.moasig;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * <p>Java class for XMLSignatureLocation complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="XMLSignatureLocation">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="NamespaceDeclaration" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
+ *         &lt;element name="XPathExpression" type="{http://www.w3.org/2001/XMLSchema}token"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "XMLSignatureLocation", propOrder = {
+    "namespaceDeclaration",
+    "xPathExpression"
+})
+public class XMLSignatureLocation {
+
+    @XmlElement(name = "NamespaceDeclaration", required = true)
+    protected Object namespaceDeclaration;
+    @XmlElement(name = "XPathExpression", required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String xPathExpression;
+
+    /**
+     * Gets the value of the namespaceDeclaration property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getNamespaceDeclaration() {
+        return namespaceDeclaration;
+    }
+
+    /**
+     * Sets the value of the namespaceDeclaration property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setNamespaceDeclaration(Object value) {
+        this.namespaceDeclaration = value;
+    }
+
+    /**
+     * Gets the value of the xPathExpression property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getXPathExpression() {
+        return xPathExpression;
+    }
+
+    /**
+     * Sets the value of the xPathExpression property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setXPathExpression(String value) {
+        this.xPathExpression = value;
+    }
+
+}
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLSignatureLocationType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLSignatureLocationType.java
new file mode 100644
index 0000000..9293c1d
--- /dev/null
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLSignatureLocationType.java
@@ -0,0 +1,109 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
+//
+
+
+package at.gv.egiz.moasig;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * <p>Java class for XMLSignatureLocationType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="XMLSignatureLocationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="NamespaceDeclaration" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}NamespaceDeclarationType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="XPathExpression" type="{http://www.w3.org/2001/XMLSchema}token"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "XMLSignatureLocationType", propOrder = {
+    "namespaceDeclaration",
+    "xPathExpression"
+})
+public class XMLSignatureLocationType {
+
+    @XmlElement(name = "NamespaceDeclaration")
+    protected List<NamespaceDeclarationType> namespaceDeclaration;
+    @XmlElement(name = "XPathExpression", required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String xPathExpression;
+
+    /**
+     * Gets the value of the namespaceDeclaration property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the namespaceDeclaration property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getNamespaceDeclaration().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link NamespaceDeclarationType }
+     * 
+     * 
+     */
+    public List<NamespaceDeclarationType> getNamespaceDeclaration() {
+        if (namespaceDeclaration == null) {
+            namespaceDeclaration = new ArrayList<NamespaceDeclarationType>();
+        }
+        return this.namespaceDeclaration;
+    }
+
+    /**
+     * Gets the value of the xPathExpression property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getXPathExpression() {
+        return xPathExpression;
+    }
+
+    /**
+     * Sets the value of the xPathExpression property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setXPathExpression(String value) {
+        this.xPathExpression = value;
+    }
+
+}
diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/package-info.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/package-info.java
index 0344afc..08d774d 100644
--- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/package-info.java
+++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/package-info.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2015.11.30 at 11:32:30 AM CET 
+// Generated on: 2016.03.14 at 12:02:35 PM CET 
 //
 
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/initializer/PDFASInitializer.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/initializer/PDFASInitializer.java
index aaa41c1..fb84293 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/initializer/PDFASInitializer.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/initializer/PDFASInitializer.java
@@ -13,14 +13,16 @@ public class PDFASInitializer implements ExternalInitializer {
 	
 	@Override
 	public void initialize(ConfigurationProvider configurationProvider) {
-		String pdfAsConfiguration = configurationProvider.getPDFASConfiguration();
+		logger.warn("Log4j Config: {}",  System.getProperty("log4j.configuration"));
+		
+		/*String pdfAsConfiguration = configurationProvider.getPDFASConfiguration();
 		
 		logger.info("Running PDFASInitializer with pdf as cfg: {}", pdfAsConfiguration);
 		
 		if(pdfAsConfiguration != null) {
 			PDFASInvoker
 			.init(pdfAsConfiguration);
-		}
+		}*/
 	}
 
 }
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/invoke/PDFASInvoker.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/invoke/PDFASInvoker.java
index 7f638fa..1f7522b 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/invoke/PDFASInvoker.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/invoke/PDFASInvoker.java
@@ -7,17 +7,6 @@ import java.util.List;
 
 import org.apache.commons.io.IOUtils;
 
-import at.gv.egiz.pdfas.common.exceptions.PDFASError;
-import at.gv.egiz.pdfas.lib.api.ByteArrayDataSource;
-import at.gv.egiz.pdfas.lib.api.Configuration;
-import at.gv.egiz.pdfas.lib.api.PdfAs;
-import at.gv.egiz.pdfas.lib.api.PdfAsFactory;
-import at.gv.egiz.pdfas.lib.api.sign.IPlainSigner;
-import at.gv.egiz.pdfas.lib.api.sign.SignParameter;
-import at.gv.egiz.pdfas.lib.api.verify.VerifyParameter;
-import at.gv.egiz.pdfas.lib.api.verify.VerifyResult;
-import at.gv.egiz.pdfas.sigs.pades.PAdESSigner;
-import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.MOAException;
 import at.gv.egovernment.moa.spss.server.logging.TransactionId;
@@ -29,9 +18,10 @@ import at.gv.egovernment.moa.spss.server.xmlbind.PDFSignatureInfo;
 import at.gv.egovernment.moa.spss.server.xmlbind.SignedPDFInfo;
 import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFRequest;
 import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFResponse;
+import at.gv.egovernment.moaspss.logging.Logger;
 
 public class PDFASInvoker {
-
+	/*
 	private static PDFASInvoker instance = null;
 
 	private PdfAs pdfAS;
@@ -124,5 +114,5 @@ public class PDFASInvoker {
 
 		}
 		return createPDFRespone;
-	}
+	}*/
 }
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/ExtendedVerifyResult.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/ExtendedVerifyResult.java
index 30bf148..705e124 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/ExtendedVerifyResult.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/ExtendedVerifyResult.java
@@ -1,9 +1,9 @@
 package at.gv.egovernment.moa.spss.server.pdfas;
-
+/*
 import at.gv.egiz.pdfas.lib.api.verify.VerifyResult;
 import at.gv.egiz.pdfas.lib.impl.verify.VerifyResultImpl;
-
-public class ExtendedVerifyResult extends VerifyResultImpl implements VerifyResult {
+*/
+public class ExtendedVerifyResult { /*extends VerifyResultImpl implements VerifyResult {
 	private String qcSource;
 	private boolean publicAuthority;
 	private String publicAuthorityID;
@@ -57,5 +57,5 @@ public class ExtendedVerifyResult extends VerifyResultImpl implements VerifyResu
 
 	public synchronized void setSscdSource(String sscdSource) {
 		this.sscdSource = sscdSource;
-	}
+	}*/
 }
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/InternalMoaConnector.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/InternalMoaConnector.java
index f12a2d1..0344346 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/InternalMoaConnector.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/InternalMoaConnector.java
@@ -13,13 +13,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import at.gv.egiz.pdfas.common.exceptions.PDFASError;
-import at.gv.egiz.pdfas.common.exceptions.PdfAsErrorCarrier;
-import at.gv.egiz.pdfas.common.exceptions.PdfAsException;
-import at.gv.egiz.pdfas.lib.api.sign.SignParameter;
-import at.gv.egiz.pdfas.lib.impl.status.RequestedSignature;
-import at.gv.egiz.sl.util.ISignatureConnector;
-import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.spss.MOAException;
 import at.gv.egovernment.moa.spss.api.cmssign.CMSSignatureResponse;
 import at.gv.egovernment.moa.spss.api.cmssign.CreateCMSSignatureResponse;
@@ -35,7 +28,8 @@ import at.gv.egovernment.moa.spss.server.config.ConfigurationException;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
 import at.gv.egovernment.moa.spss.server.config.KeyGroupEntry;
 import at.gv.egovernment.moa.spss.server.invoke.CMSSignatureCreationInvoker;
-import at.gv.egovernment.moa.util.Base64Utils;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.util.Base64Utils;
 import iaik.logging.TransactionId;
 import iaik.server.modules.keys.KeyEntryID;
 import iaik.server.modules.keys.KeyModule;
@@ -43,7 +37,7 @@ import iaik.server.modules.keys.KeyModuleFactory;
 import iaik.server.modules.keys.UnknownKeyException;
 import iaik.x509.X509Certificate;
 
-public class InternalMoaConnector implements ISignatureConnector {
+public class InternalMoaConnector { /*implements ISignatureConnector {
 
 	private String keyIdentifier;
 	private X509Certificate clientCert;
@@ -229,5 +223,5 @@ public class InternalMoaConnector implements ISignatureConnector {
 
 		return null;
 	}
-
+	*/
 }
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/InternalMoaVerifier.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/InternalMoaVerifier.java
index e59fe50..8d5a27e 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/InternalMoaVerifier.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/InternalMoaVerifier.java
@@ -11,13 +11,14 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import at.gv.egiz.pdfas.common.exceptions.PdfAsException;
+/*import at.gv.egiz.pdfas.common.exceptions.PdfAsException;
 import at.gv.egiz.pdfas.lib.api.Configuration;
 import at.gv.egiz.pdfas.lib.api.verify.SignatureCheck;
 import at.gv.egiz.pdfas.lib.api.verify.VerifyParameter.SignatureVerificationLevel;
 import at.gv.egiz.pdfas.lib.api.verify.VerifyResult;
 import at.gv.egiz.pdfas.lib.impl.verify.IVerifier;
 import at.gv.egiz.pdfas.lib.impl.verify.SignatureCheckImpl;
+*/
 import at.gv.egovernment.moa.spss.MOAException;
 import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest;
 import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse;
@@ -30,7 +31,7 @@ import at.gv.egovernment.moa.spss.api.impl.VerifyCMSSignatureRequestImpl;
 import at.gv.egovernment.moa.spss.server.invoke.CMSSignatureVerificationInvoker;
 import iaik.x509.X509Certificate;
 
-public class InternalMoaVerifier implements IVerifier {
+public class InternalMoaVerifier { /*implements IVerifier {
 
 	public static final String MOA_TRUSTPROFILE = "internal.moa.trustprofile";
 
@@ -124,5 +125,5 @@ public class InternalMoaVerifier implements IVerifier {
 	public SignatureVerificationLevel getLevel() {
 		return SignatureVerificationLevel.FULL_VERIFICATION;
 	}
-
+	*/
 }
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/AxisHandler.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/AxisHandler.java
index a18ee9f..9fa99b1 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/AxisHandler.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/AxisHandler.java
@@ -33,7 +33,9 @@ import java.util.Iterator;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.axis.AxisEngine;
 import org.apache.axis.AxisFault;
+import org.apache.axis.AxisProperties;
 import org.apache.axis.Message;
 import org.apache.axis.MessageContext;
 import org.apache.axis.attachments.AttachmentPart;
@@ -45,17 +47,17 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.logging.LoggingContext;
-import at.gv.egovernment.moa.logging.LoggingContextManager;
 import at.gv.egovernment.moa.spss.MOASystemException;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionIDGenerator;
 import at.gv.egovernment.moa.spss.util.MessageProvider;
-import at.gv.egovernment.moa.util.DOMUtils;
+import at.gv.egovernment.moaspss.logging.LogMsg;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.logging.LoggingContext;
+import at.gv.egovernment.moaspss.logging.LoggingContextManager;
+import at.gv.egovernment.moaspss.util.DOMUtils;
 
 /**
  * An handler that is invoked on each web service request and performs some
@@ -141,9 +143,9 @@ public class AxisHandler extends BasicHandler {
 			// Boolean.FALSE);
 			// msgContext.setProperty(org.apache.axis.
 			// AxisEngine.PROP_ENABLE_NAMESPACE_PREFIX_OPTIMIZATION,"false");
-
+			//AxisProperties.setProperty(AxisEngine.PROP_ATTACHMENT_IMPLEMENTATION, AxisEngine.DEFAULT_ATTACHMENT_IMPL);
 			Message soapMessage = msgContext.getCurrentMessage();
-
+			
 			ConfigurationProvider configuration = ConfigurationProvider.getInstance();
 
 			Element xmlRequest = null;
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/CertificateProviderServlet.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/CertificateProviderServlet.java
index 5fe96ef..43804a2 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/CertificateProviderServlet.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/CertificateProviderServlet.java
@@ -20,12 +20,12 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationException;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
 import at.gv.egovernment.moa.spss.server.config.KeyGroupEntry;
 import at.gv.egovernment.moa.spss.server.logging.TransactionId;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionIDGenerator;
+import at.gv.egovernment.moaspss.logging.Logger;
 
 /**
  * 
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java
index bfefaec..6164154 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java
@@ -35,15 +35,14 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.logging.LoggingContext;
-import at.gv.egovernment.moa.logging.LoggingContextManager;
-
 import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
 import at.gv.egovernment.moa.spss.server.iaik.config.IaikConfigurator;
 import at.gv.egovernment.moa.spss.server.init.*;
 import at.gv.egovernment.moa.spss.util.MessageProvider;
+import at.gv.egovernment.moaspss.logging.LogMsg;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.logging.LoggingContext;
+import at.gv.egovernment.moaspss.logging.LoggingContextManager;
 
 /**
  * A servlet to initialize and update the MOA configuration.
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java
index d986f7a..03eb3d3 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java
@@ -31,9 +31,9 @@ import org.w3c.dom.Element;
 
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.util.MOASPSSEntityResolver;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.MOAErrorHandler;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.DOMUtils;
+import at.gv.egovernment.moaspss.util.MOAErrorHandler;
 
 /**
  * Helper methods for the Service classes.
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java
index 0c800a2..4effec6 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java
@@ -32,7 +32,6 @@ import org.apache.axis.AxisFault;
 import org.apache.axis.i18n.Messages;
 import org.w3c.dom.Element;
 
-import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.spss.MOAException;
 import at.gv.egovernment.moa.spss.MOASystemException;
 import at.gv.egovernment.moa.spss.api.cmssign.CreateCMSSignatureRequest;
@@ -52,8 +51,9 @@ import at.gv.egovernment.moa.spss.server.xmlbind.CreatePDFRequest;
 import at.gv.egovernment.moa.spss.server.xmlbind.CreatePDFRespone;
 import at.gv.egovernment.moa.spss.server.xmlbind.CreatePDFSignatureRequestParser;
 import at.gv.egovernment.moa.spss.server.xmlbind.CreatePDFSignatureResponseBuilder;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.StreamUtils;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.StreamUtils;
 
 /**
  * The service endpoint for the <code>SignatureCreation</code> web service.
@@ -100,7 +100,7 @@ public class SignatureCreationService {
 	        new CreatePDFSignatureResponseBuilder();
 	      Element reparsedReq;
 	      CreatePDFRequest requestObj;
-	      CreatePDFRespone responseObj;
+	      CreatePDFRespone responseObj = null;
 
 	      //since Axis (1.1 ff) has problem with namespaces we take the raw request stored by the Axishandler.
 	      TransactionContext context = TransactionContextManager.getInstance().getTransactionContext();
@@ -115,7 +115,7 @@ public class SignatureCreationService {
 	      
 		  Logger.trace(">>> creating Signature");
 	      // invoke the core logic
-	      responseObj = PDFASInvoker.getInstance().createPDFSignature(requestObj, context.getTransactionID());
+	      //responseObj = PDFASInvoker.getInstance().createPDFSignature(requestObj, context.getTransactionID());
 		  Logger.trace("<<< created Signature");
 
 		  Logger.trace(">>> building Response");
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureVerificationService.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureVerificationService.java
index f676ed4..8278399 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureVerificationService.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureVerificationService.java
@@ -27,28 +27,23 @@ package at.gv.egovernment.moa.spss.server.service;
 import org.apache.axis.AxisFault;
 import org.w3c.dom.Element;
 
-import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.spss.MOAException;
 import at.gv.egovernment.moa.spss.MOASystemException;
 import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest;
 import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse;
 import at.gv.egovernment.moa.spss.api.xmlbind.VerifyCMSSignatureRequestParser;
 import at.gv.egovernment.moa.spss.api.xmlbind.VerifyCMSSignatureResponseBuilder;
+import at.gv.egovernment.moa.spss.api.xmlbind.VerifyPDFSignatureResponseBuilder;
 import at.gv.egovernment.moa.spss.api.xmlbind.VerifyXMLSignatureRequestParser;
 import at.gv.egovernment.moa.spss.api.xmlbind.VerifyXMLSignatureResponseBuilder;
 import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest;
 import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
 import at.gv.egovernment.moa.spss.server.invoke.CMSSignatureVerificationInvoker;
-import at.gv.egovernment.moa.spss.server.invoke.PDFASInvoker;
 import at.gv.egovernment.moa.spss.server.invoke.XMLSignatureVerificationInvoker;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
-import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFRequest;
-import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFRequestParser;
-import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFResponse;
-import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFResponseBuilder;
-import at.gv.egovernment.moa.util.StreamUtils;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.util.StreamUtils;
 
 /**
  * The service endpoint for the <code>SignatureVerification</code> web service.
@@ -69,20 +64,28 @@ public class SignatureVerificationService {
 	   */
 	  public Element[] VerifyPDFSignatureRequest(Element[] request)
 	    throws AxisFault {
-	    PDFASInvoker invoker =
-	    		PDFASInvoker.getInstance();
+		CMSSignatureVerificationInvoker invoker =
+			      CMSSignatureVerificationInvoker.getInstance();
 	    Element[] response = new Element[1];
 	    
 	    try {
-	             
+	       
+	    	// create a parser and builder for binding API objects to/from XML
+	        VerifyCMSSignatureRequestParser requestParser =
+	          new VerifyCMSSignatureRequestParser();
+	        VerifyPDFSignatureResponseBuilder responseBuilder =
+	          new VerifyPDFSignatureResponseBuilder();
+	        Element reparsedReq;
+	        VerifyCMSSignatureRequest requestObj;
+	        VerifyCMSSignatureResponse responseObj;
 	      // create a parser and builder for binding API objects to/from XML
-	      VerifyPDFRequestParser requestParser =
+	      /*VerifyPDFRequestParser requestParser =
 	        new VerifyPDFRequestParser();
 	      VerifyPDFResponseBuilder responseBuilder =
 	        new VerifyPDFResponseBuilder();
 	      Element reparsedReq;
 	      VerifyPDFRequest requestObj;
-	      VerifyPDFResponse responseObj;
+	      VerifyPDFResponse responseObj;*/
 
 	      //since Axis (1.1 ff) has problem with namespaces we take the raw request stored by the Axishandler.
 	      TransactionContext context = TransactionContextManager.getInstance().getTransactionContext();
@@ -90,10 +93,10 @@ public class SignatureVerificationService {
 	      reparsedReq = ServiceUtils.reparseRequest(request[0]);//context.getRequest());
 	      
 	      // convert to API objects
-	      requestObj = requestParser.parse(reparsedReq);
+	      requestObj = requestParser.parsePDF(reparsedReq);
 
 	      // invoke the core logic
-	      responseObj = invoker.verifyPDFSignature(requestObj);
+	      responseObj = invoker.verifyCMSSignature(requestObj);
 
 	      // map back to XML
 	      response[0] = responseBuilder.build(responseObj).getDocumentElement();
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/PDFVerifySignatureBinding.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/PDFVerifySignatureBinding.java
deleted file mode 100644
index 6c6a89a..0000000
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/PDFVerifySignatureBinding.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package at.gv.egovernment.moa.spss.server.webservice;
-
-import at.gv.egiz.moasig.VerifyPDFSignatureRequest;
-import at.gv.egiz.moasig.VerifyPDFSignatureResponseType;
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFRequest;
-import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFResponse;
-
-public interface PDFVerifySignatureBinding {
-	public VerifyPDFRequest buildPDFRequest(
-			VerifyPDFSignatureRequest createCMSSignatureRequest) throws MOAApplicationException;
-
-	public VerifyPDFSignatureResponseType buildPDFResponse(VerifyPDFResponse response)
-			throws MOAApplicationException;
-}
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/SignatureCreationService.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/SignatureCreationService.java
index 5162f55..ccfc3fc 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/SignatureCreationService.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/SignatureCreationService.java
@@ -17,8 +17,8 @@ public interface SignatureCreationService {
 			@WebParam(name = "CreateCMSSignatureRequest") at.gv.egiz.moasig.CreateCMSSignatureRequest createCMSSignatureRequest)
 					throws Exception;
 	
-	@WebMethod(action = "PDFSignatureCreate", operationName = "PDFSignatureCreate")
+	/*@WebMethod(action = "PDFSignatureCreate", operationName = "PDFSignatureCreate")
 	public at.gv.egiz.moasig.CreatePDFSignatureResponseType createPDFSignature(
 			@WebParam(name = "CreatePDFSignatureRequest") at.gv.egiz.moasig.CreatePDFSignatureRequest createPDFSignatureRequest)
-					throws Exception;
+					throws Exception;*/
 }
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/CMSParserUtils.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/CMSParserUtils.java
index 9512761..3bfe2f5 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/CMSParserUtils.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/CMSParserUtils.java
@@ -13,7 +13,7 @@ import at.gv.egovernment.moa.spss.api.cmssign.DataObjectInfo;
 import at.gv.egovernment.moa.spss.api.cmssign.SingleSignatureInfo;
 import at.gv.egovernment.moa.spss.api.cmsverify.CMSDataObject;
 import at.gv.egovernment.moa.spss.api.xmlsign.ErrorResponse;
-import at.gv.egovernment.moa.util.Base64Utils;
+import at.gv.egovernment.moaspss.util.Base64Utils;
 
 public class CMSParserUtils {
 
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/CMSVerifySignatureBindingImpl.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/CMSVerifySignatureBindingImpl.java
index 7a49d6a..1cfa806 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/CMSVerifySignatureBindingImpl.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/CMSVerifySignatureBindingImpl.java
@@ -25,7 +25,7 @@ import at.gv.egovernment.moa.spss.api.common.CheckResult;
 import at.gv.egovernment.moa.spss.api.common.SignerInfo;
 import at.gv.egovernment.moa.spss.api.xmlverify.AdESFormResults;
 import at.gv.egovernment.moa.spss.server.webservice.CMSVerifySignatureBinding;
-import at.gv.egovernment.moa.util.CollectionUtils;
+import at.gv.egovernment.moaspss.util.CollectionUtils;
 
 public class CMSVerifySignatureBindingImpl implements CMSVerifySignatureBinding {
 
@@ -209,7 +209,7 @@ public class CMSVerifySignatureBindingImpl implements CMSVerifySignatureBinding
 	public VerifyCMSSignatureRequest buildPDFRequest(VerifyPDFSignatureRequest verifyPDFSignatureRequest)
 			throws MOAApplicationException {
 		Date dateTime = null;
-		if (verifyPDFSignatureRequest.getDateTime() == null) {
+		if (verifyPDFSignatureRequest.getDateTime() != null) {
 			dateTime = verifyPDFSignatureRequest.getDateTime().toGregorianCalendar().getTime();
 		}
 
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/PDFCreateSignatureBindingImpl.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/PDFCreateSignatureBindingImpl.java
index dfe3ce5..b16cce7 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/PDFCreateSignatureBindingImpl.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/PDFCreateSignatureBindingImpl.java
@@ -7,7 +7,6 @@ import at.gv.egiz.moasig.CreatePDFSignatureRequest;
 import at.gv.egiz.moasig.CreatePDFSignatureResponseType;
 import at.gv.egiz.moasig.ErrorResponseType;
 import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.api.SPSSFactory;
 import at.gv.egovernment.moa.spss.server.webservice.PDFCreateSignatureBinding;
 import at.gv.egovernment.moa.spss.server.xmlbind.CreatePDFRequest;
 import at.gv.egovernment.moa.spss.server.xmlbind.CreatePDFRespone;
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/PDFVerifySignatureBindingImpl.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/PDFVerifySignatureBindingImpl.java
deleted file mode 100644
index 42301ad..0000000
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/PDFVerifySignatureBindingImpl.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package at.gv.egovernment.moa.spss.server.webservice.binding;
-
-import at.gv.egiz.moasig.VerifyPDFSignatureRequest;
-import at.gv.egiz.moasig.VerifyPDFSignatureResponseType;
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.server.webservice.PDFVerifySignatureBinding;
-import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFRequest;
-import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFResponse;
-
-public class PDFVerifySignatureBindingImpl implements PDFVerifySignatureBinding {
-
-	@Override
-	public VerifyPDFRequest buildPDFRequest(VerifyPDFSignatureRequest createCMSSignatureRequest)
-			throws MOAApplicationException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public VerifyPDFSignatureResponseType buildPDFResponse(VerifyPDFResponse response) throws MOAApplicationException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-}
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/TransformParser.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/TransformParser.java
index cd10260..1d05f22 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/TransformParser.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/TransformParser.java
@@ -56,9 +56,9 @@ import at.gv.egovernment.moa.spss.api.common.XPathFilter;
 import at.gv.egovernment.moa.spss.api.common.XPathFilter2Transform;
 import at.gv.egovernment.moa.spss.api.common.XPathTransform;
 import at.gv.egovernment.moa.spss.api.common.XSLTTransform;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.DOMUtils;
+import at.gv.egovernment.moaspss.util.XPathUtils;
 
 /**
  * A parser to parse XMLDsig <code>Transform</code> DOM elements into their MOA
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/XMLCreateSignatureBindingImpl.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/XMLCreateSignatureBindingImpl.java
index d5d50cd..6656d51 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/XMLCreateSignatureBindingImpl.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/XMLCreateSignatureBindingImpl.java
@@ -17,7 +17,7 @@ import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponseElement;
 import at.gv.egovernment.moa.spss.api.xmlsign.ErrorResponse;
 import at.gv.egovernment.moa.spss.api.xmlsign.SignatureEnvironmentResponse;
 import at.gv.egovernment.moa.spss.server.webservice.XMLCreateSignatureBinding;
-import at.gv.egovernment.moa.util.DOMUtils;
+import at.gv.egovernment.moaspss.util.DOMUtils;
 
 public class XMLCreateSignatureBindingImpl implements XMLCreateSignatureBinding {
 
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/XMLVerifySignatureBindingImpl.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/XMLVerifySignatureBindingImpl.java
index 44dc2c2..dcc92f9 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/XMLVerifySignatureBindingImpl.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/XMLVerifySignatureBindingImpl.java
@@ -11,16 +11,21 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
+import javax.security.auth.login.FailedLoginException;
+import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
+import javax.xml.transform.dom.DOMResult;
 
 import org.apache.commons.io.IOUtils;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
 import at.gv.egiz.moasig.MoaTransformsType;
+import at.gv.egiz.moasig.NamespaceDeclarationType;
 import at.gv.egiz.moasig.PublicAuthorityType;
 import at.gv.egiz.moasig.QualifiedCertificate;
 import at.gv.egiz.moasig.SecureSignatureCreationDevice;
@@ -28,6 +33,7 @@ import at.gv.egiz.moasig.TransformParameterType;
 import at.gv.egiz.moasig.TransformParameterType.Hash;
 import at.gv.egiz.moasig.VerifyXMLSignatureResponseType;
 import at.gv.egiz.moasig.XMLDataObjectAssociationType;
+import at.gv.egiz.moasig.XMLSignatureLocationType;
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.api.SPSSFactory;
 import at.gv.egovernment.moa.spss.api.common.Content;
@@ -46,7 +52,7 @@ import at.gv.egovernment.moa.spss.api.xmlverify.VerifyTransformsInfoProfile;
 import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest;
 import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
 import at.gv.egovernment.moa.spss.server.webservice.XMLVerifySignatureBinding;
-import at.gv.egovernment.moa.util.DOMUtils;
+import at.gv.egovernment.moaspss.util.DOMUtils;
 import iaik.utils.RFC2253NameParser;
 import iaik.utils.RFC2253NameParserException;
 
@@ -264,11 +270,26 @@ public class XMLVerifySignatureBindingImpl implements XMLVerifySignatureBinding
 					throws MOAApplicationException {
 		Content verifySignatureEnvironment = transformerUtils
 				.buildContent(verifySignatureInfo.getVerifySignatureEnvironment());
+		
+		XMLSignatureLocationType xmlSignatureLocationType = verifySignatureInfo.getVerifySignatureLocation();
 
-		String xPathExpression = verifySignatureInfo.getVerifySignatureLocation();
-
+		String xPathExpression = xmlSignatureLocationType.getXPathExpression();
+		
+		Iterator<NamespaceDeclarationType> namespaceDelcarationIterator = xmlSignatureLocationType.getNamespaceDeclaration().iterator();
+		
+		Map namespaceMap = new HashMap();
+		
+		while(namespaceDelcarationIterator.hasNext()) {
+			NamespaceDeclarationType namespaceDelcaration = namespaceDelcarationIterator.next();
+			
+			String prefix = namespaceDelcaration.getPrefix();
+			String namespace = namespaceDelcaration.getValue();
+			
+			namespaceMap.put(prefix, namespace);
+		}
+		
 		VerifySignatureLocation verifySignatureLocation = factory.createVerifySignatureLocation(xPathExpression,
-				new HashMap());
+				namespaceMap);
 
 		return factory.createVerifySignatureInfo(verifySignatureEnvironment, verifySignatureLocation);
 	}
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/ContextSetupAspect.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/ContextSetupAspect.java
deleted file mode 100644
index 42ffd5e..0000000
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/ContextSetupAspect.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package at.gv.egovernment.moa.spss.server.webservice.impl;
-
-import java.security.cert.X509Certificate;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
-
-import org.apache.cxf.transport.http.AbstractHTTPDestination;
-import org.aspectj.lang.annotation.Aspect;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.logging.LoggingContext;
-import at.gv.egovernment.moa.logging.LoggingContextManager;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationException;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionIDGenerator;
-
-@Aspect
-public class ContextSetupAspect {
-
-	private static final Logger logger = LoggerFactory.getLogger(ContextSetupAspect.class);
-	
-	/** The property name for accessing the X509 client certificate chain. */
-	private static final String X509_CERTIFICATE_PROPERTY = "javax.servlet.request.X509Certificate";
-
-	/** The property name for accessing the SOAP action header. */
-	private static final String SOAP_ACTION_HEADER = "soapaction";
-	
-	/**
-	 * Set up the thread-local contexts (<code>TransactionContext</code> and
-	 * <code>LoggingContext</code>).
-	 * 
-	 * @param context
-	 *            The <code>TransactionContext</code> to set for the current
-	 *            request.
-	 */
-	private static void setUpContexts(TransactionContext context) {
-		// set the transaction context in the TransactionContextManager
-		TransactionContextManager tcm = TransactionContextManager.getInstance();
-		tcm.setTransactionContext(context);
-
-		// set the logging context in the LoggingContextManager
-		LoggingContextManager lcm = LoggingContextManager.getInstance();
-		LoggingContext lc = new LoggingContext(context.getTransactionID());
-		lcm.setLoggingContext(lc);
-	}
-
-	/**
-	 * Tear down the thread-local contexts.
-	 */
-	private static void tearDownContexts() {
-		TransactionContextManager tcm = TransactionContextManager.getInstance();
-
-		// delete temporary files
-		TransactionContext context = tcm.getTransactionContext();
-		context.cleanAttachmentCache();
-
-		// unset the transaction context
-		tcm.setTransactionContext(null);
-
-		// unset the logging context
-		LoggingContextManager lcm = LoggingContextManager.getInstance();
-		lcm.setLoggingContext(null);
-	}
-
-	public static void setupContext(MessageContext messageContext, String targetService) throws ConfigurationException {
-		logger.debug("Context setup");
-		
-		HttpServletRequest request = (HttpServletRequest) messageContext
-				.get(AbstractHTTPDestination.HTTP_REQUEST);
-
-		X509Certificate[] clientCert = (X509Certificate[]) request.getAttribute(X509_CERTIFICATE_PROPERTY);
-
-		ConfigurationProvider configuration = ConfigurationProvider.getInstance();
-
-		Element xmlRequest = null;
-		if (messageContext instanceof SOAPMessageContext) {
-			SOAPMessageContext soapMessageContext = (SOAPMessageContext) messageContext;
-			xmlRequest = soapMessageContext.getMessage().getSOAPPart().getDocumentElement();
-		}
-
-		TransactionContext context = new TransactionContext(TransactionIDGenerator.nextID(), clientCert,
-				configuration, xmlRequest, null);
-
-		String soapAction = (String) request.getHeader(SOAP_ACTION_HEADER);
-		if ("\"\"".equals(soapAction)) {
-			// if http soap action header is empty
-			soapAction = targetService;
-		}
-		context.setRequestName(soapAction);
-		
-		setUpContexts(context);
-	}
-
-	public static void cleanContext() {
-		logger.debug("Context clean up");
-		tearDownContexts();
-	}
-}
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/SignatureCreationServiceImpl.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/SignatureCreationServiceImpl.java
deleted file mode 100644
index 358b9d6..0000000
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/SignatureCreationServiceImpl.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package at.gv.egovernment.moa.spss.server.webservice.impl;
-
-import java.util.Collections;
-
-import javax.annotation.Resource;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.ws.WebServiceContext;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import at.gv.egiz.moasig.CreateCMSSignatureRequest;
-import at.gv.egiz.moasig.CreateCMSSignatureRequestType;
-import at.gv.egiz.moasig.CreateCMSSignatureResponseType;
-import at.gv.egiz.moasig.CreatePDFSignatureRequest;
-import at.gv.egiz.moasig.CreatePDFSignatureRequestType;
-import at.gv.egiz.moasig.CreatePDFSignatureResponseType;
-import at.gv.egiz.moasig.CreateXMLSignatureRequest;
-import at.gv.egiz.moasig.CreateXMLSignatureResponseType;
-import at.gv.egovernment.moa.spss.MOAException;
-import at.gv.egovernment.moa.spss.MOASystemException;
-import at.gv.egovernment.moa.spss.server.invoke.CMSSignatureCreationInvoker;
-import at.gv.egovernment.moa.spss.server.invoke.PDFASInvoker;
-import at.gv.egovernment.moa.spss.server.invoke.XMLSignatureCreationInvoker;
-import at.gv.egovernment.moa.spss.server.service.ServiceUtils;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
-import at.gv.egovernment.moa.spss.server.webservice.CMSCreateSignatureBinding;
-import at.gv.egovernment.moa.spss.server.webservice.PDFCreateSignatureBinding;
-import at.gv.egovernment.moa.spss.server.webservice.SignatureCreationService;
-import at.gv.egovernment.moa.spss.server.webservice.XMLCreateSignatureBinding;
-import at.gv.egovernment.moa.spss.server.webservice.binding.CMSCreateSignatureBindingImpl;
-import at.gv.egovernment.moa.spss.server.webservice.binding.PDFCreateSignatureBindingImpl;
-import at.gv.egovernment.moa.spss.server.webservice.binding.XMLCreateSignatureBindingImpl;
-import at.gv.egovernment.moa.spss.server.xmlbind.CreatePDFRequest;
-import at.gv.egovernment.moa.spss.server.xmlbind.CreatePDFRespone;
-import at.gv.egovernment.moa.util.StreamUtils;
-
-@WebService(endpointInterface = "at.gv.egovernment.moa.spss.server.webservice.SignatureCreationService", portName = "SignatureCreationService", serviceName = "SignatureCreationService")
-public class SignatureCreationServiceImpl implements SignatureCreationService {
-
-	private static final Logger logger = LoggerFactory.getLogger(SignatureCreationServiceImpl.class);
-
-	@Resource
-	private WebServiceContext context;
-
-	private XMLCreateSignatureBinding xmlCreateSignatureBinding;
-	private CMSCreateSignatureBinding cmsCreateSignatureBinding;
-	private PDFCreateSignatureBinding pdfCreateSignatureBinding;
-
-	public SignatureCreationServiceImpl() {
-		this.xmlCreateSignatureBinding = new XMLCreateSignatureBindingImpl();
-		this.cmsCreateSignatureBinding = new CMSCreateSignatureBindingImpl();
-		this.pdfCreateSignatureBinding = new PDFCreateSignatureBindingImpl();
-	}
-
-	@Override
-	@WebResult(name = "CreateXMLSignatureResponseType", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20151109#")
-	public CreateXMLSignatureResponseType createXMLSignature(CreateXMLSignatureRequest createXMLSignatureRequest)
-			throws Exception {
-		logger.info("createXMLSignature start");
-		try {
-			logger.info("WebServiceContext: {}", context);
-			ContextSetupAspect.setupContext(context.getMessageContext(), "createXMLSignature");
-
-			XMLSignatureCreationInvoker invoker = XMLSignatureCreationInvoker.getInstance();
-
-			at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest requestObj;
-			at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponse responseObj;
-
-			logger.trace(">>> preparsing Request");
-			requestObj = this.xmlCreateSignatureBinding.buildXMLRequest(createXMLSignatureRequest);
-			logger.trace("<<< preparsed Request");
-
-			logger.trace(">>> creating Signature");
-			// invoke the core logic
-			responseObj = invoker.createXMLSignature(requestObj, Collections.EMPTY_SET);
-			logger.trace("<<< created Signature");
-
-			logger.trace(">>> building Response");
-			// map back to XML
-			CreateXMLSignatureResponseType response = this.xmlCreateSignatureBinding.buildXMLResponse(responseObj);
-			logger.trace("<<< built Response");
-
-			return response;
-		} catch (MOAException e) {
-			logger.debug("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:"
-					+ System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e));
-			logger.error("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:", e);
-			throw new Exception(e.getMessage());
-		} catch (Throwable t) {
-			MOASystemException e = new MOASystemException("2900", null, t);
-			logger.debug("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:"
-					+ System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e));
-			logger.error("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:", e);
-			throw new Exception(e.getMessage());
-		} finally {
-			ContextSetupAspect.cleanContext();
-		}
-	}
-
-	@Override
-	@WebResult(name = "CreateCMSSignatureResponseType", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20151109#")
-	public CreateCMSSignatureResponseType createCMSSignature(CreateCMSSignatureRequest createCMSSignatureRequest)
-			throws Exception {
-		logger.info("createCMSSignature start");
-		try {
-			logger.info("WebServiceContext: {}", context);
-			ContextSetupAspect.setupContext(context.getMessageContext(), "createCMSSignature");
-
-			CMSSignatureCreationInvoker invoker = CMSSignatureCreationInvoker.getInstance();
-
-			at.gv.egovernment.moa.spss.api.cmssign.CreateCMSSignatureRequest requestObj;
-			at.gv.egovernment.moa.spss.api.cmssign.CreateCMSSignatureResponse responseObj;
-
-			logger.trace(">>> preparsing Request");
-			requestObj = this.cmsCreateSignatureBinding.buildCMSRequest(createCMSSignatureRequest);
-			logger.trace("<<< preparsed Request");
-
-			logger.trace(">>> creating Signature");
-			// invoke the core logic
-			responseObj = invoker.createCMSSignature(requestObj, Collections.EMPTY_SET);
-			logger.trace("<<< created Signature");
-
-			logger.trace(">>> building Response");
-			// map back to XML
-			CreateCMSSignatureResponseType response = this.cmsCreateSignatureBinding.buildCMSResponse(responseObj);
-			logger.trace("<<< built Response");
-
-			return response;
-
-		} catch (MOAException e) {
-			logger.debug("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:"
-					+ System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e));
-			logger.error("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:", e);
-			throw new Exception(e.getMessage());
-		} catch (Throwable t) {
-			MOASystemException e = new MOASystemException("2900", null, t);
-			logger.debug("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:"
-					+ System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e));
-			logger.error("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:", e);
-			throw new Exception(e.getMessage());
-		} finally {
-			ContextSetupAspect.cleanContext();
-		}
-	}
-
-	@Override
-	@WebResult(name = "CreatePDFSignatureResponseType", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20151109#")
-	public CreatePDFSignatureResponseType createPDFSignature(CreatePDFSignatureRequest createPDFSignatureRequest)
-			throws Exception {
-		logger.info("createPDFSignature start");
-		try {
-			logger.info("WebServiceContext: {}", context);
-			ContextSetupAspect.setupContext(context.getMessageContext(), "createPDFSignature");
-
-			CreatePDFRequest requestObj;
-			CreatePDFRespone responseObj;
-
-			TransactionContext context = TransactionContextManager.getInstance().getTransactionContext();
-
-			// convert to API objects
-			logger.trace(">>> preparsing Request");
-			requestObj = this.pdfCreateSignatureBinding.buildPDFRequest(createPDFSignatureRequest);
-			logger.trace("<<< preparsed Request");
-
-			logger.trace(">>> creating Signature");
-			// invoke the core logic
-			responseObj = PDFASInvoker.getInstance().createPDFSignature(requestObj, context.getTransactionID());
-			logger.trace("<<< created Signature");
-
-			logger.trace(">>> building Response");
-			// map back to XML
-			CreatePDFSignatureResponseType response = this.pdfCreateSignatureBinding.buildPDFResponse(responseObj);
-			logger.trace("<<< built Response");
-			
-			return response;
-		} catch (Throwable t) {
-			MOASystemException e = new MOASystemException("2900", null, t);
-			logger.debug("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:"
-					+ System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e));
-			logger.error("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:", e);
-			throw new Exception(e.getMessage());
-		} finally {
-			ContextSetupAspect.cleanContext();
-		}
-	}
-
-}
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/SignatureVerificationServiceImpl.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/SignatureVerificationServiceImpl.java
deleted file mode 100644
index cbc4d2d..0000000
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/SignatureVerificationServiceImpl.java
+++ /dev/null
@@ -1,215 +0,0 @@
-package at.gv.egovernment.moa.spss.server.webservice.impl;
-
-import javax.annotation.Resource;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.ws.WebServiceContext;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import at.gv.egiz.moasig.VerifyCMSSignatureRequest;
-import at.gv.egiz.moasig.VerifyCMSSignatureResponseType;
-import at.gv.egiz.moasig.VerifyPDFSignatureRequest;
-import at.gv.egiz.moasig.VerifyPDFSignatureResponseType;
-import at.gv.egiz.moasig.VerifyXMLSignatureRequest;
-import at.gv.egiz.moasig.VerifyXMLSignatureResponseType;
-import at.gv.egovernment.moa.spss.MOASystemException;
-import at.gv.egovernment.moa.spss.server.invoke.CMSSignatureVerificationInvoker;
-import at.gv.egovernment.moa.spss.server.invoke.PDFASInvoker;
-import at.gv.egovernment.moa.spss.server.invoke.XMLSignatureVerificationInvoker;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
-import at.gv.egovernment.moa.spss.server.webservice.CMSVerifySignatureBinding;
-import at.gv.egovernment.moa.spss.server.webservice.PDFVerifySignatureBinding;
-import at.gv.egovernment.moa.spss.server.webservice.SignatureVerificationService;
-import at.gv.egovernment.moa.spss.server.webservice.XMLVerifySignatureBinding;
-import at.gv.egovernment.moa.spss.server.webservice.binding.CMSVerifySignatureBindingImpl;
-import at.gv.egovernment.moa.spss.server.webservice.binding.PDFVerifySignatureBindingImpl;
-import at.gv.egovernment.moa.spss.server.webservice.binding.XMLVerifySignatureBindingImpl;
-import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFRequest;
-import at.gv.egovernment.moa.spss.server.xmlbind.VerifyPDFResponse;
-import at.gv.egovernment.moa.util.StreamUtils;
-
-@WebService(endpointInterface = "at.gv.egovernment.moa.spss.server.webservice.SignatureVerificationService", portName = "SignatureVerificationService", serviceName = "SignatureVerificationService")
-public class SignatureVerificationServiceImpl implements SignatureVerificationService {
-
-	private static final Logger logger = LoggerFactory.getLogger(SignatureVerificationServiceImpl.class);
-
-	@Resource
-	private WebServiceContext context;
-
-	private XMLVerifySignatureBinding xmlVerifySignatureBinding;
-	private CMSVerifySignatureBinding cmsVerifySignatureBinding;
-	private PDFVerifySignatureBinding pdfVerifySignatureBinding;
-
-	public SignatureVerificationServiceImpl() {
-		this.xmlVerifySignatureBinding = new XMLVerifySignatureBindingImpl();
-		this.cmsVerifySignatureBinding = new CMSVerifySignatureBindingImpl();
-		this.pdfVerifySignatureBinding = new PDFVerifySignatureBindingImpl();
-	}
-
-	@Override
-	@WebResult(name = "VerifyXMLSignatureResponseType", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20151109#")
-	public VerifyXMLSignatureResponseType verifyXMLSignature(VerifyXMLSignatureRequest verifyXMLSignatureRequest)
-			throws Exception {
-		logger.info("verifyXMLSignature start");
-		try {
-			logger.info("WebServiceContext: {}", context);
-			ContextSetupAspect.setupContext(context.getMessageContext(), "verifyXMLSignature");
-
-			XMLSignatureVerificationInvoker invoker = XMLSignatureVerificationInvoker.getInstance();
-
-			at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest requestObj;
-			at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse responseObj;
-
-			logger.trace(">>> preparsing Request");
-			requestObj = this.xmlVerifySignatureBinding.buildXMLRequest(verifyXMLSignatureRequest);
-			logger.trace("<<< preparsed Request");
-
-			logger.trace(">>> verifying Signature");
-			// invoke the core logic
-			responseObj = invoker.verifyXMLSignature(requestObj);
-			logger.trace("<<< verified Signature");
-
-			logger.trace(">>> building Response");
-			// map back to XML
-			VerifyXMLSignatureResponseType response = this.xmlVerifySignatureBinding.buildXMLResponse(responseObj);
-			logger.trace("<<< built Response");
-
-			return response;
-		} catch (Throwable t) {
-			MOASystemException e = new MOASystemException("2900", null, t);
-			logger.debug("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:"
-					+ System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e));
-			logger.error("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:", e);
-			throw new Exception(e.getMessage());
-		} finally {
-			ContextSetupAspect.cleanContext();
-		}
-	}
-
-	@Override
-	@WebResult(name = "VerifyCMSSignatureResponseType", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20151109#")
-	public VerifyCMSSignatureResponseType verifyCMSSignature(VerifyCMSSignatureRequest verifyCMSSignatureRequest)
-			throws Exception {
-		logger.info("verifyCMSSignature start");
-		try {
-			logger.info("WebServiceContext: {}", context);
-			ContextSetupAspect.setupContext(context.getMessageContext(), "verifyCMSSignature");
-
-			CMSSignatureVerificationInvoker invoker = CMSSignatureVerificationInvoker.getInstance();
-
-			at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest requestObj;
-			at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse responseObj;
-
-			logger.trace(">>> preparsing Request");
-			requestObj = this.cmsVerifySignatureBinding.buildCMSRequest(verifyCMSSignatureRequest);
-			logger.trace("<<< preparsed Request");
-
-			logger.trace(">>> verifying Signature");
-			// invoke the core logic
-			responseObj = invoker.verifyCMSSignature(requestObj);
-			logger.trace("<<< verified Signature");
-
-			logger.trace(">>> building Response");
-			// map back to XML
-			VerifyCMSSignatureResponseType response = this.cmsVerifySignatureBinding.buildCMSResponse(responseObj);
-			logger.trace("<<< built Response");
-
-			return response;
-		} catch (Throwable t) {
-			MOASystemException e = new MOASystemException("2900", null, t);
-			logger.debug("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:"
-					+ System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e));
-			logger.error("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:", e);
-			throw new Exception(e.getMessage());
-		} finally {
-			ContextSetupAspect.cleanContext();
-		}
-	}
-
-	//@Override
-	//@WebResult(name = "VerifyPDFSignatureResponseType", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20151109#")
-	private VerifyPDFSignatureResponseType verifyPDFASSignature(VerifyPDFSignatureRequest verifyPDFSignatureRequest)
-			throws Exception {
-		logger.info("verifyPDFSignature start");
-		try {
-			logger.info("WebServiceContext: {}", context);
-			ContextSetupAspect.setupContext(context.getMessageContext(), "verifyPDFSignature");
-			
-			VerifyPDFRequest requestObj;
-			VerifyPDFResponse responseObj;
-
-			// since Axis (1.1 ff) has problem with namespaces we take the raw
-			// request stored by the Axishandler.
-			TransactionContext context = TransactionContextManager.getInstance().getTransactionContext();
-
-			// convert to API objects
-			logger.trace(">>> preparsing Request");
-			requestObj = this.pdfVerifySignatureBinding.buildPDFRequest(verifyPDFSignatureRequest);
-			logger.trace("<<< preparsed Request");
-
-			logger.trace(">>> verifying Signature");
-			// invoke the core logic
-			responseObj = PDFASInvoker.getInstance().verifyPDFSignature(requestObj);
-			logger.trace("<<< verified Signature");
-
-			logger.trace(">>> building Response");
-			// map back to XML
-			VerifyPDFSignatureResponseType response = this.pdfVerifySignatureBinding.buildPDFResponse(responseObj);
-			logger.trace("<<< built Response");
-
-			return response;
-		} catch (Throwable t) {
-			MOASystemException e = new MOASystemException("2900", null, t);
-			logger.debug("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:"
-					+ System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e));
-			logger.error("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:", e);
-			throw new Exception(e.getMessage());
-		} finally {
-			ContextSetupAspect.cleanContext();
-		}
-	}
-	
-	@Override
-	@WebResult(name = "VerifyPDFSignatureResponseType", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20151109#")
-	public VerifyPDFSignatureResponseType verifyPDFSignature(VerifyPDFSignatureRequest verifyPDFSignatureRequest)
-			throws Exception {
-		logger.info("verifyPDFSignature start");
-		try {
-			logger.info("WebServiceContext: {}", context);
-			ContextSetupAspect.setupContext(context.getMessageContext(), "verifyPDFSignature");
-			
-			CMSSignatureVerificationInvoker invoker = CMSSignatureVerificationInvoker.getInstance();
-
-			at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest requestObj;
-			at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse responseObj;
-
-			logger.trace(">>> preparsing Request");
-			requestObj = this.cmsVerifySignatureBinding.buildPDFRequest(verifyPDFSignatureRequest);
-			logger.trace("<<< preparsed Request");
-			
-			logger.trace(">>> verifying Signature");
-			// invoke the core logic
-			responseObj = invoker.verifyCMSSignature(requestObj);
-			logger.trace("<<< verified Signature");
-
-			logger.trace(">>> building Response");
-			// map back to XML
-			VerifyPDFSignatureResponseType response = this.cmsVerifySignatureBinding.buildPDFResponse(responseObj);
-			logger.trace("<<< built Response");
-
-			return response;
-		} catch (Throwable t) {
-			MOASystemException e = new MOASystemException("2900", null, t);
-			logger.debug("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:"
-					+ System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e));
-			logger.error("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:", e);
-			throw new Exception(e.getMessage());
-		} finally {
-			ContextSetupAspect.cleanContext();
-		}
-	}
-
-}
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/SimpleCXFNonSpringServlet.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/SimpleCXFNonSpringServlet.java
deleted file mode 100644
index 65625a7..0000000
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/SimpleCXFNonSpringServlet.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package at.gv.egovernment.moa.spss.server.webservice.impl;
-
-import javax.servlet.ServletConfig;
-import javax.xml.ws.Endpoint;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.transport.servlet.CXFNonSpringServlet;
-
-public class SimpleCXFNonSpringServlet extends CXFNonSpringServlet {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 8564433272673970611L;
-
-	@Override
-	public void loadBus(ServletConfig servletConfig) {
-		super.loadBus(servletConfig);
-		Bus bus = getBus();
-		BusFactory.setDefaultBus(bus);
-		Endpoint signatureCreationEndpoint = Endpoint.publish("/SignatureCreation", new SignatureCreationServiceImpl());
-		signatureCreationEndpoint.getProperties().put("schema-validation-enabled", "true");
-		Endpoint signatureVerificationEndpoint = Endpoint.publish("/SignatureVerification", new SignatureVerificationServiceImpl());
-		signatureVerificationEndpoint.getProperties().put("schema-validation-enabled", "true");
-	}
-	
-}
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/CreatePDFSignatureRequestParser.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/CreatePDFSignatureRequestParser.java
index 163a7ba..c6b2126 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/CreatePDFSignatureRequestParser.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/CreatePDFSignatureRequestParser.java
@@ -29,10 +29,10 @@ import org.w3c.dom.Element;
 import org.w3c.dom.traversal.NodeIterator;
 
 import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.util.Base64Utils;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
+import at.gv.egovernment.moaspss.util.Base64Utils;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.DOMUtils;
+import at.gv.egovernment.moaspss.util.XPathUtils;
 
 /**
  * A parser to parse <code>CreateCMSSignatureRequest</code> DOM trees into
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/CreatePDFSignatureResponseBuilder.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/CreatePDFSignatureResponseBuilder.java
index 78586ba..bdb9a71 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/CreatePDFSignatureResponseBuilder.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/CreatePDFSignatureResponseBuilder.java
@@ -33,8 +33,8 @@ import org.w3c.dom.Element;
 
 import at.gv.egovernment.moa.spss.MOASystemException;
 import at.gv.egovernment.moa.spss.api.xmlbind.ResponseBuilderUtils;
-import at.gv.egovernment.moa.util.Base64Utils;
-import at.gv.egovernment.moa.util.Constants;
+import at.gv.egovernment.moaspss.util.Base64Utils;
+import at.gv.egovernment.moaspss.util.Constants;
 
 /**
  * Convert a <code>CreateCMSSignatureResponse</code> API object into its XML
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/VerifyPDFRequestParser.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/VerifyPDFRequestParser.java
index 7601b31..66761e4 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/VerifyPDFRequestParser.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/VerifyPDFRequestParser.java
@@ -7,10 +7,10 @@ import org.w3c.dom.Element;
 
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.api.xmlbind.RequestParserUtils;
-import at.gv.egovernment.moa.util.Base64Utils;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
+import at.gv.egovernment.moaspss.util.Base64Utils;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.DOMUtils;
+import at.gv.egovernment.moaspss.util.XPathUtils;
 
 public class VerifyPDFRequestParser {
 
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/VerifyPDFResponse.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/VerifyPDFResponse.java
index 76746cf..c162529 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/VerifyPDFResponse.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/VerifyPDFResponse.java
@@ -2,10 +2,10 @@ package at.gv.egovernment.moa.spss.server.xmlbind;
 
 import java.util.List;
 
-import at.gv.egiz.pdfas.lib.api.verify.VerifyResult;
+//import at.gv.egiz.pdfas.lib.api.verify.VerifyResult;
 
 public class VerifyPDFResponse {
-	private List<VerifyResult> verificationResults = null;
+	/*private List<VerifyResult> verificationResults = null;
 
 	public VerifyPDFResponse() {
 	}
@@ -16,5 +16,5 @@ public class VerifyPDFResponse {
 
 	public synchronized void setVerificationResults(List<VerifyResult> verificationResults) {
 		this.verificationResults = verificationResults;
-	}
+	}*/
 }
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/VerifyPDFResponseBuilder.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/VerifyPDFResponseBuilder.java
index 705eff6..cb3c66b 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/VerifyPDFResponseBuilder.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/xmlbind/VerifyPDFResponseBuilder.java
@@ -5,13 +5,13 @@ import java.util.Iterator;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import at.gv.egiz.pdfas.lib.api.verify.VerifyResult;
+//import at.gv.egiz.pdfas.lib.api.verify.VerifyResult;
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.MOAException;
 import at.gv.egovernment.moa.spss.MOASystemException;
 import at.gv.egovernment.moa.spss.api.xmlbind.ResponseBuilderUtils;
 import at.gv.egovernment.moa.spss.server.pdfas.ExtendedVerifyResult;
-import at.gv.egovernment.moa.util.Constants;
+import at.gv.egovernment.moaspss.util.Constants;
 
 public class VerifyPDFResponseBuilder {
 	private static final String MOA_NS_URI = Constants.MOA_NS_URI;
@@ -44,7 +44,7 @@ public class VerifyPDFResponseBuilder {
 	 * @return A document containing the <code>CreateCMSSignatureResponse</code>
 	 *         DOM element.
 	 */
-	public Document build(VerifyPDFResponse response) throws MOAException {
+	/*public Document build(VerifyPDFResponse response) throws MOAException {
 		if(response.getVerificationResults() == null) {
 			throw new MOAApplicationException("No verification results available", null);
 		}
@@ -106,5 +106,5 @@ public class VerifyPDFResponseBuilder {
 			      (String)null);
 
 		responseElem.appendChild(pdfSignature);
-	}
+	}*/
 }
diff --git a/moaSig/moa-sig/src/main/resources/log4j.properties b/moaSig/moa-sig/src/main/resources/log4j.properties
new file mode 100644
index 0000000..7beb0c5
--- /dev/null
+++ b/moaSig/moa-sig/src/main/resources/log4j.properties
@@ -0,0 +1,38 @@
+#
+# Sample log4j configuration for the MOA-SPSS web service
+#
+
+# commons-logging setup
+org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory
+
+# Configure root logger and loggers for moa-spss
+log4j.rootLogger=TRACE, stdout
+log4j.logger.moa.spss.server=TRACE, stdout, moaspss
+log4j.logger.iaik.server=TRACE, stdout, moaspss
+log4j.logger.at.gv.egovernment.moa.spss=TRACE, stdout, moaspss
+
+# Configure the 'stdout' appender to write logging output to the console
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %C{1} | %20c |  %10t | %m%n
+
+# Configure the 'moaspss' appender to write moa-spss related logging output
+# to the file '${catalina.base}/logs/moa-spss.log'. The file is rolled over every 1000KB,
+# and a maximum history of 10 log files is being kept.
+log4j.appender.moaspss=org.apache.log4j.RollingFileAppender
+log4j.appender.moaspss.File=${catalina.base}/logs/moa-spss.log
+log4j.appender.moaspss.MaxFileSize=1000KB
+log4j.appender.moaspss.MaxBackupIndex=10
+log4j.appender.moaspss.layout=org.apache.log4j.PatternLayout
+log4j.appender.moaspss.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %C{1} | %20c |  %10t | %m%n
+
+# Configure the jdbc appender 'JDBC' to write logging output
+# to the given PostgreSQL database
+# a suitable table called 'spss_log' must have been created in the
+# database using the command:
+# create table spss_log (log_time timestamp, log_level char(5), log_msg text)
+#log4j.appender.JDBC=org.apache.log4j.jdbc.JDBCAppender
+#log4j.appender.JDBC.driver=org.postgresql.Driver
+#log4j.appender.JDBC.URL=jdbc:postgresql://10.16.46.108/moa?user=moa&password=moatest
+#log4j.appender.JDBC.layout=org.apache.log4j.PatternLayout
+#log4j.appender.JDBC.sql=INSERT INTO spss_log (log_time, log_level, log_msg) VALUES ('%d{ yyyy-MM-dd HH:mm:ss.SSS}', '%5p', '%m')
diff --git a/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SIG-3.0.0.xsd b/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SIG-3.0.0.xsd
index 63e82a2..55f0259 100644
--- a/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SIG-3.0.0.xsd
+++ b/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SIG-3.0.0.xsd
@@ -133,7 +133,7 @@
 	<xsd:element name="CreateXMLSignatureResponse" type="CreateXMLSignatureResponseType" />
 	<!--########## Create PDF Signature ### -->
 	<!--### Create PDF Signature Request ### -->
-	<xsd:element name="CreatePDFSignatureRequest">
+	<!--xsd:element name="CreatePDFSignatureRequest">
 		<xsd:complexType>
 			<xsd:complexContent>
 				<xsd:extension base="CreatePDFSignatureRequestType" />
@@ -161,15 +161,15 @@
 				</xsd:complexType>
 			</xsd:element>
 		</xsd:sequence>
-	</xsd:complexType>
+	</xsd:complexType-->
 	<!--### Create PDF Signature Response ### -->
-	<xsd:element name="CreatePDFSignatureResponse" type="CreatePDFSignatureResponseType" />
+	<!--xsd:element name="CreatePDFSignatureResponse" type="CreatePDFSignatureResponseType" />
 	<xsd:complexType name="CreatePDFSignatureResponseType">
 		<xsd:sequence>
 			<xsd:element name="PDFSignature" type="PDFSignedRepsonse"
 				maxOccurs="unbounded" />
 		</xsd:sequence>
-	</xsd:complexType>
+	</xsd:complexType-->
 	<!--########## Verify CMS Signature ### -->
 	<!--### Verifiy CMS Signature Request ### -->
 	<xsd:element name="VerifyCMSSignatureRequest">
@@ -186,6 +186,7 @@
 		<xsd:sequence>
 			<xsd:element name="DateTime" type="xsd:dateTime"
 				minOccurs="0" />
+			<xsd:element name="ExtendedValidation" type="xsd:boolean" minOccurs="0" default="false"/>
 			<xsd:element name="CMSSignature" type="xsd:base64Binary" />
 			<xsd:element name="DataObject" type="CMSDataObjectOptionalMetaType"
 				minOccurs="0" />
@@ -230,6 +231,7 @@
 		<xsd:sequence>
 			<xsd:element name="DateTime" type="xsd:dateTime"
 				minOccurs="0" />
+			<xsd:element name="ExtendedValidation" type="xsd:boolean" minOccurs="0" default="false"/>
 			<xsd:element name="PDFSignature" type="xsd:base64Binary" />
 			<xsd:element name="TrustProfileID" type="xsd:token">
 				<xsd:annotation>
@@ -277,11 +279,12 @@
 		<xsd:sequence>
 			<xsd:element name="DateTime" type="xsd:dateTime"
 				minOccurs="0" />
+			<xsd:element name="ExtendedValidation" type="xsd:boolean" minOccurs="0" default="false"/>
 			<xsd:element name="VerifySignatureInfo">
 				<xsd:complexType>
 					<xsd:sequence>
 						<xsd:element name="VerifySignatureEnvironment" type="ContentOptionalRefType" />
-						<xsd:element name="VerifySignatureLocation" type="xsd:token" />
+						<xsd:element name="VerifySignatureLocation" type="XMLSignatureLocationType" />
 					</xsd:sequence>
 				</xsd:complexType>
 			</xsd:element>
@@ -648,6 +651,19 @@
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
+	<xsd:complexType name="XMLSignatureLocationType">
+	<xsd:sequence>
+		<xsd:element name="NamespaceDeclaration" type="NamespaceDeclarationType" minOccurs="0" maxOccurs="unbounded"/>
+		<xsd:element name="XPathExpression" type="xsd:token" minOccurs="1" maxOccurs="1"/>
+	</xsd:sequence>
+	</xsd:complexType>
+	<xsd:complexType name="NamespaceDeclarationType">
+		<xsd:simpleContent>
+			<xsd:extension base="xsd:token">
+				<xsd:attribute name="prefix" use="required" type="xsd:string"/>
+			</xsd:extension>
+		</xsd:simpleContent>
+	</xsd:complexType>
 	<xsd:element name="SecureSignatureCreationDevice">
 		<xsd:complexType>
 			<xsd:attribute name="source" use="optional">
diff --git a/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.wsdl b/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.wsdl
index 03b14ba..00bf4c5 100644
--- a/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.wsdl
+++ b/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.wsdl
@@ -10,12 +10,12 @@
 	<message name="CreateCMSSignatureOutput">

 		<part name="body" element="moa:CreateCMSSignatureResponse"/>

 	</message>

-	<message name="CreatePDFSignatureInput">

+	<!-- message name="CreatePDFSignatureInput">

 		<part name="body" element="moa:CreatePDFSignatureRequest"/>

 	</message>

 	<message name="CreatePDFSignatureOutput">

 		<part name="body" element="moa:CreatePDFSignatureResponse"/>

-	</message>

+	</message-->

 	<message name="CreateXMLSignatureInput">

 		<part name="body" element="moa:CreateXMLSignatureRequest"/>

 	</message>

@@ -54,11 +54,11 @@
 			<output message="tns:CreateCMSSignatureOutput"/>

 			<fault name="MOAFault" message="tns:MOAFault"/>

 		</operation>

-		<operation name="createPDFSignature">

+		<!-- operation name="createPDFSignature">

 			<input message="tns:CreatePDFSignatureInput"/>

 			<output message="tns:CreatePDFSignatureOutput"/>

 			<fault name="MOAFault" message="tns:MOAFault"/>

-		</operation>

+		</operation-->

 	</portType>

 	<portType name="SignatureVerificationPortType">

 		<operation name="verifyCMSSignature">

@@ -103,7 +103,7 @@
 				<!-- soap:fault name="" use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/-->

 			</fault>

 		</operation>

-		<operation name="createPDFSignature">

+		<!-- operation name="createPDFSignature">

 			<soap:operation soapAction="urn:CreatePDFSignatureAction"/>

 			<input>

 				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>

@@ -111,10 +111,10 @@
 			<output>

 				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>

 			</output>

-			<fault name="MOAFault">

+			<fault name="MOAFault"-->

 				<!-- soap:fault name="" use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/-->

-			</fault>

-		</operation>

+			<!-- /fault>

+		</operation-->

 	</binding>

 	<binding name="SignatureVerificationBinding" type="tns:SignatureVerificationPortType">

 		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>

diff --git a/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.xsd b/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.xsd
index 67a897c..a12dc09 100644
--- a/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.xsd
+++ b/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.xsd
@@ -166,6 +166,7 @@
 	<xsd:complexType name="VerifyCMSSignatureRequestType">
 		<xsd:sequence>
 			<xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
+			<xsd:element name="ExtendedValidation" type="xsd:boolean" minOccurs="0" default="false"/>
 			<xsd:element name="CMSSignature" type="xsd:base64Binary"/>
 			<xsd:element name="DataObject" type="CMSDataObjectOptionalMetaType" minOccurs="0"/>
 			<xsd:element name="TrustProfileID" type="xsd:token">
@@ -186,6 +187,7 @@
 			</xsd:element>
 			<xsd:element name="SignatureCheck" type="CheckResultType"/>
 			<xsd:element name="CertificateCheck" type="CheckResultType"/>
+			<xsd:element name="FormCheckResult" type="FormResultType" minOccurs="0" maxOccurs="unbounded"/>
 		</xsd:sequence>
 	</xsd:complexType>
 	<!--########## Verify PDF Signature ###-->
@@ -200,6 +202,7 @@
 	<xsd:complexType name="VerifyPDFSignatureRequestType">
 		<xsd:sequence>
 			<xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
+			<xsd:element name="ExtendedValidation" type="xsd:boolean" minOccurs="0" default="false"/>
 			<xsd:element name="PDFSignature" type="xsd:base64Binary"/>
 			<xsd:element name="TrustProfileID" type="xsd:token">
 				<xsd:annotation>
@@ -224,6 +227,7 @@
 			</xsd:element>
 			<xsd:element name="SignatureCheck" type="CheckResultType"/>
 			<xsd:element name="CertificateCheck" type="CheckResultType"/>
+			<xsd:element name="FormCheckResult" type="FormResultType" minOccurs="0" maxOccurs="unbounded"/>
 		</xsd:sequence>
 	</xsd:complexType>
 	<!--########## Verify XML Signature ###-->
@@ -232,6 +236,7 @@
 	<xsd:complexType name="VerifyXMLSignatureRequestType">
 		<xsd:sequence>
 			<xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
+			<xsd:element name="ExtendedValidation" type="xsd:boolean" minOccurs="0" default="false"/>
 			<xsd:element name="VerifySignatureInfo">
 				<xsd:complexType>
 					<xsd:sequence>
diff --git a/moaSig/moa-sig/src/main/webapp/WEB-INF/web.xml b/moaSig/moa-sig/src/main/webapp/WEB-INF/web.xml
index aca8e6a..667f084 100644
--- a/moaSig/moa-sig/src/main/webapp/WEB-INF/web.xml
+++ b/moaSig/moa-sig/src/main/webapp/WEB-INF/web.xml
@@ -1,9 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
-
 <web-app>
   <display-name>MOA SP-SS</display-name>
   <description>MOA Signature Creation and Verification Services</description>
@@ -16,29 +11,28 @@
   <servlet>
     <servlet-name>AxisServlet</servlet-name>
     <display-name>Apache-Axis Servlet</display-name>
-    <servlet-class>
-      org.apache.axis.transport.http.AxisServlet
-    </servlet-class>
+    <servlet-class>org.apache.axis.transport.http.AxisServlet</servlet-class>
   </servlet>
-  <servlet>
+  <!-- servlet>
 		<servlet-name>SimpleCXFNonSpringServlet</servlet-name>
 		<display-name>SimpleCXFNonSpringServlet</display-name>
 		<servlet-class>at.gv.egovernment.moa.spss.server.webservice.impl.SimpleCXFNonSpringServlet</servlet-class>
-	</servlet>
+		<load-on-startup>1</load-on-startup>
+	</servlet-->
   <servlet>
       <servlet-name>CertificateProviderServlet</servlet-name>
     <display-name>MOA Certificate Provider Servlet</display-name>
     <servlet-class>at.gv.egovernment.moa.spss.server.service.CertificateProviderServlet</servlet-class>
-    <load-on-startup>0</load-on-startup>
+    <load-on-startup>1</load-on-startup>
   </servlet>
   <servlet-mapping>
     <servlet-name>AxisServlet</servlet-name>
     <url-pattern>/services/*</url-pattern>
   </servlet-mapping>
-  <servlet-mapping>
+  <!-- servlet-mapping>
 		<servlet-name>SimpleCXFNonSpringServlet</servlet-name>
 		<url-pattern>/services2/*</url-pattern>
-	</servlet-mapping>
+	</servlet-mapping-->
   <servlet-mapping>
     <servlet-name>ConfigurationServlet</servlet-name>
     <url-pattern>/ConfigurationUpdate</url-pattern>
diff --git a/moaSig/moa-sig/src/main/webapp/schemas/MOA-SPSS-2.0.0.xsd b/moaSig/moa-sig/src/main/webapp/schemas/MOA-SPSS-2.0.0.xsd
index 3b852ca..a12dc09 100644
--- a/moaSig/moa-sig/src/main/webapp/schemas/MOA-SPSS-2.0.0.xsd
+++ b/moaSig/moa-sig/src/main/webapp/schemas/MOA-SPSS-2.0.0.xsd
@@ -166,6 +166,7 @@
 	<xsd:complexType name="VerifyCMSSignatureRequestType">
 		<xsd:sequence>
 			<xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
+			<xsd:element name="ExtendedValidation" type="xsd:boolean" minOccurs="0" default="false"/>
 			<xsd:element name="CMSSignature" type="xsd:base64Binary"/>
 			<xsd:element name="DataObject" type="CMSDataObjectOptionalMetaType" minOccurs="0"/>
 			<xsd:element name="TrustProfileID" type="xsd:token">
@@ -186,6 +187,7 @@
 			</xsd:element>
 			<xsd:element name="SignatureCheck" type="CheckResultType"/>
 			<xsd:element name="CertificateCheck" type="CheckResultType"/>
+			<xsd:element name="FormCheckResult" type="FormResultType" minOccurs="0" maxOccurs="unbounded"/>
 		</xsd:sequence>
 	</xsd:complexType>
 	<!--########## Verify PDF Signature ###-->
@@ -200,6 +202,7 @@
 	<xsd:complexType name="VerifyPDFSignatureRequestType">
 		<xsd:sequence>
 			<xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
+			<xsd:element name="ExtendedValidation" type="xsd:boolean" minOccurs="0" default="false"/>
 			<xsd:element name="PDFSignature" type="xsd:base64Binary"/>
 			<xsd:element name="TrustProfileID" type="xsd:token">
 				<xsd:annotation>
@@ -224,6 +227,7 @@
 			</xsd:element>
 			<xsd:element name="SignatureCheck" type="CheckResultType"/>
 			<xsd:element name="CertificateCheck" type="CheckResultType"/>
+			<xsd:element name="FormCheckResult" type="FormResultType" minOccurs="0" maxOccurs="unbounded"/>
 		</xsd:sequence>
 	</xsd:complexType>
 	<!--########## Verify XML Signature ###-->
@@ -232,6 +236,7 @@
 	<xsd:complexType name="VerifyXMLSignatureRequestType">
 		<xsd:sequence>
 			<xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
+			<xsd:element name="ExtendedValidation" type="xsd:boolean" minOccurs="0" default="false"/>
 			<xsd:element name="VerifySignatureInfo">
 				<xsd:complexType>
 					<xsd:sequence>
@@ -279,6 +284,7 @@
 			<xsd:element name="SignatureManifestCheck" type="ReferencesCheckResultType" minOccurs="0"/>
 			<xsd:element name="XMLDSIGManifestCheck" type="ManifestRefsCheckResultType" minOccurs="0" maxOccurs="unbounded"/>
 			<xsd:element name="CertificateCheck" type="CheckResultType"/>
+			<xsd:element name="FormCheckResult" type="FormResultType" minOccurs="0" maxOccurs="unbounded"/>
 		</xsd:sequence>
 	</xsd:complexType>
 	<xsd:simpleType name="ProfileIdentifierType">
@@ -412,6 +418,12 @@
 			<xsd:element name="Info" type="AnyChildrenType" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
+	<xsd:complexType name="FormResultType">
+		<xsd:sequence>
+			<xsd:element name="Code" type="xsd:nonNegativeInteger" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="Name" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+		</xsd:sequence>
+	</xsd:complexType>
 	<xsd:complexType name="ReferencesCheckResultType">
 		<xsd:complexContent>
 			<xsd:restriction base="CheckResultType">