cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1187517 - in /cxf/trunk: osgi/karaf/features/src/main/resources/ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/ services/wsn/ services/wsn/wsn-api/ services/wsn/wsn-api/s...
Date Fri, 21 Oct 2011 19:27:48 GMT
Author: dkulp
Date: Fri Oct 21 19:27:45 2011
New Revision: 1187517

URL: http://svn.apache.org/viewvc?rev=1187517&view=rev
Log:
Split wsn into an api (containing generated code and client stuff) and
core (containing the actual services).  Make both of them OSGi bundles
that can be installed individually.  The wsn-osgi is now an "uber
bundle" if wanted.
Added cxf-wsn-api feature to just install that. (if you want the API's
to talk to an external service)
Change cxf-wsn feature to use the core bundle.
Fix some issues trying to run pure JAX-WS code in OSGi

Added:
    cxf/trunk/services/wsn/wsn-api/
    cxf/trunk/services/wsn/wsn-api/pom.xml
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/pom.xml
    cxf/trunk/services/wsn/wsn-api/src/
    cxf/trunk/services/wsn/wsn-api/src/main/
    cxf/trunk/services/wsn/wsn-api/src/main/java/
    cxf/trunk/services/wsn/wsn-api/src/main/java/org/
    cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/
    cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/
    cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/
    cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/
    cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Consumer.java   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Consumer.java
    cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/CreatePullPoint.java   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/CreatePullPoint.java
    cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/NotificationBroker.java   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/NotificationBroker.java
    cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Publisher.java   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Publisher.java
    cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/PullPoint.java   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/PullPoint.java
    cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Referencable.java
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Referencable.java
    cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Registration.java   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Registration.java
    cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Subscription.java   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Subscription.java
    cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/
    cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/IdGenerator.java   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/util/IdGenerator.java
    cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/WSNHelper.java   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/util/WSNHelper.java
    cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/wsdl/
    cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/wsdl/WSNWSDLLocator.java   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Referencable.java
    cxf/trunk/services/wsn/wsn-api/src/main/resources/
    cxf/trunk/services/wsn/wsn-api/src/main/resources/org/
    cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/
    cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/
    cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/
    cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/
    cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/2001/
    cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/2001/XMLSchema.dtd
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/2001/XMLSchema.dtd
    cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/2001/XMLSchema.xsd   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/2001/XMLSchema.xsd
    cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/2001/datatypes.dtd
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/2001/datatypes.dtd
    cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/b-2.xsd   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/b-2.xsd
    cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/bf-2.xsd   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/bf-2.xsd
    cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/br-2.xsd   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/br-2.xsd
    cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/brw-2.wsdl   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/brw-2.wsdl
    cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/bw-2.wsdl   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/bw-2.wsdl
    cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/catalog.xml   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/catalog.xml
    cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/r-2.xsd   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/r-2.xsd
    cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/rp-2.xsd   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/rp-2.xsd
    cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/rpw-2.wsdl   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/rpw-2.wsdl
    cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/rw-2.wsdl   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/rw-2.wsdl
    cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/t-1.xsd   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/t-1.xsd
    cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/ws-addr.xsd   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/ws-addr.xsd
    cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/wsn.wsdl   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/wsn.wsdl
    cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/xml.xsd   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/xml.xsd
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsCreatePullPoint.java   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsCreatePullPoint.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsEndpointManager.java   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsEndpointManager.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsNotificationBroker.java   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsNotificationBroker.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsPublisher.java   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsPublisher.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsPullPoint.java   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsPullPoint.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsSubscription.java   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsSubscription.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/Service.java   (contents, props changed)
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/Service.java
    cxf/trunk/services/wsn/wsn-core/src/main/resources/OSGI-INF/
    cxf/trunk/services/wsn/wsn-core/src/main/resources/OSGI-INF/blueprint/
    cxf/trunk/services/wsn/wsn-core/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml
      - copied, changed from r1187471, cxf/trunk/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml
Removed:
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/Service.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Consumer.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/CreatePullPoint.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/NotificationBroker.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Publisher.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/PullPoint.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Referencable.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Registration.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Subscription.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsCreatePullPoint.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsEndpointManager.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsNotificationBroker.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsPublisher.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsPullPoint.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsSubscription.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/util/IdGenerator.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/util/WSNHelper.java
    cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/2001/XMLSchema.dtd
    cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/2001/XMLSchema.xsd
    cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/2001/datatypes.dtd
    cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/b-2.xsd
    cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/bf-2.xsd
    cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/br-2.xsd
    cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/brw-2.wsdl
    cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/bw-2.wsdl
    cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/catalog.xml
    cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/r-2.xsd
    cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/rp-2.xsd
    cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/rpw-2.wsdl
    cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/rw-2.wsdl
    cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/t-1.xsd
    cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/ws-addr.xsd
    cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/wsn.wsdl
    cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/xml.xsd
