Bug 19 behoben.tags/Build-SPSS.1.1.0

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

2 files changed, 20 insertions, 2 deletions

diff --git a/common/src/at/gv/egovernment/moa/util/Constants.java b/common/src/at/gv/egovernment/moa/util/Constants.java
index 681bed55b..df7c843d1 100644
--- a/common/src/at/gv/egovernment/moa/util/Constants.java
+++ b/common/src/at/gv/egovernment/moa/util/Constants.java
@@ -215,4 +215,19 @@ public interface Constants {
   /** URI of the Exclusive Canonical XML with commments algorithm */
   public static final String EXC_C14N_WITH_COMMENTS_URI =
     "http://www.w3.org/2001/10/xml-exc-c14n#WithComments";
+    
+  //
+  // Local names for elements of the MOA SPSS schema
+  //
+  
+  /** 
+   * Local name of request for creating an XML signature.
+   */
+  public static final String MOA_SPSS_CREATE_XML_REQUEST = "CreateXMLSignatureRequest";
+  
+  /** 
+   * Local name of request for verifying an XML signature.
+   */
+  public static final String MOA_SPSS_VERIFY_XML_REQUEST = "VerifiyXMLSignatureRequest";
+    
 }
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java b/spss.server/src/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java
index 07d7ab371..271d85f6d 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java
+++ b/spss.server/src/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java
@@ -16,6 +16,7 @@ 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.moa.util.Constants;
 
 /**
  * The service endpoint for the <code>SignatureCreation</code> web service.
@@ -42,9 +43,11 @@ public class SignatureCreationService {
 
     // check that we have a CreateXMLSignatureRequest; if not, create an
     // AxisFault, just like the org.apache.axis.providers.java.MsgProvider
-    if (request[0].getNodeName() != "CreateXMLSignatureRequest") {
+    if (!Constants.MOA_SPSS_CREATE_XML_REQUEST.equals(request[0].getLocalName()) ||
+      !Constants.MOA_NS_URI.equals(request[0].getNamespaceURI()))
+    {
       QName qname =
-        new QName(request[0].getNamespaceURI(), request[0].getNodeName());
+        new QName(request[0].getNamespaceURI(), request[0].getLocalName());
       throw new AxisFault(
         Messages.getMessage("noOperationForQName", qname.toString()));
     }