Feature 41 implementiert.

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

15 files changed, 1226 insertions, 42 deletions

diff --git a/spss.server/.cvsignore b/spss.server/.cvsignore
index 7c18d5ded..795bc497e 100644
--- a/spss.server/.cvsignore
+++ b/spss.server/.cvsignore
@@ -1,2 +1,3 @@
 bin
 tmp
+releases
diff --git a/spss.server/build.xml b/spss.server/build.xml
index 17408cb10..c0021a96d 100644
--- a/spss.server/build.xml
+++ b/spss.server/build.xml
@@ -11,7 +11,7 @@
 <project name="moa-spss-server" default="deploy-catalina" basedir=".">
   <property environment="env"/>
   <property name="script-suffix" value="${env.SCRIPT_SUFFIX}"/>
-  <property name="version" value="1.1.0"/>
+  <property name="version" value="1.2.0D01"/>
   <property name="src" value="src"/>
   <property name="lib" value="lib"/>
   <property name="res" value="res"/>
@@ -118,7 +118,7 @@
       <classes file="${data}/deploy/conf/moa-spss/log4j.properties"/>
       <webinf file="server-config.wsdd"/>
       <webinf dir="${data}/deploy" includes="conf/**"/>
-      <zipfileset file="${res}/resources/wsdl/MOA-SPSS-1.1.xsd" prefix="resources/schemas"/>
+      <zipfileset file="${res}/resources/wsdl/MOA-SPSS-1.2.xsd" prefix="resources/schemas"/>
     </war>
   </target>
   
