You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/06/11 20:34:01 UTC
svn commit: r953813 - in /cxf/branches/2.2.x-fixes: ./
api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
Author: dkulp
Date: Fri Jun 11 18:34:01 2010
New Revision: 953813
URL: http://svn.apache.org/viewvc?rev=953813&view=rev
Log:
Merged revisions 952436 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r952436 | dkulp | 2010-06-07 17:08:21 -0400 (Mon, 07 Jun 2010) | 2 lines
Update namespace used for recording wsdllocation in epr
Make sure endpoint name can be recorded in epr
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java?rev=953813&r1=953812&r2=953813&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java (original)
+++ cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java Fri Jun 11 18:34:01 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/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?rev=953813&r1=953812&r2=953813&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java (original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java Fri Jun 11 18:34:01 2010
@@ -424,6 +424,9 @@ public class EndpointImpl extends javax.
if (serviceName == null) {
setServiceName(serverFactory.getServiceFactory().getServiceQName());
}
+ if (endpointName == null) {
+ endpointName = endpoint.getEndpointInfo().getName();
+ }
}
return (ServerImpl) server;