svn commit: r952436 - in /cxf/trunk: api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java

[dkulp]

Author: dkulp
Date: Mon Jun  7 21:08:21 2010
New Revision: 952436

URL: http://svn.apache.org/viewvc?rev=952436&view=rev
Log:
Update namespace used for recording wsdllocation in epr
Make sure endpoint name can be recorded in epr

Modified:
    cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
    
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java

Modified: 
cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java?rev=952436&r1=952435&r2=952436&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java 
(original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java 
Mon Jun  7 21:08:21 2010
@@ -235,8 +235,10 @@ public final class EndpointReferenceUtil
     private static final Logger LOG = 
LogUtils.getL7dLogger(EndpointReferenceUtils.class);
 
     private static final String NS_WSAW_2005 = 
"http://www.w3.org/2005/02/addressing/wsdl";;
-    private static final String WSDL_INSTANCE_NAMESPACE = 
+    private static final String WSDL_INSTANCE_NAMESPACE2 = 
         "http://www.w3.org/2006/01/wsdl-instance";;
+    private static final String WSDL_INSTANCE_NAMESPACE = 
+            "http://www.w3.org/ns/wsdl-instance";;
     
     private static final QName WSA_WSDL_NAMESPACE_NS =
         new QName("xmlns:" + JAXWSAConstants.WSAW_PREFIX);
@@ -247,6 +249,8 @@ public final class EndpointReferenceUtil
         new QName("xmlns:" + XML_SCHEMA_NAMESPACE_PREFIX);
     private static final String XML_SCHEMA_INSTANCE_NAMESPACE =
         "http://www.w3.org/2001/XMLSchema-instance";;
+    private static final QName WSDL_LOCATION2 =
+        new QName(WSDL_INSTANCE_NAMESPACE2, "wsdlLocation");
     private static final QName WSDL_LOCATION =
         new QName(WSDL_INSTANCE_NAMESPACE, "wsdlLocation");
     private static final QName XSI_TYPE = 
@@ -533,6 +537,9 @@ public final class EndpointReferenceUtil
 
         if (metadata != null) {
             wsdlLocation = metadata.getOtherAttributes().get(WSDL_LOCATION);
+            if (wsdlLocation == null) {
+                wsdlLocation = 
metadata.getOtherAttributes().get(WSDL_LOCATION2);
+            }
         }
 
         if (null == wsdlLocation) {

Modified: 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?rev=952436&r1=952435&r2=952436&view=diff
==============================================================================
--- 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
 Mon Jun  7 21:08:21 2010
@@ -428,6 +428,9 @@ public class EndpointImpl extends javax.
             if (serviceName == null) {
                 
setServiceName(serverFactory.getServiceFactory().getServiceQName());
             }
+            if (endpointName == null) {
+                endpointName = endpoint.getEndpointInfo().getName();
+            }
 
         }
         return (ServerImpl) server;