diff --git a/spss.server/doc/moa_spss/MOA-SPSS-1.2.xsd b/spss.server/doc/moa_spss/MOA-SPSS-1.2.xsd
new file mode 100644
index 000000000..b1b89bc30
--- /dev/null
+++ b/spss.server/doc/moa_spss/MOA-SPSS-1.2.xsd
@@ -0,0 +1,444 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!-- edited with XMLSPY v2004 rel. 2 U (http://www.xmlspy.com) by Gregor Karlinger (Bundeskanzleramt) -->

+<!--

+  MOA SP/SS 1.2 Schema

+-->

+<xsd:schema targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2">

+  <xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>

+  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>

+  <!--########## Create XML Signature ###-->

+  <!--### Create XML Signature Request ###-->

+  <xsd:element name="CreateXMLSignatureRequest">

+    <xsd:complexType>

+      <xsd:complexContent>

+        <xsd:extension base="CreateXMLSignatureRequestType"/>

+      </xsd:complexContent>

+    </xsd:complexType>

+  </xsd:element>

+  <xsd:complexType name="CreateXMLSignatureRequestType">

+    <xsd:sequence>

+      <xsd:element name="KeyIdentifier" type="KeyIdentifierType"/>

+      <xsd:element name="SingleSignatureInfo" maxOccurs="unbounded">

+        <xsd:annotation>

+          <xsd:documentation>Ermöglichung der Stapelsignatur durch wiederholte Angabe dieses Elements</xsd:documentation>

+        </xsd:annotation>

+        <xsd:complexType>

+          <xsd:sequence>

+            <xsd:element name="DataObjectInfo" maxOccurs="unbounded">

+              <xsd:complexType>

+                <xsd:complexContent>

+                  <xsd:extension base="DataObjectInfoType">

+                    <xsd:attribute name="ChildOfManifest" type="xsd:boolean" use="optional" default="false"/>

+                  </xsd:extension>

+                </xsd:complexContent>

+              </xsd:complexType>

+            </xsd:element>

+            <xsd:element name="CreateSignatureInfo" minOccurs="0">

+              <xsd:complexType>

+                <xsd:sequence>

+                  <xsd:element name="CreateSignatureEnvironment" type="ContentOptionalRefType"/>

+                  <xsd:choice>

+                    <xsd:annotation>

+                      <xsd:documentation>Auswahl: Entweder explizite Angabe des Signaturorts sowie ggf. sinnvoller Supplements im Zshg. mit der Signaturumgebung, oder Verweis auf ein benanntes Profil</xsd:documentation>

+                    </xsd:annotation>

+                    <xsd:element ref="CreateSignatureEnvironmentProfile"/>

+                    <xsd:element name="CreateSignatureEnvironmentProfileID" type="ProfileIdentifierType"/>

+                  </xsd:choice>

+                </xsd:sequence>

+              </xsd:complexType>

+            </xsd:element>

+          </xsd:sequence>

+          <xsd:attribute name="SecurityLayerConformity" type="xsd:boolean" use="optional" default="true"/>

+        </xsd:complexType>

+      </xsd:element>

+    </xsd:sequence>

+  </xsd:complexType>

+  <!--### Create XML Signature Response ###-->

+  <xsd:complexType name="CreateXMLSignatureResponseType">

+    <xsd:choice maxOccurs="unbounded">

+      <xsd:annotation>

+        <xsd:documentation>Kardinalität 1..oo erlaubt die Antwort auf eine Stapelsignatur-Anfrage</xsd:documentation>

+      </xsd:annotation>

+      <xsd:element name="SignatureEnvironment">

+        <xsd:annotation>

+          <xsd:documentation>Resultat, falls die Signaturerstellung erfolgreich war</xsd:documentation>

+        </xsd:annotation>

+        <xsd:complexType>

+          <xsd:sequence>

+            <xsd:any namespace="##any" processContents="lax"/>

+          </xsd:sequence>

+        </xsd:complexType>

+      </xsd:element>

+      <xsd:element ref="ErrorResponse"/>

+    </xsd:choice>

+  </xsd:complexType>

+  <xsd:element name="CreateXMLSignatureResponse" type="CreateXMLSignatureResponseType"/>

+  <!--########## Verify CMS Signature ###-->

+  <!--### Verifiy CMS Signature Request ###-->

+  <xsd:element name="VerifyCMSSignatureRequest">

+    <xsd:complexType>

+      <xsd:complexContent>

+        <xsd:extension base="VerifyCMSSignatureRequestType">

+          <xsd:attribute name="Signatories" type="SignatoriesType" use="optional" default="1"/>

+        </xsd:extension>

+      </xsd:complexContent>

+    </xsd:complexType>

+  </xsd:element>

+  <xsd:complexType name="VerifyCMSSignatureRequestType">

+    <xsd:sequence>

+      <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>

+      <xsd:element name="CMSSignature" type="xsd:base64Binary"/>

+      <xsd:element name="DataObject" type="CMSDataObjectOptionalMetaType" minOccurs="0"/>

+      <xsd:element name="TrustProfileID">

+        <xsd:annotation>

+          <xsd:documentation>mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert</xsd:documentation>

+        </xsd:annotation>

+      </xsd:element>

+    </xsd:sequence>

+  </xsd:complexType>

+  <!--### Verify CMS Signature Response ###-->

+  <xsd:element name="VerifyCMSSignatureResponse" type="VerifyCMSSignatureResponseType"/>

+  <xsd:complexType name="VerifyCMSSignatureResponseType">

+    <xsd:sequence maxOccurs="unbounded">

+      <xsd:element name="SignerInfo" type="dsig:KeyInfoType">

+        <xsd:annotation>

+          <xsd:documentation>only ds:X509Data and RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any;publicAuthority is included as X509Data/any</xsd:documentation>

+        </xsd:annotation>

+      </xsd:element>

+      <xsd:element name="SignatureCheck" type="CheckResultType"/>

+      <xsd:element name="CertificateCheck" type="CheckResultType"/>

+    </xsd:sequence>

+  </xsd:complexType>

+  <!--########## Verify XML Signature ###-->

+  <!--### Verify XML Signature Request ###-->

+  <xsd:element name="VerifyXMLSignatureRequest" type="VerifyXMLSignatureRequestType"/>

+  <xsd:complexType name="VerifyXMLSignatureRequestType">

+    <xsd:sequence>

+      <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>

+      <xsd:element name="VerifySignatureInfo">

+        <xsd:complexType>

+          <xsd:sequence>

+            <xsd:element name="VerifySignatureEnvironment" type="ContentOptionalRefType"/>

+            <xsd:element name="VerifySignatureLocation" type="xsd:token"/>

+          </xsd:sequence>

+        </xsd:complexType>

+      </xsd:element>

+      <xsd:choice minOccurs="0" maxOccurs="unbounded">

+        <xsd:element ref="SupplementProfile"/>

+        <xsd:element name="SupplementProfileID" type="xsd:string"/>

+      </xsd:choice>

+      <xsd:element name="SignatureManifestCheckParams" minOccurs="0">

+        <xsd:complexType>

+          <xsd:sequence>

+            <xsd:element name="ReferenceInfo" type="VerifyTransformsDataType" maxOccurs="unbounded">

+              <xsd:annotation>

+                <xsd:documentation>Pro dsig:Reference-Element in der zu überprüfenden XML-Signatur muss hier ein ReferenceInfo-Element erscheinen. Die Reihenfolge der einzelnen ReferenceInfo Elemente entspricht jener der dsig:Reference Elemente in der XML-Signatur.</xsd:documentation>

+              </xsd:annotation>

+            </xsd:element>

+          </xsd:sequence>

+          <xsd:attribute name="ReturnReferenceInputData" type="xsd:boolean" use="optional" default="true"/>

+        </xsd:complexType>

+      </xsd:element>

+      <xsd:element name="ReturnHashInputData" minOccurs="0"/>

+      <xsd:element name="TrustProfileID">

+        <xsd:annotation>

+          <xsd:documentation>mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert</xsd:documentation>

+        </xsd:annotation>

+      </xsd:element>

+    </xsd:sequence>

+  </xsd:complexType>

+  <!--### Verify XML Signature Response ###-->

+  <xsd:element name="VerifyXMLSignatureResponse" type="VerifyXMLSignatureResponseType"/>

+  <xsd:complexType name="VerifyXMLSignatureResponseType">

+    <xsd:sequence>

+      <xsd:element name="SignerInfo" type="dsig:KeyInfoType">

+        <xsd:annotation>

+          <xsd:documentation>only ds:X509Data and ds:RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any; PublicAuthority is included as X509Data/any</xsd:documentation>

+        </xsd:annotation>

+      </xsd:element>

+      <xsd:element name="HashInputData" type="ContentExLocRefBaseType" minOccurs="0" maxOccurs="unbounded"/>

+      <xsd:element name="ReferenceInputData" type="ContentExLocRefBaseType" minOccurs="0" maxOccurs="unbounded"/>

+      <xsd:element name="SignatureCheck" type="ReferencesCheckResultType"/>

+      <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:sequence>

+  </xsd:complexType>

+  <xsd:simpleType name="ProfileIdentifierType">

+    <xsd:restriction base="xsd:token"/>

+  </xsd:simpleType>

+  <xsd:complexType name="MetaInfoType">

+    <xsd:sequence>

+      <xsd:element name="MimeType" type="MimeTypeType"/>

+      <xsd:element name="Description" type="xsd:anyURI" minOccurs="0"/>

+      <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>

+    </xsd:sequence>

+  </xsd:complexType>

+  <xsd:complexType name="DataObjectInfoType">

+    <xsd:sequence>

+      <xsd:element name="DataObject">

+        <xsd:complexType>

+          <xsd:complexContent>

+            <xsd:extension base="ContentOptionalRefType"/>

+          </xsd:complexContent>

+        </xsd:complexType>

+      </xsd:element>

+      <xsd:choice>

+        <xsd:annotation>

+          <xsd:documentation>Auswahl: Entweder explizite Angabe EINER Transformationskette inklusive ggf. sinnvoller Supplements oder Verweis auf ein benanntes Profil</xsd:documentation>

+        </xsd:annotation>

+        <xsd:element ref="CreateTransformsInfoProfile"/>

+        <xsd:element name="CreateTransformsInfoProfileID" type="ProfileIdentifierType"/>

+      </xsd:choice>

+    </xsd:sequence>

+    <xsd:attribute name="Structure" use="required">

+      <xsd:simpleType>

+        <xsd:restriction base="xsd:string">

+          <xsd:enumeration value="detached"/>

+          <xsd:enumeration value="enveloping"/>

+        </xsd:restriction>

+      </xsd:simpleType>

+    </xsd:attribute>

+  </xsd:complexType>

+  <xsd:complexType name="TransformsInfoType">

+    <xsd:sequence>

+      <xsd:element ref="dsig:Transforms" minOccurs="0"/>

+      <xsd:element name="FinalDataMetaInfo" type="MetaInfoType"/>

+    </xsd:sequence>

+  </xsd:complexType>

+  <xsd:complexType name="XMLDataObjectAssociationType">

+    <xsd:sequence>

+      <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>

+      <xsd:element name="Content" type="ContentRequiredRefType"/>

+    </xsd:sequence>

+  </xsd:complexType>

+  <xsd:complexType name="CMSDataObjectOptionalMetaType">

+    <xsd:sequence>

+      <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>

+      <xsd:element name="Content" type="CMSContentBaseType"/>

+    </xsd:sequence>

+  </xsd:complexType>

+  <xsd:complexType name="CMSContentBaseType">

+    <xsd:complexContent>

+      <xsd:restriction base="ContentOptionalRefType">

+        <xsd:choice minOccurs="0">

+          <xsd:element name="Base64Content" type="xsd:base64Binary"/>

+        </xsd:choice>

+      </xsd:restriction>

+    </xsd:complexContent>

+  </xsd:complexType>

+  <xsd:complexType name="CheckResultType">

+    <xsd:sequence>

+      <xsd:element name="Code" type="xsd:nonNegativeInteger"/>

+      <xsd:element name="Info" type="AnyChildrenType" minOccurs="0"/>

+    </xsd:sequence>

+  </xsd:complexType>

+  <xsd:complexType name="ReferencesCheckResultType">

+    <xsd:complexContent>

+      <xsd:restriction base="CheckResultType">

+        <xsd:sequence>

+          <xsd:element name="Code" type="xsd:nonNegativeInteger"/>

+          <xsd:element name="Info" type="ReferencesCheckResultInfoType" minOccurs="0"/>

+        </xsd:sequence>

+      </xsd:restriction>

+    </xsd:complexContent>

+  </xsd:complexType>

+  <xsd:complexType name="ReferencesCheckResultInfoType" mixed="true">

+    <xsd:complexContent mixed="true">

+      <xsd:restriction base="AnyChildrenType">

+        <xsd:sequence>

+          <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

+          <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>

+        </xsd:sequence>

+      </xsd:restriction>

+    </xsd:complexContent>

+  </xsd:complexType>

+  <xsd:complexType name="ManifestRefsCheckResultType">

+    <xsd:complexContent>

+      <xsd:restriction base="CheckResultType">

+        <xsd:sequence>

+          <xsd:element name="Code" type="xsd:nonNegativeInteger"/>

+          <xsd:element name="Info" type="ManifestRefsCheckResultInfoType"/>

+        </xsd:sequence>

+      </xsd:restriction>

+    </xsd:complexContent>

+  </xsd:complexType>

+  <xsd:complexType name="ManifestRefsCheckResultInfoType" mixed="true">

+    <xsd:complexContent mixed="true">

+      <xsd:extension base="ReferencesCheckResultInfoType">

+        <xsd:sequence>

+          <xsd:element name="ReferringSigReference" type="xsd:positiveInteger"/>

+        </xsd:sequence>

+      </xsd:extension>

+    </xsd:complexContent>

+  </xsd:complexType>

+  <!--########## Error Response ###-->

+  <xsd:element name="ErrorResponse" type="ErrorResponseType">

+    <xsd:annotation>

+      <xsd:documentation>Resultat, falls die Signaturerstellung gescheitert ist</xsd:documentation>

+    </xsd:annotation>

+  </xsd:element>

+  <xsd:complexType name="ErrorResponseType">

+    <xsd:sequence>

+      <xsd:element name="ErrorCode" type="xsd:integer"/>

+      <xsd:element name="Info" type="xsd:string"/>

+    </xsd:sequence>

+  </xsd:complexType>

+  <!--########## Auxiliary Types ###-->

+  <xsd:simpleType name="KeyIdentifierType">

+    <xsd:restriction base="xsd:string"/>

+  </xsd:simpleType>

+  <xsd:simpleType name="KeyStorageType">

+    <xsd:restriction base="xsd:string">

+      <xsd:enumeration value="Software"/>

+      <xsd:enumeration value="Hardware"/>

+    </xsd:restriction>

+  </xsd:simpleType>

+  <xsd:simpleType name="MimeTypeType">

+    <xsd:restriction base="xsd:token"/>

+  </xsd:simpleType>

+  <xsd:complexType name="AnyChildrenType" mixed="true">

+    <xsd:sequence minOccurs="0" maxOccurs="unbounded">

+      <xsd:any namespace="##any" processContents="lax"/>

+    </xsd:sequence>

+  </xsd:complexType>

+  <xsd:complexType name="XMLContentType" mixed="true">

+    <xsd:complexContent mixed="true">

+      <xsd:extension base="AnyChildrenType">

+        <xsd:attribute ref="xml:space" use="optional"/>

+      </xsd:extension>

+    </xsd:complexContent>

+  </xsd:complexType>

+  <xsd:complexType name="ContentBaseType">

+    <xsd:choice minOccurs="0">

+      <xsd:element name="Base64Content" type="xsd:base64Binary"/>

+      <xsd:element name="XMLContent" type="XMLContentType"/>

+      <xsd:element name="LocRefContent" type="xsd:anyURI"/>

+    </xsd:choice>

+  </xsd:complexType>

+  <xsd:complexType name="ContentExLocRefBaseType">

+    <xsd:complexContent>

+      <xsd:restriction base="ContentBaseType">

+        <xsd:choice minOccurs="0">

+          <xsd:element name="Base64Content" type="xsd:base64Binary"/>

+          <xsd:element name="XMLContent" type="XMLContentType"/>

+        </xsd:choice>

+      </xsd:restriction>

+    </xsd:complexContent>

+  </xsd:complexType>

+  <xsd:complexType name="ContentOptionalRefType">

+    <xsd:complexContent>

+      <xsd:extension base="ContentBaseType">

+        <xsd:attribute name="Reference" type="xsd:anyURI" use="optional"/>

+      </xsd:extension>

+    </xsd:complexContent>

+  </xsd:complexType>

+  <xsd:complexType name="ContentRequiredRefType">

+    <xsd:complexContent>

+      <xsd:restriction base="ContentOptionalRefType">

+        <xsd:choice minOccurs="0">

+          <xsd:element name="Base64Content" type="xsd:base64Binary"/>

+          <xsd:element name="XMLContent" type="XMLContentType"/>

+          <xsd:element name="LocRefContent" type="xsd:anyURI"/>

+        </xsd:choice>

+        <xsd:attribute name="Reference" type="xsd:anyURI" use="required"/>

+      </xsd:restriction>

+    </xsd:complexContent>

+  </xsd:complexType>

+  <xsd:complexType name="VerifyTransformsDataType">

+    <xsd:choice maxOccurs="unbounded">

+      <xsd:annotation>

+        <xsd:documentation>Ein oder mehrere Transformationswege können von der Applikation an MOA mitgeteilt werden. Die zu prüfende Signatur hat zumindest einem dieser Transformationswege zu entsprechen. Die Angabe kann explizit oder als Profilbezeichner erfolgen.</xsd:documentation>

+      </xsd:annotation>

+      <xsd:element ref="VerifyTransformsInfoProfile"/>

+      <xsd:element name="VerifyTransformsInfoProfileID" type="xsd:string">

+        <xsd:annotation>

+          <xsd:documentation>Profilbezeichner für einen Transformationsweg</xsd:documentation>

+        </xsd:annotation>

+      </xsd:element>

+    </xsd:choice>

+  </xsd:complexType>

+  <xsd:element name="QualifiedCertificate"/>

+  <xsd:element name="PublicAuthority" type="PublicAuthorityType"/>

+  <xsd:complexType name="PublicAuthorityType">

+    <xsd:sequence>

+      <xsd:element name="Code" type="xsd:string" minOccurs="0"/>

+    </xsd:sequence>

+  </xsd:complexType>

+  <xsd:simpleType name="SignatoriesType">

+    <xsd:union memberTypes="AllSignatoriesType">

+      <xsd:simpleType>

+        <xsd:list itemType="xsd:positiveInteger"/>

+      </xsd:simpleType>

+    </xsd:union>

+  </xsd:simpleType>

+  <xsd:simpleType name="AllSignatoriesType">

+    <xsd:restriction base="xsd:string">

+      <xsd:enumeration value="all"/>

+    </xsd:restriction>

+  </xsd:simpleType>

+  <xsd:complexType name="CreateSignatureLocationType">

+    <xsd:simpleContent>

+      <xsd:extension base="xsd:token">

+        <xsd:attribute name="Index" type="xsd:nonNegativeInteger" use="required"/>

+      </xsd:extension>

+    </xsd:simpleContent>

+  </xsd:complexType>

+  <xsd:complexType name="TransformParameterType">

+    <xsd:choice minOccurs="0">

+      <xsd:annotation>

+        <xsd:documentation>Die Angabe des Transformationsparameters (explizit oder als Hashwert) kann unterlassen werden, wenn die Applikation von der Unveränderlichkeit des Inhalts der in "Transformationsparamter", Attribut "URI" angegebenen URI ausgehen kann.</xsd:documentation>

+      </xsd:annotation>

+      <xsd:element name="Base64Content" type="xsd:base64Binary">

+        <xsd:annotation>

+          <xsd:documentation>Der Transformationsparameter explizit angegeben.</xsd:documentation>

+        </xsd:annotation>

+      </xsd:element>

+      <xsd:element name="Hash">

+        <xsd:annotation>

+          <xsd:documentation>Der Hashwert des Transformationsparameters.</xsd:documentation>

+        </xsd:annotation>

+        <xsd:complexType>

+          <xsd:sequence>

+            <xsd:element ref="dsig:DigestMethod"/>

+            <xsd:element ref="dsig:DigestValue"/>

+          </xsd:sequence>

+        </xsd:complexType>

+      </xsd:element>

+    </xsd:choice>

+    <xsd:attribute name="URI" type="xsd:anyURI" use="required"/>

+  </xsd:complexType>

+  <xsd:element name="CreateSignatureEnvironmentProfile">

+    <xsd:complexType>

+      <xsd:sequence>

+        <xsd:element name="CreateSignatureLocation" type="CreateSignatureLocationType"/>

+        <xsd:element name="Supplement" type="XMLDataObjectAssociationType" minOccurs="0" maxOccurs="unbounded"/>

+      </xsd:sequence>

+    </xsd:complexType>

+  </xsd:element>

+  <xsd:element name="VerifyTransformsInfoProfile">

+    <xsd:annotation>

+      <xsd:documentation>Explizite Angabe des Transformationswegs</xsd:documentation>

+    </xsd:annotation>

+    <xsd:complexType>

+      <xsd:sequence>

+        <xsd:element ref="dsig:Transforms" minOccurs="0"/>

+        <xsd:element name="TransformParameter" type="TransformParameterType" minOccurs="0" maxOccurs="unbounded">

+          <xsd:annotation>

+            <xsd:documentation>Alle impliziten Transformationsparameter, die zum Durchlaufen der oben angeführten Transformationskette bekannt sein müssen, müssen hier angeführt werden. Das Attribut "URI" bezeichnet den Transformationsparameter in exakt jener Weise, wie er in der zu überprüfenden Signatur gebraucht wird.</xsd:documentation>

+          </xsd:annotation>

+        </xsd:element>

+      </xsd:sequence>

+    </xsd:complexType>

+  </xsd:element>

+  <xsd:element name="Supplement" type="XMLDataObjectAssociationType"/>

+  <xsd:element name="SupplementProfile" type="XMLDataObjectAssociationType"/>

+  <xsd:element name="CreateTransformsInfoProfile">

+    <xsd:complexType>

+      <xsd:sequence>

+        <xsd:element name="CreateTransformsInfo" type="TransformsInfoType"/>

+        <xsd:element ref="Supplement" minOccurs="0" maxOccurs="unbounded"/>

+      </xsd:sequence>

+    </xsd:complexType>

+  </xsd:element>

+</xsd:schema>

diff --git a/spss.server/res/resources/properties/spss_messages_de.properties b/spss.server/res/resources/properties/spss_messages_de.properties
index cab226a82..f98a6f84c 100644
--- a/spss.server/res/resources/properties/spss_messages_de.properties
+++ b/spss.server/res/resources/properties/spss_messages_de.properties
@@ -77,9 +77,14 @@
 2270=Fehler beim Decodieren des Hash-Wertes
 2271=Falsche Anzahl an ReferenceInfo Elementen in SignatureManfestCheckParams
 2280=Die Angabe XMLContent wird derzeit nicht unterstützt
+2281=XML-Supplement kann nicht serialisiert werden (Reference="{0}")
 
 2900=Interner Server-Fehler
 
+3201=Objekt kann nicht geladen werden (Reference="{0}", LocRef-URI="{0}")
+3202=Supplement für Signaturumgebung kann nicht geladen werden (Reference="{0}", LocRef-URI="{0}")
+3203=Signaturumgebung kann nicht geladen werden (Reference="{0}", LocRef-URI="{0}")
+
 9900=Nicht klassifizierter Fehler in Subsystem
 9901=Nicht klassifizierter Laufzeitfehler in Subsystem
 9999=Nicht klassifizierter Fehler
diff --git a/spss.server/res/resources/wsdl/MOA-SPSS-1.2.wsdl b/spss.server/res/resources/wsdl/MOA-SPSS-1.2.wsdl
new file mode 100644
index 000000000..b3f252562
--- /dev/null
+++ b/spss.server/res/resources/wsdl/MOA-SPSS-1.2.wsdl
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!-- 

+  Web Service Description for MOA SP/SS 1.2

+-->

+<definitions name="MOA" targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:xsd="http://www.w3.org/1999/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

+  <import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="../resources/schemas/MOA-SPSS-1.2.xsd"/>

+  <message name="CreateXMLSignatureInput">

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

+  </message>

+  <message name="CreateXMLSignatureOutput">

+    <part name="body" element="moa:CreateXMLSignatureResponse"/>

+  </message>

+  <message name="VerifyCMSSignatureInput">

+    <part name="body" element="moa:VerifyCMSSignatureRequest"/>

+  </message>

+  <message name="VerifyCMSSignatureOutput">

+    <part name="body" element="moa:VerifyCMSSignatureResponse"/>

+  </message>

+  <message name="VerifyXMLSignatureInput">

+    <part name="body" element="moa:VerifyXMLSignatureRequest"/>

+  </message>

+  <message name="VerifyXMLSignatureOutput">

+    <part name="body" element="moa:VerifyXMLSignatureResponse"/>

+  </message>

+  <message name="MOAFault">

+    <part name="body" element="moa:ErrorResponse"/>

+  </message>

+  <portType name="SignatureCreationPortType">

+    <operation name="createXMLSignature">

+      <input message="tns:CreateXMLSignatureInput"/>

+      <output message="tns:CreateXMLSignatureOutput"/>

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

+    </operation>

+  </portType>

+  <portType name="SignatureVerificationPortType">

+    <operation name="verifyCMSSignature">

+      <input message="tns:VerifyCMSSignatureInput"/>

+      <output message="tns:VerifyCMSSignatureOutput"/>

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

+    </operation>

+    <operation name="verifyXMLSignature">

+      <input message="tns:VerifyXMLSignatureInput"/>

+      <output message="tns:VerifyXMLSignatureOutput"/>

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

+    </operation>

+  </portType>

+  <binding name="SignatureCreationBinding" type="tns:SignatureCreationPortType">

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

+    <operation name="createXMLSignature">

+      <soap:operation soapAction="urn:CreateXMLSignatureAction"/>

+      <input>

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

+      </input>

+      <output>

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

+      </output>

+      <fault name="MOAFault">

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

+      </fault>

+    </operation>

+  </binding>

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

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

+    <operation name="verifyCMSSignature">

+      <soap:operation soapAction="urn:VerifyCMSSignatureAction"/>

+      <input>

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

+      </input>

+      <output>

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

+      </output>

+      <fault name="MOAFault">

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

+      </fault>

+    </operation>

+    <operation name="verifyXMLSignature">

+      <soap:operation soapAction="urn:VerifyXMLSignatureAction"/>

+      <input>

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

+      </input>

+      <output>

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

+      </output>

+      <fault name="MOAFault">

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

+      </fault>

+    </operation>

+  </binding>

+  <service name="SignatureCreationService">

+    <port name="SignatureCreationPort" binding="tns:SignatureCreationBinding">

+      <!--

+        Please note that the location URL must be adapted to the actual service URL.

+      -->

+      <soap:address location="http://localhost/moa-spss/services/SignatureCreation"/>

+    </port>

+  </service>

+  <service name="SignatureVerificationService">

+    <port name="SignatureVerificationPort" binding="tns:SignatureVerificationBinding">

+      <!--

+        Please note that the location URL must be adapted to the actual service URL.

+      -->

+      <soap:address location="http://localhost/moa-spss/services/SignatureVerification"/>

+    </port>

+  </service>

+</definitions>

diff --git a/spss.server/res/resources/wsdl/MOA-SPSS-1.2.xsd b/spss.server/res/resources/wsdl/MOA-SPSS-1.2.xsd
new file mode 100644
index 000000000..b1b89bc30
--- /dev/null
+++ b/spss.server/res/resources/wsdl/MOA-SPSS-1.2.xsd
@@ -0,0 +1,444 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!-- edited with XMLSPY v2004 rel. 2 U (http://www.xmlspy.com) by Gregor Karlinger (Bundeskanzleramt) -->

+<!--

+  MOA SP/SS 1.2 Schema

+-->

+<xsd:schema targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2">

+  <xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>

+  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>

+  <!--########## Create XML Signature ###-->

+  <!--### Create XML Signature Request ###-->

+  <xsd:element name="CreateXMLSignatureRequest">

+    <xsd:complexType>

+      <xsd:complexContent>

+        <xsd:extension base="CreateXMLSignatureRequestType"/>

+      </xsd:complexContent>

+    </xsd:complexType>

+  </xsd:element>

+  <xsd:complexType name="CreateXMLSignatureRequestType">

+    <xsd:sequence>

+      <xsd:element name="KeyIdentifier" type="KeyIdentifierType"/>

+      <xsd:element name="SingleSignatureInfo" maxOccurs="unbounded">

+        <xsd:annotation>

+          <xsd:documentation>Ermöglichung der Stapelsignatur durch wiederholte Angabe dieses Elements</xsd:documentation>

+        </xsd:annotation>

+        <xsd:complexType>

+          <xsd:sequence>

+            <xsd:element name="DataObjectInfo" maxOccurs="unbounded">

+              <xsd:complexType>

+                <xsd:complexContent>

+                  <xsd:extension base="DataObjectInfoType">

+                    <xsd:attribute name="ChildOfManifest" type="xsd:boolean" use="optional" default="false"/>

+                  </xsd:extension>

+                </xsd:complexContent>

+              </xsd:complexType>

+            </xsd:element>

+            <xsd:element name="CreateSignatureInfo" minOccurs="0">

+              <xsd:complexType>

+                <xsd:sequence>

+                  <xsd:element name="CreateSignatureEnvironment" type="ContentOptionalRefType"/>

+                  <xsd:choice>

+                    <xsd:annotation>

+                      <xsd:documentation>Auswahl: Entweder explizite Angabe des Signaturorts sowie ggf. sinnvoller Supplements im Zshg. mit der Signaturumgebung, oder Verweis auf ein benanntes Profil</xsd:documentation>

+                    </xsd:annotation>

+                    <xsd:element ref="CreateSignatureEnvironmentProfile"/>

+                    <xsd:element name="CreateSignatureEnvironmentProfileID" type="ProfileIdentifierType"/>

+                  </xsd:choice>

+                </xsd:sequence>

+              </xsd:complexType>

+            </xsd:element>

+          </xsd:sequence>

+          <xsd:attribute name="SecurityLayerConformity" type="xsd:boolean" use="optional" default="true"/>

+        </xsd:complexType>

+      </xsd:element>

+    </xsd:sequence>

+  </xsd:complexType>

+  <!--### Create XML Signature Response ###-->

+  <xsd:complexType name="CreateXMLSignatureResponseType">

+    <xsd:choice maxOccurs="unbounded">

+      <xsd:annotation>

+        <xsd:documentation>Kardinalität 1..oo erlaubt die Antwort auf eine Stapelsignatur-Anfrage</xsd:documentation>

+      </xsd:annotation>

+      <xsd:element name="SignatureEnvironment">

+        <xsd:annotation>

+          <xsd:documentation>Resultat, falls die Signaturerstellung erfolgreich war</xsd:documentation>

+        </xsd:annotation>

+        <xsd:complexType>

+          <xsd:sequence>

+            <xsd:any namespace="##any" processContents="lax"/>

+          </xsd:sequence>

+        </xsd:complexType>

+      </xsd:element>

+      <xsd:element ref="ErrorResponse"/>

+    </xsd:choice>

+  </xsd:complexType>

+  <xsd:element name="CreateXMLSignatureResponse" type="CreateXMLSignatureResponseType"/>

+  <!--########## Verify CMS Signature ###-->

+  <!--### Verifiy CMS Signature Request ###-->

+  <xsd:element name="VerifyCMSSignatureRequest">

+    <xsd:complexType>

+      <xsd:complexContent>

+        <xsd:extension base="VerifyCMSSignatureRequestType">

+          <xsd:attribute name="Signatories" type="SignatoriesType" use="optional" default="1"/>

+        </xsd:extension>

+      </xsd:complexContent>

+    </xsd:complexType>

+  </xsd:element>

+  <xsd:complexType name="VerifyCMSSignatureRequestType">

+    <xsd:sequence>

+      <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>

+      <xsd:element name="CMSSignature" type="xsd:base64Binary"/>

+      <xsd:element name="DataObject" type="CMSDataObjectOptionalMetaType" minOccurs="0"/>

+      <xsd:element name="TrustProfileID">

+        <xsd:annotation>

+          <xsd:documentation>mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert</xsd:documentation>

+        </xsd:annotation>

+      </xsd:element>

+    </xsd:sequence>

+  </xsd:complexType>

+  <!--### Verify CMS Signature Response ###-->

+  <xsd:element name="VerifyCMSSignatureResponse" type="VerifyCMSSignatureResponseType"/>

+  <xsd:complexType name="VerifyCMSSignatureResponseType">

+    <xsd:sequence maxOccurs="unbounded">

+      <xsd:element name="SignerInfo" type="dsig:KeyInfoType">

+        <xsd:annotation>

+          <xsd:documentation>only ds:X509Data and RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any;publicAuthority is included as X509Data/any</xsd:documentation>

+        </xsd:annotation>

+      </xsd:element>

+      <xsd:element name="SignatureCheck" type="CheckResultType"/>

+      <xsd:element name="CertificateCheck" type="CheckResultType"/>

+    </xsd:sequence>

+  </xsd:complexType>

+  <!--########## Verify XML Signature ###-->

+  <!--### Verify XML Signature Request ###-->

+  <xsd:element name="VerifyXMLSignatureRequest" type="VerifyXMLSignatureRequestType"/>

+  <xsd:complexType name="VerifyXMLSignatureRequestType">

+    <xsd:sequence>

+      <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>

+      <xsd:element name="VerifySignatureInfo">

+        <xsd:complexType>

+          <xsd:sequence>

+            <xsd:element name="VerifySignatureEnvironment" type="ContentOptionalRefType"/>

+            <xsd:element name="VerifySignatureLocation" type="xsd:token"/>

+          </xsd:sequence>

+        </xsd:complexType>

+      </xsd:element>

+      <xsd:choice minOccurs="0" maxOccurs="unbounded">

+        <xsd:element ref="SupplementProfile"/>

+        <xsd:element name="SupplementProfileID" type="xsd:string"/>

+      </xsd:choice>

+      <xsd:element name="SignatureManifestCheckParams" minOccurs="0">

+        <xsd:complexType>

+          <xsd:sequence>

+            <xsd:element name="ReferenceInfo" type="VerifyTransformsDataType" maxOccurs="unbounded">

+              <xsd:annotation>

+                <xsd:documentation>Pro dsig:Reference-Element in der zu überprüfenden XML-Signatur muss hier ein ReferenceInfo-Element erscheinen. Die Reihenfolge der einzelnen ReferenceInfo Elemente entspricht jener der dsig:Reference Elemente in der XML-Signatur.</xsd:documentation>

+              </xsd:annotation>

+            </xsd:element>

+          </xsd:sequence>

+          <xsd:attribute name="ReturnReferenceInputData" type="xsd:boolean" use="optional" default="true"/>

+        </xsd:complexType>

+      </xsd:element>

+      <xsd:element name="ReturnHashInputData" minOccurs="0"/>

+      <xsd:element name="TrustProfileID">

+        <xsd:annotation>

+          <xsd:documentation>mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert</xsd:documentation>

+        </xsd:annotation>

+      </xsd:element>

+    </xsd:sequence>

+  </xsd:complexType>

+  <!--### Verify XML Signature Response ###-->

+  <xsd:element name="VerifyXMLSignatureResponse" type="VerifyXMLSignatureResponseType"/>

+  <xsd:complexType name="VerifyXMLSignatureResponseType">

+    <xsd:sequence>

+      <xsd:element name="SignerInfo" type="dsig:KeyInfoType">

+        <xsd:annotation>

+          <xsd:documentation>only ds:X509Data and ds:RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any; PublicAuthority is included as X509Data/any</xsd:documentation>

+        </xsd:annotation>

+      </xsd:element>

+      <xsd:element name="HashInputData" type="ContentExLocRefBaseType" minOccurs="0" maxOccurs="unbounded"/>

+      <xsd:element name="ReferenceInputData" type="ContentExLocRefBaseType" minOccurs="0" maxOccurs="unbounded"/>

+      <xsd:element name="SignatureCheck" type="ReferencesCheckResultType"/>

+      <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:sequence>

+  </xsd:complexType>

+  <xsd:simpleType name="ProfileIdentifierType">

+    <xsd:restriction base="xsd:token"/>

+  </xsd:simpleType>

+  <xsd:complexType name="MetaInfoType">

+    <xsd:sequence>

+      <xsd:element name="MimeType" type="MimeTypeType"/>

+      <xsd:element name="Description" type="xsd:anyURI" minOccurs="0"/>

+      <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>

+    </xsd:sequence>

+  </xsd:complexType>

+  <xsd:complexType name="DataObjectInfoType">

+    <xsd:sequence>

+      <xsd:element name="DataObject">

+        <xsd:complexType>

+          <xsd:complexContent>

+            <xsd:extension base="ContentOptionalRefType"/>

+          </xsd:complexContent>

+        </xsd:complexType>

+      </xsd:element>

+      <xsd:choice>

+        <xsd:annotation>

+          <xsd:documentation>Auswahl: Entweder explizite Angabe EINER Transformationskette inklusive ggf. sinnvoller Supplements oder Verweis auf ein benanntes Profil</xsd:documentation>

+        </xsd:annotation>

+        <xsd:element ref="CreateTransformsInfoProfile"/>

+        <xsd:element name="CreateTransformsInfoProfileID" type="ProfileIdentifierType"/>

+      </xsd:choice>

+    </xsd:sequence>

+    <xsd:attribute name="Structure" use="required">

+      <xsd:simpleType>

+        <xsd:restriction base="xsd:string">

+          <xsd:enumeration value="detached"/>

+          <xsd:enumeration value="enveloping"/>

+        </xsd:restriction>

+      </xsd:simpleType>

+    </xsd:attribute>

+  </xsd:complexType>

+  <xsd:complexType name="TransformsInfoType">

+    <xsd:sequence>

+      <xsd:element ref="dsig:Transforms" minOccurs="0"/>

+      <xsd:element name="FinalDataMetaInfo" type="MetaInfoType"/>

+    </xsd:sequence>

+  </xsd:complexType>

+  <xsd:complexType name="XMLDataObjectAssociationType">

+    <xsd:sequence>

+      <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>

+      <xsd:element name="Content" type="ContentRequiredRefType"/>

+    </xsd:sequence>

+  </xsd:complexType>

+  <xsd:complexType name="CMSDataObjectOptionalMetaType">

+    <xsd:sequence>

+      <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>

+      <xsd:element name="Content" type="CMSContentBaseType"/>

+    </xsd:sequence>

+  </xsd:complexType>

+  <xsd:complexType name="CMSContentBaseType">

+    <xsd:complexContent>

+      <xsd:restriction base="ContentOptionalRefType">

+        <xsd:choice minOccurs="0">

+          <xsd:element name="Base64Content" type="xsd:base64Binary"/>

+        </xsd:choice>

+      </xsd:restriction>

+    </xsd:complexContent>

+  </xsd:complexType>

+  <xsd:complexType name="CheckResultType">

+    <xsd:sequence>

+      <xsd:element name="Code" type="xsd:nonNegativeInteger"/>

+      <xsd:element name="Info" type="AnyChildrenType" minOccurs="0"/>

+    </xsd:sequence>

+  </xsd:complexType>

+  <xsd:complexType name="ReferencesCheckResultType">

+    <xsd:complexContent>

+      <xsd:restriction base="CheckResultType">

+        <xsd:sequence>

+          <xsd:element name="Code" type="xsd:nonNegativeInteger"/>

+          <xsd:element name="Info" type="ReferencesCheckResultInfoType" minOccurs="0"/>

+        </xsd:sequence>

+      </xsd:restriction>

+    </xsd:complexContent>

+  </xsd:complexType>

+  <xsd:complexType name="ReferencesCheckResultInfoType" mixed="true">

+    <xsd:complexContent mixed="true">

+      <xsd:restriction base="AnyChildrenType">

+        <xsd:sequence>

+          <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

+          <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>

+        </xsd:sequence>

+      </xsd:restriction>

+    </xsd:complexContent>

+  </xsd:complexType>

+  <xsd:complexType name="ManifestRefsCheckResultType">

+    <xsd:complexContent>

+      <xsd:restriction base="CheckResultType">

+        <xsd:sequence>

+          <xsd:element name="Code" type="xsd:nonNegativeInteger"/>

+          <xsd:element name="Info" type="ManifestRefsCheckResultInfoType"/>

+        </xsd:sequence>

+      </xsd:restriction>

+    </xsd:complexContent>

+  </xsd:complexType>

+  <xsd:complexType name="ManifestRefsCheckResultInfoType" mixed="true">

+    <xsd:complexContent mixed="true">

+      <xsd:extension base="ReferencesCheckResultInfoType">

+        <xsd:sequence>

+          <xsd:element name="ReferringSigReference" type="xsd:positiveInteger"/>

+        </xsd:sequence>

+      </xsd:extension>

+    </xsd:complexContent>

+  </xsd:complexType>

+  <!--########## Error Response ###-->

+  <xsd:element name="ErrorResponse" type="ErrorResponseType">

+    <xsd:annotation>

+      <xsd:documentation>Resultat, falls die Signaturerstellung gescheitert ist</xsd:documentation>

+    </xsd:annotation>

+  </xsd:element>

+  <xsd:complexType name="ErrorResponseType">

+    <xsd:sequence>

+      <xsd:element name="ErrorCode" type="xsd:integer"/>

+      <xsd:element name="Info" type="xsd:string"/>

+    </xsd:sequence>

+  </xsd:complexType>

+  <!--########## Auxiliary Types ###-->

+  <xsd:simpleType name="KeyIdentifierType">

+    <xsd:restriction base="xsd:string"/>

+  </xsd:simpleType>

+  <xsd:simpleType name="KeyStorageType">

+    <xsd:restriction base="xsd:string">

+      <xsd:enumeration value="Software"/>

+      <xsd:enumeration value="Hardware"/>

+    </xsd:restriction>

+  </xsd:simpleType>

+  <xsd:simpleType name="MimeTypeType">

+    <xsd:restriction base="xsd:token"/>

+  </xsd:simpleType>

+  <xsd:complexType name="AnyChildrenType" mixed="true">

+    <xsd:sequence minOccurs="0" maxOccurs="unbounded">

+      <xsd:any namespace="##any" processContents="lax"/>

+    </xsd:sequence>

+  </xsd:complexType>

+  <xsd:complexType name="XMLContentType" mixed="true">

+    <xsd:complexContent mixed="true">

+      <xsd:extension base="AnyChildrenType">

+        <xsd:attribute ref="xml:space" use="optional"/>

+      </xsd:extension>

+    </xsd:complexContent>

+  </xsd:complexType>

+  <xsd:complexType name="ContentBaseType">

+    <xsd:choice minOccurs="0">

+      <xsd:element name="Base64Content" type="xsd:base64Binary"/>

+      <xsd:element name="XMLContent" type="XMLContentType"/>

+      <xsd:element name="LocRefContent" type="xsd:anyURI"/>

+    </xsd:choice>

+  </xsd:complexType>

+  <xsd:complexType name="ContentExLocRefBaseType">

+    <xsd:complexContent>

+      <xsd:restriction base="ContentBaseType">

+        <xsd:choice minOccurs="0">

+          <xsd:element name="Base64Content" type="xsd:base64Binary"/>

+          <xsd:element name="XMLContent" type="XMLContentType"/>

+        </xsd:choice>

+      </xsd:restriction>

+    </xsd:complexContent>

+  </xsd:complexType>

+  <xsd:complexType name="ContentOptionalRefType">

+    <xsd:complexContent>

+      <xsd:extension base="ContentBaseType">

+        <xsd:attribute name="Reference" type="xsd:anyURI" use="optional"/>

+      </xsd:extension>

+    </xsd:complexContent>

+  </xsd:complexType>

+  <xsd:complexType name="ContentRequiredRefType">

+    <xsd:complexContent>

+      <xsd:restriction base="ContentOptionalRefType">

+        <xsd:choice minOccurs="0">

+          <xsd:element name="Base64Content" type="xsd:base64Binary"/>

+          <xsd:element name="XMLContent" type="XMLContentType"/>

+          <xsd:element name="LocRefContent" type="xsd:anyURI"/>

+        </xsd:choice>

+        <xsd:attribute name="Reference" type="xsd:anyURI" use="required"/>

+      </xsd:restriction>

+    </xsd:complexContent>

+  </xsd:complexType>

+  <xsd:complexType name="VerifyTransformsDataType">

+    <xsd:choice maxOccurs="unbounded">

+      <xsd:annotation>

+        <xsd:documentation>Ein oder mehrere Transformationswege können von der Applikation an MOA mitgeteilt werden. Die zu prüfende Signatur hat zumindest einem dieser Transformationswege zu entsprechen. Die Angabe kann explizit oder als Profilbezeichner erfolgen.</xsd:documentation>

+      </xsd:annotation>

+      <xsd:element ref="VerifyTransformsInfoProfile"/>

+      <xsd:element name="VerifyTransformsInfoProfileID" type="xsd:string">

+        <xsd:annotation>

+          <xsd:documentation>Profilbezeichner für einen Transformationsweg</xsd:documentation>

+        </xsd:annotation>

+      </xsd:element>

+    </xsd:choice>

+  </xsd:complexType>

+  <xsd:element name="QualifiedCertificate"/>

+  <xsd:element name="PublicAuthority" type="PublicAuthorityType"/>

+  <xsd:complexType name="PublicAuthorityType">

+    <xsd:sequence>

+      <xsd:element name="Code" type="xsd:string" minOccurs="0"/>

+    </xsd:sequence>

+  </xsd:complexType>

+  <xsd:simpleType name="SignatoriesType">

+    <xsd:union memberTypes="AllSignatoriesType">

+      <xsd:simpleType>

+        <xsd:list itemType="xsd:positiveInteger"/>

+      </xsd:simpleType>

+    </xsd:union>

+  </xsd:simpleType>

+  <xsd:simpleType name="AllSignatoriesType">

+    <xsd:restriction base="xsd:string">

+      <xsd:enumeration value="all"/>

+    </xsd:restriction>

+  </xsd:simpleType>

+  <xsd:complexType name="CreateSignatureLocationType">

+    <xsd:simpleContent>

+      <xsd:extension base="xsd:token">

+        <xsd:attribute name="Index" type="xsd:nonNegativeInteger" use="required"/>

+      </xsd:extension>

+    </xsd:simpleContent>

+  </xsd:complexType>

+  <xsd:complexType name="TransformParameterType">

+    <xsd:choice minOccurs="0">

+      <xsd:annotation>

+        <xsd:documentation>Die Angabe des Transformationsparameters (explizit oder als Hashwert) kann unterlassen werden, wenn die Applikation von der Unveränderlichkeit des Inhalts der in "Transformationsparamter", Attribut "URI" angegebenen URI ausgehen kann.</xsd:documentation>

+      </xsd:annotation>

+      <xsd:element name="Base64Content" type="xsd:base64Binary">

+        <xsd:annotation>

+          <xsd:documentation>Der Transformationsparameter explizit angegeben.</xsd:documentation>

+        </xsd:annotation>

+      </xsd:element>

+      <xsd:element name="Hash">

+        <xsd:annotation>

+          <xsd:documentation>Der Hashwert des Transformationsparameters.</xsd:documentation>

+        </xsd:annotation>

+        <xsd:complexType>

+          <xsd:sequence>

+            <xsd:element ref="dsig:DigestMethod"/>

+            <xsd:element ref="dsig:DigestValue"/>

+          </xsd:sequence>

+        </xsd:complexType>

+      </xsd:element>

+    </xsd:choice>

+    <xsd:attribute name="URI" type="xsd:anyURI" use="required"/>

+  </xsd:complexType>

+  <xsd:element name="CreateSignatureEnvironmentProfile">

+    <xsd:complexType>

+      <xsd:sequence>

+        <xsd:element name="CreateSignatureLocation" type="CreateSignatureLocationType"/>

+        <xsd:element name="Supplement" type="XMLDataObjectAssociationType" minOccurs="0" maxOccurs="unbounded"/>

+      </xsd:sequence>

+    </xsd:complexType>

+  </xsd:element>

+  <xsd:element name="VerifyTransformsInfoProfile">

+    <xsd:annotation>

+      <xsd:documentation>Explizite Angabe des Transformationswegs</xsd:documentation>

+    </xsd:annotation>

+    <xsd:complexType>

+      <xsd:sequence>

+        <xsd:element ref="dsig:Transforms" minOccurs="0"/>

+        <xsd:element name="TransformParameter" type="TransformParameterType" minOccurs="0" maxOccurs="unbounded">

+          <xsd:annotation>

+            <xsd:documentation>Alle impliziten Transformationsparameter, die zum Durchlaufen der oben angeführten Transformationskette bekannt sein müssen, müssen hier angeführt werden. Das Attribut "URI" bezeichnet den Transformationsparameter in exakt jener Weise, wie er in der zu überprüfenden Signatur gebraucht wird.</xsd:documentation>

+          </xsd:annotation>

+        </xsd:element>

+      </xsd:sequence>

+    </xsd:complexType>

+  </xsd:element>

+  <xsd:element name="Supplement" type="XMLDataObjectAssociationType"/>

+  <xsd:element name="SupplementProfile" type="XMLDataObjectAssociationType"/>

+  <xsd:element name="CreateTransformsInfoProfile">

+    <xsd:complexType>

+      <xsd:sequence>

+        <xsd:element name="CreateTransformsInfo" type="TransformsInfoType"/>

+        <xsd:element ref="Supplement" minOccurs="0" maxOccurs="unbounded"/>

+      </xsd:sequence>

+    </xsd:complexType>

+  </xsd:element>

+</xsd:schema>

diff --git a/spss.server/server-config.wsdd b/spss.server/server-config.wsdd
index 1f5f83ae5..fee506cb2 100644
--- a/spss.server/server-config.wsdd
+++ b/spss.server/server-config.wsdd
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Axis Deployment Descriptor for MOA SP/SS 1.2

+-->

 <deployment name="defaultClientConfig"

             xmlns="http://xml.apache.org/axis/wsdd/"

             xmlns:java="http://xml.apache.org/axis/wsdd/providers/java"

@@ -14,7 +17,7 @@
     <parameter name="allowedMethods" value="CreateXMLSignatureRequest"/>

     <parameter name="className" value="at.gv.egovernment.moa.spss.server.service.SignatureCreationService"/>

     <!-- enable this for deployment with Axis 1.1

-    <wsdlFile>/resources/wsdl/MOA-SPSS-1.1.wsdl</wsdlFile>

+    <wsdlFile>/resources/wsdl/MOA-SPSS-1.2.wsdl</wsdlFile>

     -->

     <requestFlow>

       <handler type="MOAHandler"/>

@@ -29,7 +32,7 @@
     <parameter name="allowedMethods" value="VerifyCMSSignatureRequest VerifyXMLSignatureRequest"/>

     <parameter name="className" value="at.gv.egovernment.moa.spss.server.service.SignatureVerificationService"/>

     <!-- enable this for deployment with Axis 1.1

-    <wsdlFile>/resources/wsdl/MOA-SPSS-1.1.wsdl</wsdlFile>

+    <wsdlFile>/resources/wsdl/MOA-SPSS-1.2.wsdl</wsdlFile>

     -->

     <requestFlow>

       <handler type="MOAHandler"/>

diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/SPSSFactory.java b/spss.server/src/at/gv/egovernment/moa/spss/api/SPSSFactory.java
index 178a45273..dfa8927e1 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/SPSSFactory.java
+++ b/spss.server/src/at/gv/egovernment/moa/spss/api/SPSSFactory.java
@@ -57,6 +57,7 @@ import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
  * this instance, concrete MOA SP/SS API object can be created.
  * 
  * @author Patrick Peck
+ * @author Gregor Karlinger
  * @version $Id$
  */
 public abstract class SPSSFactory {
@@ -779,6 +780,22 @@ public abstract class SPSSFactory {
     String referenceURI);
 
   /**
+    * Create a new <code>Content</code> object containing location reference data.
+    * 
+    * @param locationReferenceURI a URI pointing to the actual remote location of the content.
+    * 
+    * @param referenceURI An URI identifying the data. May be <code>null</code>.
+    * 
+    * @return The <code>Content</code> object containing the data.
+    * 
+    * @pre locationReferenceURI != null
+    * @post return != null
+    */
+   public abstract Content createContent(
+     String locationReferenceURI,
+     String referenceURI);
+
+  /**
    * Create a new <code>Content</code> object containing XML data.
    * 
    * @param xmlData The XML data contained in the new <code>Content</code>.
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/Content.java b/spss.server/src/at/gv/egovernment/moa/spss/api/common/Content.java
index 173e9d395..0777c3d65 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/Content.java
+++ b/spss.server/src/at/gv/egovernment/moa/spss/api/common/Content.java
@@ -5,29 +5,39 @@ package at.gv.egovernment.moa.spss.api.common;
  * 
  * @author Patrick Peck
  * @author Stephan Grill
+ * @author Gregor Karlinger
  * @version $Id$
  */
 public interface Content {
+
   /**
    * Indicates that this object contains a URI reference to some content. 
    */
   public static final int REFERENCE_CONTENT = 0;
+
   /**
    * Indicates that this object contains binary content.
    */
   public static final int BINARY_CONTENT = 1;
+
   /**
    * Indicates that this object contains XML content.
    */
   public static final int XML_CONTENT = 2;
+ 
+  /**
+   * Indicates that this object contains a location reference content.
+   */
+  public static final int LOCREF_CONTENT = 3;
 
   /**
    * Gets the type of content contained in this object.
    * 
-   * @return The type of content, either <code>BINARY_CONTENT</code> or
-   * <code>XML_CONTENT</code>
+   * @return The type of content, one of <code>BINARY_CONTENT</code>, <code>XML_CONTENT</code>, <code>
+   *         REFERENCE_CONTENT</code> or <code>LOCREF_CONTENT</code>.
    */
   public int getContentType();
+
   /**
    * Gets the reference to the content data (a URI).
    * 
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentLocRef.java b/spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentLocRef.java
new file mode 100644
index 000000000..f640f2b92
--- /dev/null
+++ b/spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentLocRef.java
@@ -0,0 +1,17 @@
+package at.gv.egovernment.moa.spss.api.common;
+
+/**
+ * Encapsulates location reference content.
+ * 
+ * @author Gregor Karlinger
+ * @version $Id$
+ */
+public interface ContentLocRef extends Content 
+{
+  /**
+   * Gets the location reference URI pointing to the actual remote location of the content.
+   * 
+   * @return the location reference URI.
+   */
+  public String getLocationReferenceURI();
+}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentLocRefImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentLocRefImpl.java
new file mode 100644
index 000000000..902f7bd72
--- /dev/null
+++ b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentLocRefImpl.java
@@ -0,0 +1,44 @@
+package at.gv.egovernment.moa.spss.api.impl;
+
+import at.gv.egovernment.moa.spss.api.common.ContentLocRef;
+
+/**
+ * Default implementation of <code>ContentLocRef</code>.
+ * 
+ * @author Gregor Karlinger
+ * @version $Id$
+ */
+public class ContentLocRefImpl extends ContentImpl implements ContentLocRef 
+{
+  /**
+   * The location reference URI pointing to the actual remote location of the content. 
+   */
+  private String locationReferenceURI_;
+  
+  /** 
+   * @see at.gv.egovernment.moa.spss.api.common.ContentLocRef#getLocationReference()
+   */
+  public String getLocationReferenceURI()
+  {
+    return locationReferenceURI_;
+  }
+  
+  /**
+   * Sets the location reference URI pointing to the actual remote location of the content. 
+   * 
+   * @param locationReferenceURI the location reference URI.
+   */
+  public void setLocationReferenceURI(String locationReferenceURI)
+  {
+    locationReferenceURI_ = locationReferenceURI;
+  }
+  
+  /**
+   * Gets the type of content.
+   * 
+   * @return LOCREF_CONTENT.
+   */
+  public int getContentType() {
+    return LOCREF_CONTENT;
+  }
+}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java
index ab6240f79..a953c2af3 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java
+++ b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java
@@ -439,6 +439,13 @@ public class SPSSFactoryImpl extends SPSSFactory {
     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);
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/RequestParserUtils.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/RequestParserUtils.java
index 0fff949b1..a41b14df0 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/RequestParserUtils.java
+++ b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/RequestParserUtils.java
@@ -34,7 +34,7 @@ public class RequestParserUtils {
   private static final String DESCRIPTION_XPATH = MOA + "Description";
   private static final String XML_ASSOC_CONTENT_XPATH = MOA + "Content";
   private static final String CONTENT_XPATH =
-    MOA + "Base64Content | " + MOA + "XMLContent";
+    MOA + "Base64Content | " + MOA + "XMLContent |" + MOA + "LocRefContent";
   private static final String ANY_OTHER_XPATH =
     "*[namespace-uri() != \"" + Constants.MOA_NS_URI + "\"]";
 
@@ -101,8 +101,15 @@ public class RequestParserUtils {
       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);
+      return factory.createContent(
+        contentElem.getChildNodes(),
+        referenceURI);
     }
   }
 
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java b/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java
index 32c81dc07..6f541ed42 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java
+++ b/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java
@@ -37,6 +37,7 @@ import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.MOASystemException;
 import at.gv.egovernment.moa.spss.api.common.Content;
 import at.gv.egovernment.moa.spss.api.common.ContentBinary;
+import at.gv.egovernment.moa.spss.api.common.ContentLocRef;
 import at.gv.egovernment.moa.spss.api.common.ContentXML;
 import at.gv.egovernment.moa.spss.api.common.MetaInfo;
 import at.gv.egovernment.moa.spss.api.common.XMLDataObjectAssociation;
@@ -54,6 +55,7 @@ import at.gv.egovernment.moa.spss.util.MessageProvider;
  * locations of the MOA XML request format.
  * 
  * @author Patrick Peck
+ * @author Gregor Karlinger
  * @version $Id$
  */
 public class DataObjectFactory {
@@ -128,6 +130,21 @@ public class DataObjectFactory {
             contentBytes = StreamUtils.readStream(is);
             break;
           }
+        case Content.LOCREF_CONTENT:
+          {
+            ExternalURIResolver uriResolver = new ExternalURIResolver();
+            String locRefURI = ((ContentLocRef) content).getLocationReferenceURI();
+            try
+            {
+              InputStream is = uriResolver.resolve(locRefURI);
+              contentBytes = StreamUtils.readStream(is);
+            }
+            catch (MOAApplicationException e)
+            {
+              throw new MOAApplicationException("3203", new Object[]{reference, locRefURI}, e);
+            }
+            break;
+          }
         case Content.REFERENCE_CONTENT :
           {
             ExternalURIResolver uriResolver = new ExternalURIResolver();
@@ -245,7 +262,9 @@ public class DataObjectFactory {
    * their reference URI to an <code>InputStream</code> of their respective
    * content. 
    */
-  private static StreamEntityResolver buildSupplementEntityResolver(List supplements) {
+  private static StreamEntityResolver buildSupplementEntityResolver(List supplements) 
+    throws MOAApplicationException
+  {
     Map entities = new HashMap();
     Iterator iter;
 
@@ -257,31 +276,52 @@ public class DataObjectFactory {
 
       switch (content.getContentType()) {
         case Content.BINARY_CONTENT :
-          entities.put(reference, ((ContentBinary) content).getBinaryContent());
-          break;
+          {
+            entities.put(reference, ((ContentBinary) content).getBinaryContent());
+            break;
+          }
+        case Content.LOCREF_CONTENT:
+          {
+            ExternalURIResolver uriResolver = new ExternalURIResolver();
+            String locRefURI = ((ContentLocRef) content).getLocationReferenceURI();
+            InputStream contentIS = null;
+            try
+            {
+              contentIS = uriResolver.resolve(locRefURI);
+            }
+            catch (MOAApplicationException e)
+            {
+              throw new MOAApplicationException("3202", new Object[]{reference, locRefURI}, e);
+            }
+            entities.put(reference, contentIS);
+            break;
+          }
         case Content.XML_CONTENT :
-          // serialize the first element node that is found in the supplement
-          // and make it available as a stream
-          NodeList nodes = ((ContentXML) content).getXMLContent();
-          int i = 0;
-
-          // find the first element node
-          while (i < nodes.getLength()
-            && nodes.item(i).getNodeType() != Node.ELEMENT_NODE)
-            i++;
-
-          // serialize the node
-          if (i < nodes.getLength()) {
-            try {
-              byte[] serialized =
-                DOMUtils.serializeNode(nodes.item(i), "UTF-8");
-              entities.put(reference, new ByteArrayInputStream(serialized));
-            } catch (Exception e) {
-              // serializing the element failed - just don't put it in the map
+          {
+            // serialize the first element node that is found in the supplement
+            // and make it available as a stream
+            NodeList nodes = ((ContentXML) content).getXMLContent();
+            int i = 0;
+
+            // find the first element node
+            while (i < nodes.getLength()
+              && nodes.item(i).getNodeType() != Node.ELEMENT_NODE)
+              i++;
+
+            // serialize the node
+            if (i < nodes.getLength()) {
+              try 
+              {
+                byte[] serialized = DOMUtils.serializeNode(nodes.item(i), "UTF-8");
+                entities.put(reference, new ByteArrayInputStream(serialized));
+              } 
+              catch (Exception e)
+              {
+                throw new MOAApplicationException("2282", new Object[]{reference}, e);
+              }
             }
+            break;
           }
-
-          break;
       }
     }
 
@@ -336,22 +376,42 @@ public class DataObjectFactory {
     checkAllowContentAndReference(content, allowContentAndReference);
 
     // ok, build the data object; use content first, if available
-    switch (content.getContentType()) {
+    switch (content.getContentType()) 
+    {
       case Content.XML_CONTENT :
+      {  
         ContentXML contentXml = (ContentXML) content;
         dataObject = createFromXmlContent(contentXml, xmlAsNodeList);
         break;
+      }
       case Content.BINARY_CONTENT :
+      {
         ContentBinary contentBinary = (ContentBinary) content;
         dataObject = createFromBinaryContent(contentBinary, binaryAsXml, false);
         break;
+      }
+      case Content.LOCREF_CONTENT :
+      {
+        String locRefURI = ((ContentLocRef) content).getLocationReferenceURI();
+        try
+        {
+          dataObject = createFromURIImpl(locRefURI, referenceAsXml);
+        }
+        catch (MOAApplicationException e)
+        {
+          throw new MOAApplicationException("3201", new Object[]{reference, locRefURI}, e);
+        }
+        break;
+      }
       case Content.REFERENCE_CONTENT :
+      {
         dataObject = createFromURIImpl(reference, referenceAsXml);
         break;
+      }
     }
 
     // set URI and reference ID
-    dataObject.setURI(content.getReference());
+    dataObject.setURI(reference);
     dataObject.setReferenceID(referenceID);
 
     return dataObject;
@@ -417,21 +477,41 @@ public class DataObjectFactory {
     String mimeType = metaInfo != null ? metaInfo.getMimeType() : null;
     DataObjectImpl dataObject = null;
 
-    switch (content.getContentType()) {
+    switch (content.getContentType())
+    {
       case Content.XML_CONTENT :
-        if (xmlContentAllowed) {
+      {  
+        if (xmlContentAllowed)
+        {
           dataObject = createFromXmlContent((ContentXML) content, true);
-        } else {
+        } 
+        else
+        {
           throw new MOAApplicationException("2280", null);
         }
         break;
+      }
       case Content.BINARY_CONTENT :
-        dataObject =
-          createFromBinaryContent(
-            (ContentBinary) content,
-            false,
-            binaryContentRepeatable);
+      {
+        dataObject = createFromBinaryContent(
+          (ContentBinary) content,
+          false,
+          binaryContentRepeatable);
+        break;
+      }
+      case Content.LOCREF_CONTENT :
+      {
+        String locRefURI = ((ContentLocRef) content).getLocationReferenceURI();
+        try
+        {
+          dataObject = createFromURIImpl(locRefURI, false);
+        }
+        catch (MOAApplicationException e)
+        {
+          throw new MOAApplicationException("3201", new Object[]{content.getReference(), locRefURI}, e);
+        }
         break;
+      }
     }
 
     dataObject.setURI(content.getReference());
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/service/AxisHandler.java b/spss.server/src/at/gv/egovernment/moa/spss/server/service/AxisHandler.java
index 19e5aa9fa..64bbb8dbe 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/service/AxisHandler.java
+++ b/spss.server/src/at/gv/egovernment/moa/spss/server/service/AxisHandler.java
@@ -44,7 +44,7 @@ import at.gv.egovernment.moa.spss.util.MessageProvider;
 public class AxisHandler extends BasicHandler {
 
   /** The resource names of the messages to load. */  
-  private static final String MOA_SPSS_WSDL_RESOURCE_ = "/resources/wsdl/MOA-SPSS-1.1.wsdl";
+  private static final String MOA_SPSS_WSDL_RESOURCE_ = "/resources/wsdl/MOA-SPSS-1.2.wsdl";
 
   /** The property name for accessing the HTTP request. */
   private static final String REQUEST_PROPERTY = HTTPConstants.MC_HTTP_SERVLETREQUEST;