Modified:
    cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointReferenceBuilder.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java
    cxf/trunk/services/wsn/pom.xml
    cxf/trunk/services/wsn/wsn-core/pom.xml
    cxf/trunk/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java
    cxf/trunk/services/wsn/wsn-osgi/pom.xml
    cxf/trunk/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorServiceImpl.java

Modified: cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/features/src/main/resources/features.xml?rev=1187517&r1=1187516&r2=1187517&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Fri Oct 21 19:27:45 2011
@@ -140,6 +140,11 @@
         <bundle>mvn:org.apache.cxf.services.sts/cxf-services-sts-core/${project.version}</bundle>
     </feature>
 
+    <feature name="cxf-wsn-api" version="${project.version}" resolver="(obr)">
+        <feature version="${project.version}">cxf</feature>
+        <bundle>mvn:org.apache.cxf.services.wsn/cxf-services-wsn-api/${project.version}</bundle>
+    </feature>
+
     <feature name="cxf-wsn" version="${project.version}" resolver="(obr)">
 
         <config name="org.apache.cxf.wsn">
@@ -149,8 +154,8 @@
         </config>
 
         <feature version="[5.4,6)">activemq</feature>
-        <feature version="${project.version}">cxf</feature>
+        <feature version="${project.version}">cxf-wsn-api</feature>
 
-        <bundle>mvn:org.apache.cxf.services.wsn/cxf-services-wsn-osgi/${project.version}</bundle>
+        <bundle>mvn:org.apache.cxf.services.wsn/cxf-services-wsn-core/${project.version}</bundle>
     </feature>
 </features>

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=1187517&r1=1187516&r2=1187517&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 Fri Oct 21 19:27:45 2011
@@ -796,7 +796,13 @@ public class EndpointImpl extends javax.
         }
         builder.wsdlDocumentLocation(wsdlLocation);        
         
-        return builder.build();
+        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        try {
+            Thread.currentThread().setContextClassLoader(EndpointReferenceBuilder.class.getClassLoader());
+            return builder.build();
+        } finally {
+            Thread.currentThread().setContextClassLoader(cl);
+        }
     }
 
     public <T extends EndpointReference> T getEndpointReference(Class<T> clazz,

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointReferenceBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointReferenceBuilder.java?rev=1187517&r1=1187516&r2=1187517&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointReferenceBuilder.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointReferenceBuilder.java Fri Oct 21 19:27:45 2011
@@ -95,8 +95,14 @@ public class EndpointReferenceBuilder {
             builder.wsdlDocumentLocation(this.endpoint.getEndpointInfo().getService().getDescription()
                 .getBaseURI());
         }
-        
-        return builder.build();
+        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        try {
+            Thread.currentThread().setContextClassLoader(EndpointReferenceBuilder.class.getClassLoader());
+            
+            return builder.build();
+        } finally {
+            Thread.currentThread().setContextClassLoader(cl);
+        }
     }
 
     public <T extends EndpointReference> T getEndpointReference(Class<T> clazz) {

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java?rev=1187517&r1=1187516&r2=1187517&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java Fri Oct 21 19:27:45 2011
@@ -36,6 +36,7 @@ import org.w3c.dom.Element;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.jaxws.EndpointReferenceBuilder;
 import org.apache.cxf.security.SecurityContext;
 
 public class WebServiceContextImpl implements WebServiceContext {
@@ -107,7 +108,13 @@ public class WebServiceContextImpl imple
             }
         }
         
