axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prad...@apache.org
Subject svn commit: r552324 - /webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java
Date Sun, 01 Jul 2007 15:21:04 GMT
Author: pradine
Date: Sun Jul  1 08:21:03 2007
New Revision: 552324

URL: http://svn.apache.org/viewvc?view=rev&rev=552324
Log:
Forgot one reference to SubmissionEndpointReference.

Modified:
    webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java?view=diff&rev=552324&r1=552323&r2=552324
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java
(original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java
Sun Jul  1 08:21:03 2007
@@ -32,15 +32,14 @@
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axis2.addressing.EndpointReferenceHelper;
-import org.apache.axis2.addressing.AddressingConstants.Final;
-import org.apache.axis2.addressing.AddressingConstants.Submission;
 import org.apache.axis2.addressing.metadata.ServiceName;
 import org.apache.axis2.addressing.metadata.WSDLLocation;
 import org.apache.axis2.jaxws.ExceptionFactory;
-import org.apache.axis2.jaxws.addressing.SubmissionEndpointReference;
+import org.apache.axis2.jaxws.addressing.factory.EndpointReferenceFactory;
 import org.apache.axis2.jaxws.addressing.util.EndpointReferenceBuilder;
 import org.apache.axis2.jaxws.addressing.util.EndpointReferenceConverter;
 import org.apache.axis2.jaxws.i18n.Messages;
+import org.apache.axis2.jaxws.registry.FactoryRegistry;
 import org.apache.axis2.jaxws.server.endpoint.EndpointImpl;
 import org.apache.axis2.util.XMLUtils;
 import org.w3c.dom.Element;
@@ -111,8 +110,9 @@
                 }            
             }
             
+            String addressingNamespace = getAddressingNamespace(W3CEndpointReference.class);
             w3cEPR =
-                (W3CEndpointReference) EndpointReferenceConverter.convertFromAxis2(axis2EPR,
Final.WSA_NAMESPACE);
+                (W3CEndpointReference) EndpointReferenceConverter.convertFromAxis2(axis2EPR,
addressingNamespace);
         }
         catch (Exception e) {
             //TODO NLS enable.
@@ -143,7 +143,7 @@
             throw ExceptionFactory.makeWebServiceException("Invalid endpoint reference.",
e);
         }
         
-        String addressingNamespace = (jaxwsEPR instanceof SubmissionEndpointReference) ?
Submission.WSA_NAMESPACE : Final.WSA_NAMESPACE;
+        String addressingNamespace = getAddressingNamespace(jaxwsEPR.getClass());
         org.apache.axis2.jaxws.spi.ServiceDelegate serviceDelegate = null;
         
         try {
@@ -183,5 +183,11 @@
         }
         
         return jaxwsEPR;
+    }
+
+    private String getAddressingNamespace(Class clazz) {
+        EndpointReferenceFactory eprFactory =
+            (EndpointReferenceFactory) FactoryRegistry.getFactory(EndpointReferenceFactory.class);
+        return eprFactory.getAddressingNamespace(clazz);
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message