-        return builder.build();
+        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        try {
+            Thread.currentThread().setContextClassLoader(EndpointReferenceBuilder.class.getClassLoader());
+            return builder.build();
+        } finally {
+            Thread.currentThread().setContextClassLoader(cl);
+        }
     }
 
     public <T extends EndpointReference> T getEndpointReference(Class<T> clazz,

Modified: cxf/trunk/services/wsn/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/pom.xml?rev=1187517&r1=1187516&r2=1187517&view=diff
==============================================================================
--- cxf/trunk/services/wsn/pom.xml (original)
+++ cxf/trunk/services/wsn/pom.xml Fri Oct 21 19:27:45 2011
@@ -33,6 +33,7 @@
     </parent>
 
     <modules>
+        <module>wsn-api</module>
         <module>wsn-core</module>
         <module>wsn-osgi</module>
     </modules>

Copied: cxf/trunk/services/wsn/wsn-api/pom.xml (from r1187471, cxf/trunk/services/wsn/wsn-core/pom.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/pom.xml?p2=cxf/trunk/services/wsn/wsn-api/pom.xml&p1=cxf/trunk/services/wsn/wsn-core/pom.xml&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/pom.xml (original)
+++ cxf/trunk/services/wsn/wsn-api/pom.xml Fri Oct 21 19:27:45 2011
@@ -19,10 +19,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.services.wsn</groupId>
-    <artifactId>cxf-services-wsn-core</artifactId>
-    <packaging>jar</packaging>
+    <artifactId>cxf-services-wsn-api</artifactId>
+    <packaging>bundle</packaging>
     <version>2.5.0-SNAPSHOT</version>
-    <name>Apache CXF WSN Core</name>
+    <name>Apache CXF WSN API</name>
+    <description>Apache CXF WSN API</description>
     <url>http://cxf.apache.org</url>
 
     <parent>
@@ -34,84 +35,10 @@
 
 	<dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-            <version>${cxf.activemq.version}</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-common-utilities</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>${project.version}</version>
-			<scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>${project.version}</version>
-			<scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-rt</artifactId>
-            <version>2.1.7</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.ws</groupId>
-                    <artifactId>jaxws-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.sun.xml.messaging.saaj</groupId>
-                    <artifactId>saaj-impl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.codehaus.woodstox</groupId>
-                    <artifactId>wstx-asl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.xml.stream</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.net.httpserver</groupId>
-            <artifactId>http</artifactId>
-            <version>20070405</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 	
 	<build>
@@ -127,7 +54,7 @@
                             <sourceRoot>${basedir}/target/jaxws</sourceRoot>
                             <wsdlOptions>
                                 <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/org/apache/cxf/wsn/wsn.wsdl</wsdl>
+                                    <wsdl>${basedir}/src/main/resources/org/apache/cxf/wsn/wsdl/wsn.wsdl</wsdl>
                                     <extraargs>
                                         <extraarg>-verbose</extraarg>
                                     </extraargs>
@@ -140,6 +67,33 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            javax.xml.bind*;version="[0.0,3)",
+                            javax.jws*;version="[0.0,3)",
+                            javax.xml.ws*;version="[0.0,3)",
+                            org.apache.cxf*;version="[2.4,3)",
+                            *
+                        </Import-Package>
+                        <Export-Package>
+                            org.oasis_open.docs.wsn.*;version=1.3;-noimport:=true,
+                            org.oasis_open.docs.wsrf.*;version=1.2,
+                            org.apache.cxf.wsn.client;version=${project.version},
+                            org.apache.cxf.wsn.util;version=${project.version},
+                            org.apache.cxf.wsn.wsdl;version=${project.version},
+                            org.apache.cxf.wsn.jaxws;version=${project.version}
+                        </Export-Package>
+                        <DynamicImport-Package>*</DynamicImport-Package>
+                        <_nouses>true</_nouses>
+                        <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+                    </instructions>
+                </configuration>
+            </plugin>
 		</plugins>
 	</build>
 

Copied: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Consumer.java (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Consumer.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Consumer.java?p2=cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Consumer.java&p1=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Consumer.java&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Consumer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Consumer.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/CreatePullPoint.java (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/CreatePullPoint.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/CreatePullPoint.java?p2=cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/CreatePullPoint.java&p1=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/CreatePullPoint.java&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/CreatePullPoint.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/CreatePullPoint.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/NotificationBroker.java (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/NotificationBroker.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/NotificationBroker.java?p2=cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/NotificationBroker.java&p1=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/NotificationBroker.java&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/NotificationBroker.java (original)
+++ cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/NotificationBroker.java Fri Oct 21 19:27:45 2011
@@ -21,9 +21,9 @@ package org.apache.cxf.wsn.client;
 import java.util.Collections;
 import java.util.List;
 import javax.xml.bind.JAXBElement;
+import javax.xml.namespace.QName;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;
 
-import org.apache.cxf.wsn.AbstractSubscription;
 import org.apache.cxf.wsn.util.WSNHelper;
 import org.oasis_open.docs.wsn.b_2.FilterType;
 import org.oasis_open.docs.wsn.b_2.GetCurrentMessage;
@@ -55,7 +55,15 @@ import org.oasis_open.docs.wsn.bw_2.Unsu
 import org.oasis_open.docs.wsrf.rw_2.ResourceUnknownFault;
 
 public class NotificationBroker implements Referencable {
+    public static final String WSN_URI = "http://docs.oasis-open.org/wsn/b-2";
 
+    public static final String XPATH1_URI = "http://www.w3.org/TR/1999/REC-xpath-19991116";
+
+    public static final QName QNAME_TOPIC_EXPRESSION = new QName(WSN_URI, "TopicExpression");
+
+    public static final QName QNAME_MESSAGE_CONTENT = new QName(WSN_URI, "MessageContent");
+
+    
     private final org.oasis_open.docs.wsn.brw_2.NotificationBroker broker;
     private final W3CEndpointReference epr;
 
@@ -137,15 +145,15 @@ public class NotificationBroker implemen
             TopicExpressionType topicExp = new TopicExpressionType();
             topicExp.getContent().add(topic);
             subscribeRequest.getFilter().getAny().add(
-                    new JAXBElement<TopicExpressionType>(AbstractSubscription.QNAME_TOPIC_EXPRESSION,
+                    new JAXBElement<TopicExpressionType>(QNAME_TOPIC_EXPRESSION,
                             TopicExpressionType.class, topicExp));
         }
         if (xpath != null) {
             QueryExpressionType xpathExp = new QueryExpressionType();
-            xpathExp.setDialect(AbstractSubscription.XPATH1_URI);
+            xpathExp.setDialect(XPATH1_URI);
             xpathExp.getContent().add(xpath);
             subscribeRequest.getFilter().getAny().add(
-                    new JAXBElement<QueryExpressionType>(AbstractSubscription.QNAME_MESSAGE_CONTENT,
+                    new JAXBElement<QueryExpressionType>(QNAME_MESSAGE_CONTENT,
                             QueryExpressionType.class, xpathExp));
         }
         if (raw) {

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/NotificationBroker.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/NotificationBroker.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Publisher.java (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Publisher.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Publisher.java?p2=cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Publisher.java&p1=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Publisher.java&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Publisher.java (original)
+++ cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Publisher.java Fri Oct 21 19:27:45 2011
@@ -21,10 +21,10 @@ package org.apache.cxf.wsn.client;
 import javax.jws.WebParam;
 import javax.jws.WebService;
 import javax.xml.bind.JAXBElement;
+import javax.xml.namespace.QName;
 import javax.xml.ws.Endpoint;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;
 
-import org.apache.cxf.wsn.AbstractSubscription;
 import org.apache.cxf.wsn.util.IdGenerator;
 import org.oasis_open.docs.wsn.b_2.GetCurrentMessage;
 import org.oasis_open.docs.wsn.b_2.GetCurrentMessageResponse;
@@ -63,6 +63,8 @@ import org.oasis_open.docs.wsrf.rw_2.Res
  */
 @WebService(endpointInterface = "org.oasis_open.docs.wsn.bw_2.NotificationProducer")
 public class Publisher implements NotificationProducer, Referencable {
+    public static final String WSN_URI = "http://docs.oasis-open.org/wsn/b-2";
+    public static final QName QNAME_TOPIC_EXPRESSION = new QName(WSN_URI, "TopicExpression");
 
     public interface Callback {
         void subscribe(TopicExpressionType topic);
@@ -108,7 +110,7 @@ public class Publisher implements Notifi
                     f = e.getValue();
                 }
                 if (f instanceof TopicExpressionType) {
-                    if (!e.getName().equals(AbstractSubscription.QNAME_TOPIC_EXPRESSION)) {
+                    if (!e.getName().equals(QNAME_TOPIC_EXPRESSION)) {
                         InvalidTopicExpressionFaultType fault = new InvalidTopicExpressionFaultType();
                         throw new InvalidTopicExpressionFault("Unrecognized TopicExpression: " + e, fault);
                     }

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Publisher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Publisher.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/PullPoint.java (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/PullPoint.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/PullPoint.java?p2=cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/PullPoint.java&p1=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/PullPoint.java&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/PullPoint.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/PullPoint.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Referencable.java (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Referencable.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Referencable.java?p2=cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Referencable.java&p1=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Referencable.java&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Registration.java (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Registration.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Registration.java?p2=cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Registration.java&p1=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Registration.java&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Registration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Registration.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Subscription.java (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Subscription.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Subscription.java?p2=cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Subscription.java&p1=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Subscription.java&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Subscription.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Subscription.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/IdGenerator.java (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/util/IdGenerator.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/IdGenerator.java?p2=cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/IdGenerator.java&p1=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/util/IdGenerator.java&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/IdGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/IdGenerator.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/WSNHelper.java (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/util/WSNHelper.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/WSNHelper.java?p2=cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/WSNHelper.java&p1=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/util/WSNHelper.java&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/util/WSNHelper.java (original)
+++ cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/WSNHelper.java Fri Oct 21 19:27:45 2011
@@ -29,6 +29,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
 import org.apache.cxf.helpers.DOMUtils;
+import org.apache.cxf.wsn.wsdl.WSNWSDLLocator;
 
 public abstract class WSNHelper {
 
@@ -43,15 +44,28 @@ public abstract class WSNHelper {
     }
 
     public static <T> T getPort(String address, Class<T> serviceInterface) {
-        Service service = Service.create(
-                WSNHelper.class.getClassLoader().getResource("org/apache/cxf/wsn/wsn.wsdl"),
-                new QName("http://cxf.apache.org/wsn/jaxws", serviceInterface.getSimpleName() + "Service")
-        );
-        return service.getPort(createWSA(address), serviceInterface);
+        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        try {
+            Thread.currentThread().setContextClassLoader(WSNHelper.class.getClassLoader());
+            
+            Service service = Service.create(WSNWSDLLocator.getWSDLUrl(),
+                                             new QName("http://cxf.apache.org/wsn/jaxws", 
+                                                       serviceInterface.getSimpleName() + "Service"));
+            return service.getPort(createWSA(address), serviceInterface);
+        } finally {
+            Thread.currentThread().setContextClassLoader(cl);
+        }
     }
 
     public static W3CEndpointReference createWSA(String address) {
-        return new W3CEndpointReferenceBuilder().address(address).build();
+        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        try {
+            Thread.currentThread().setContextClassLoader(WSNHelper.class.getClassLoader());
+            
+            return new W3CEndpointReferenceBuilder().address(address).build();
+        } finally {
+            Thread.currentThread().setContextClassLoader(cl);
+        }
     }
 
     public static String getWSAAddress(W3CEndpointReference ref) {

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/WSNHelper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/WSNHelper.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/wsdl/WSNWSDLLocator.java (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Referencable.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/wsdl/WSNWSDLLocator.java?p2=cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/wsdl/WSNWSDLLocator.java&p1=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Referencable.java&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Referencable.java (original)
+++ cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/wsdl/WSNWSDLLocator.java Fri Oct 21 19:27:45 2011
@@ -16,12 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.wsn.client;
 
-import javax.xml.ws.wsaddressing.W3CEndpointReference;
+package org.apache.cxf.wsn.wsdl;
 
-public interface Referencable {
+import java.net.URL;
 
-    W3CEndpointReference getEpr();
+/**
+ * 
+ */
+public final class WSNWSDLLocator {
+    
+    private WSNWSDLLocator() {
+        //utility class
+    }
+    
+    public static URL getWSDLUrl() {
+        return WSNWSDLLocator.class.getResource("wsn.wsdl");
+    }
 
 }

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/wsdl/WSNWSDLLocator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/wsdl/WSNWSDLLocator.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/2001/XMLSchema.dtd (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/2001/XMLSchema.dtd)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/2001/XMLSchema.dtd?p2=cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/2001/XMLSchema.dtd&p1=cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/2001/XMLSchema.dtd&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/2001/XMLSchema.xsd (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/2001/XMLSchema.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/2001/XMLSchema.xsd?p2=cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/2001/XMLSchema.xsd&p1=cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/2001/XMLSchema.xsd&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/2001/XMLSchema.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/2001/XMLSchema.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/2001/XMLSchema.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/2001/datatypes.dtd (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/2001/datatypes.dtd)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/2001/datatypes.dtd?p2=cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/2001/datatypes.dtd&p1=cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/2001/datatypes.dtd&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/b-2.xsd (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/b-2.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/b-2.xsd?p2=cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/b-2.xsd&p1=cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/b-2.xsd&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/b-2.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/b-2.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/b-2.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/bf-2.xsd (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/bf-2.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/bf-2.xsd?p2=cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/bf-2.xsd&p1=cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/bf-2.xsd&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/bf-2.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/bf-2.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/bf-2.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/br-2.xsd (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/br-2.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/br-2.xsd?p2=cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/br-2.xsd&p1=cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/br-2.xsd&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/br-2.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/br-2.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/br-2.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/brw-2.wsdl (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/brw-2.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/brw-2.wsdl?p2=cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/brw-2.wsdl&p1=cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/brw-2.wsdl&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/brw-2.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/brw-2.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/brw-2.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/bw-2.wsdl (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/bw-2.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/bw-2.wsdl?p2=cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/bw-2.wsdl&p1=cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/bw-2.wsdl&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/bw-2.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/bw-2.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/bw-2.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/catalog.xml (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/catalog.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/catalog.xml?p2=cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/catalog.xml&p1=cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/catalog.xml&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/catalog.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/catalog.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/catalog.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/r-2.xsd (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/r-2.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/r-2.xsd?p2=cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/r-2.xsd&p1=cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/r-2.xsd&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/r-2.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/r-2.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/r-2.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/rp-2.xsd (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/rp-2.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/rp-2.xsd?p2=cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/rp-2.xsd&p1=cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/rp-2.xsd&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/rp-2.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/rp-2.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/rp-2.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/rpw-2.wsdl (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/rpw-2.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/rpw-2.wsdl?p2=cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/rpw-2.wsdl&p1=cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/rpw-2.wsdl&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/rpw-2.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/rpw-2.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/rpw-2.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/rw-2.wsdl (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/rw-2.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/rw-2.wsdl?p2=cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/rw-2.wsdl&p1=cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/rw-2.wsdl&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/rw-2.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/rw-2.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/rw-2.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/t-1.xsd (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/t-1.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/t-1.xsd?p2=cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/t-1.xsd&p1=cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/t-1.xsd&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/t-1.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/t-1.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/t-1.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/ws-addr.xsd (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/ws-addr.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/ws-addr.xsd?p2=cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/ws-addr.xsd&p1=cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/ws-addr.xsd&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/ws-addr.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/ws-addr.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/ws-addr.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/wsn.wsdl (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/wsn.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/wsn.wsdl?p2=cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/wsn.wsdl&p1=cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/wsn.wsdl&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/wsn.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/wsn.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/wsn.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/xml.xsd (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/xml.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/xml.xsd?p2=cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/xml.xsd&p1=cxf/trunk/services/wsn/wsn-core/src/main/resources/org/apache/cxf/wsn/xml.xsd&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/xml.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/xml.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/services/wsn/wsn-api/src/main/resources/org/apache/cxf/wsn/wsdl/xml.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/trunk/services/wsn/wsn-core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/pom.xml?rev=1187517&r1=1187516&r2=1187517&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/pom.xml (original)
+++ cxf/trunk/services/wsn/wsn-core/pom.xml Fri Oct 21 19:27:45 2011
@@ -20,9 +20,10 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.services.wsn</groupId>
     <artifactId>cxf-services-wsn-core</artifactId>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <version>2.5.0-SNAPSHOT</version>
     <name>Apache CXF WSN Core</name>
+    <description>Apache CXF WSN Core Service</description>
     <url>http://cxf.apache.org</url>
 
     <parent>
@@ -49,6 +50,11 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.apache.cxf.services.wsn</groupId>
+            <artifactId>cxf-services-wsn-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
             <version>${project.version}</version>
@@ -117,28 +123,32 @@
 	<build>
 		<plugins>
             <plugin>
-                <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-codegen-plugin</artifactId>
-	            <version>${project.version}</version>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <sourceRoot>${basedir}/target/jaxws</sourceRoot>
-                            <wsdlOptions>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/org/apache/cxf/wsn/wsn.wsdl</wsdl>
-                                    <extraargs>
-                                        <extraarg>-verbose</extraarg>
-                                    </extraargs>
-                                </wsdlOption>
-                            </wsdlOptions>
-                        </configuration>
-                        <goals>
-                            <goal>wsdl2java</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Require-Bundle>
+                            org.apache.activemq.activemq-core
+                        </Require-Bundle>
+                        <Import-Package>
+                            org.apache.cxf.wsn.util.*;version=${project.version},
+                            !org.apache.cxf.wsn*,
+                            !org.apache.activemq*,
+                            javax.xml.bind*;version="[0.0,3)",
+                            javax.jws*;version="[0.0,3)",
+                            javax.xml.ws*;version="[0.0,3)",
+                            org.apache.cxf*;version=${project.version},
+                            *
+                        </Import-Package>
+                        <Export-Package>
+                            org.apache.cxf.wsn.services;version=${project.version}
+                        </Export-Package>
+                        <DynamicImport-Package>*</DynamicImport-Package>
+                        <_nouses>true</_nouses>
+                        <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+                    </instructions>
+                </configuration>
             </plugin>
 		</plugins>
 	</build>

Copied: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsCreatePullPoint.java (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsCreatePullPoint.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsCreatePullPoint.java?p2=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsCreatePullPoint.java&p1=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsCreatePullPoint.java&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsCreatePullPoint.java (original)
+++ cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsCreatePullPoint.java Fri Oct 21 19:27:45 2011
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.wsn.jaxws;
+package org.apache.cxf.wsn.services;
 
 import java.net.URI;
 import javax.jms.ConnectionFactory;

Propchange: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsCreatePullPoint.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsCreatePullPoint.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsEndpointManager.java (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsEndpointManager.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsEndpointManager.java?p2=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsEndpointManager.java&p1=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsEndpointManager.java&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsEndpointManager.java (original)
+++ cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsEndpointManager.java Fri Oct 21 19:27:45 2011
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.wsn.jaxws;
+package org.apache.cxf.wsn.services;
 
 import javax.xml.ws.Endpoint;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;

Propchange: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsEndpointManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsEndpointManager.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsNotificationBroker.java (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsNotificationBroker.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsNotificationBroker.java?p2=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsNotificationBroker.java&p1=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsNotificationBroker.java&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsNotificationBroker.java (original)
+++ cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsNotificationBroker.java Fri Oct 21 19:27:45 2011
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.wsn.jaxws;
+package org.apache.cxf.wsn.services;
 
 import javax.jms.ConnectionFactory;
 import javax.jws.WebService;

Propchange: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsNotificationBroker.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsNotificationBroker.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsPublisher.java (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsPublisher.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsPublisher.java?p2=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsPublisher.java&p1=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsPublisher.java&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsPublisher.java (original)
+++ cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsPublisher.java Fri Oct 21 19:27:45 2011
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.wsn.jaxws;
+package org.apache.cxf.wsn.services;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;

Propchange: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsPublisher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsPublisher.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsPullPoint.java (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsPullPoint.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsPullPoint.java?p2=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsPullPoint.java&p1=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsPullPoint.java&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsPullPoint.java (original)
+++ cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsPullPoint.java Fri Oct 21 19:27:45 2011
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.wsn.jaxws;
+package org.apache.cxf.wsn.services;
 
 import javax.jws.WebService;
 

Propchange: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsPullPoint.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsPullPoint.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsSubscription.java (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsSubscription.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsSubscription.java?p2=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsSubscription.java&p1=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsSubscription.java&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsSubscription.java (original)
+++ cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsSubscription.java Fri Oct 21 19:27:45 2011
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.wsn.jaxws;
+package org.apache.cxf.wsn.services;
 
 import javax.jws.WebService;
 

Propchange: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsSubscription.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsSubscription.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/Service.java (from r1187471, cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/Service.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/Service.java?p2=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/Service.java&p1=cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/Service.java&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/Service.java (original)
+++ cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/Service.java Fri Oct 21 19:27:45 2011
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.cxf.wsn;
+package org.apache.cxf.wsn.services;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.cxf.wsn.jaxws.JaxwsCreatePullPoint;
-import org.apache.cxf.wsn.jaxws.JaxwsNotificationBroker;
+import org.apache.cxf.wsn.AbstractCreatePullPoint;
+import org.apache.cxf.wsn.AbstractNotificationBroker;
 
 /**
  * Starts up an instance of a WS-Notification service

Propchange: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/Service.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/Service.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/services/wsn/wsn-core/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml (from r1187471, cxf/trunk/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml?p2=cxf/trunk/services/wsn/wsn-core/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml&p1=cxf/trunk/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml&r1=1187471&r2=1187517&rev=1187517&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml (original)
+++ cxf/trunk/services/wsn/wsn-core/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml Fri Oct 21 19:27:45 2011
@@ -35,7 +35,7 @@
     </bean>
 
     <!-- NotificationBroker -->
-    <bean id="notificationBroker" class="org.apache.cxf.wsn.jaxws.JaxwsNotificationBroker" init-method="init" destroy-method="destroy">
+    <bean id="notificationBroker" class="org.apache.cxf.wsn.services.JaxwsNotificationBroker" init-method="init" destroy-method="destroy">
         <argument value="NotificationBroker" />
         <argument ref="activemq" />
         <property name="address" value="${cxf.wsn.rootUrl}${cxf.wsn.context}/NotificationBroker" />
@@ -47,7 +47,7 @@
     </service>
 
     <!-- CreatePullPoint -->
-    <bean id="createPullPoint" class="org.apache.cxf.wsn.jaxws.JaxwsCreatePullPoint" init-method="init" destroy-method="destroy">
+    <bean id="createPullPoint" class="org.apache.cxf.wsn.services.JaxwsCreatePullPoint" init-method="init" destroy-method="destroy">
         <argument value="org.apache.cxf.wsn.client.CreatePullPoint" />
         <argument ref="activemq" />
         <property name="address" value="${cxf.wsn.rootUrl}${cxf.wsn.context}/CreatePullPoint" />

Modified: cxf/trunk/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java?rev=1187517&r1=1187516&r2=1187517&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java (original)
+++ cxf/trunk/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java Fri Oct 21 19:27:45 2011
@@ -41,21 +41,23 @@ import org.apache.cxf.wsn.client.Publish
 import org.apache.cxf.wsn.client.PullPoint;
 import org.apache.cxf.wsn.client.Registration;
 import org.apache.cxf.wsn.client.Subscription;
-import org.apache.cxf.wsn.jaxws.JaxwsCreatePullPoint;
-import org.apache.cxf.wsn.jaxws.JaxwsNotificationBroker;
+import org.apache.cxf.wsn.services.JaxwsCreatePullPoint;
+import org.apache.cxf.wsn.services.JaxwsNotificationBroker;
 import org.apache.cxf.wsn.util.WSNHelper;
 import org.oasis_open.docs.wsn.b_2.NotificationMessageHolderType;
 import org.oasis_open.docs.wsn.b_2.TopicExpressionType;
 
 public abstract class WsnBrokerTest extends TestCase {
-
+    private boolean useExternal = true;
+    
+    
     private ActiveMQConnectionFactory activemq;
     private JaxwsNotificationBroker notificationBrokerServer;
     private JaxwsCreatePullPoint createPullPointServer;
     private NotificationBroker notificationBroker;
     private CreatePullPoint createPullPoint;
 
-    private int port1;
+    private int port1 = 8182;
     private int port2;
     
     protected abstract String getProviderImpl();
@@ -69,18 +71,21 @@ public abstract class WsnBrokerTest exte
     
         System.setProperty("javax.xml.ws.spi.Provider", impl);
 
-        port1 = getFreePort();
         port2 = getFreePort();
+        if (!useExternal) {
+            port1 = getFreePort();
+            
+            activemq = new ActiveMQConnectionFactory("vm:(broker:(tcp://localhost:6000)?persistent=false)");
+
+            notificationBrokerServer = new JaxwsNotificationBroker("WSNotificationBroker", activemq);
+            notificationBrokerServer.setAddress("http://localhost:" + port1 + "/wsn/NotificationBroker");
+            notificationBrokerServer.init();
+
+            createPullPointServer = new JaxwsCreatePullPoint("CreatePullPoint", activemq);
+            createPullPointServer.setAddress("http://localhost:" + port1 + "/wsn/CreatePullPoint");
+            createPullPointServer.init();
+        }
 
-        activemq = new ActiveMQConnectionFactory("vm:(broker:(tcp://localhost:6000)?persistent=false)");
-
-        notificationBrokerServer = new JaxwsNotificationBroker("WSNotificationBroker", activemq);
-        notificationBrokerServer.setAddress("http://localhost:" + port1 + "/wsn/NotificationBroker");
-        notificationBrokerServer.init();
-
-        createPullPointServer = new JaxwsCreatePullPoint("CreatePullPoint", activemq);
-        createPullPointServer.setAddress("http://localhost:" + port1 + "/wsn/CreatePullPoint");
-        createPullPointServer.init();
 
         notificationBroker = new NotificationBroker("http://localhost:" + port1 + "/wsn/NotificationBroker");
         createPullPoint = new CreatePullPoint("http://localhost:" + port1 + "/wsn/CreatePullPoint");
@@ -95,8 +100,10 @@ public abstract class WsnBrokerTest exte
 
     @Override
     public void tearDown() throws Exception {
-        notificationBrokerServer.destroy();
-        createPullPointServer.destroy();
+        if (!useExternal) {
+            notificationBrokerServer.destroy();
+            createPullPointServer.destroy();
+        }
         System.clearProperty("javax.xml.ws.spi.Provider");
     }
 

Modified: cxf/trunk/services/wsn/wsn-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-osgi/pom.xml?rev=1187517&r1=1187516&r2=1187517&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-osgi/pom.xml (original)
+++ cxf/trunk/services/wsn/wsn-osgi/pom.xml Fri Oct 21 19:27:45 2011
@@ -23,6 +23,7 @@
     <packaging>bundle</packaging>
     <version>2.5.0-SNAPSHOT</version>
     <name>Apache CXF WSN OSGi</name>
+    <description>Apache CXF WSN Full OSGi</description>
     <url>http://cxf.apache.org</url>
 
     <parent>

Modified: cxf/trunk/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml?rev=1187517&r1=1187516&r2=1187517&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml (original)
+++ cxf/trunk/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml Fri Oct 21 19:27:45 2011
@@ -35,7 +35,7 @@
     </bean>
 
     <!-- NotificationBroker -->
-    <bean id="notificationBroker" class="org.apache.cxf.wsn.jaxws.JaxwsNotificationBroker" init-method="init" destroy-method="destroy">
+    <bean id="notificationBroker" class="org.apache.cxf.wsn.services.JaxwsNotificationBroker" init-method="init" destroy-method="destroy">
         <argument value="NotificationBroker" />
         <argument ref="activemq" />
         <property name="address" value="${cxf.wsn.rootUrl}${cxf.wsn.context}/NotificationBroker" />
@@ -47,7 +47,7 @@
     </service>
 
     <!-- CreatePullPoint -->
-    <bean id="createPullPoint" class="org.apache.cxf.wsn.jaxws.JaxwsCreatePullPoint" init-method="init" destroy-method="destroy">
+    <bean id="createPullPoint" class="org.apache.cxf.wsn.services.JaxwsCreatePullPoint" init-method="init" destroy-method="destroy">
         <argument value="org.apache.cxf.wsn.client.CreatePullPoint" />
         <argument ref="activemq" />
         <property name="address" value="${cxf.wsn.rootUrl}${cxf.wsn.context}/CreatePullPoint" />

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorServiceImpl.java?rev=1187517&r1=1187516&r2=1187517&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorServiceImpl.java (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorServiceImpl.java Fri Oct 21 19:27:45 2011
@@ -94,7 +94,14 @@ public class LocatorServiceImpl implemen
             m.setContextualProperty("org.apache.cxf.wsa.metadata.wsdlLocationOnly", "true");
         }
         
-        return eprBuilder.build();
+        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        try {
+            Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+
+            return eprBuilder.build();
+        } finally {
+            Thread.currentThread().setContextClassLoader(cl);
+        }
     }
 
     



Mime
View raw message