cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r789371 - in /cxf/trunk: rt/frontend/js/ rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ rt/frontend/js/src/main/resources/META-INF/services/ systests/src/test/java/org/apache/cxf/systest/js/resources/
Date Mon, 29 Jun 2009 16:04:47 GMT
Author: dkulp
Date: Mon Jun 29 16:04:44 2009
New Revision: 789371

URL: http://svn.apache.org/viewvc?rev=789371&view=rev
Log:
[CXF-94] Remove annotations from JS stuff so the scanners in WebSphere won't try
to deploy it.

Removed:
    cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/JsServiceFactoryBean.java
    cxf/trunk/rt/frontend/js/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
Modified:
    cxf/trunk/rt/frontend/js/pom.xml
    cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/AbstractDOMProvider.java
    cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/DOMMessageProvider.java
    cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/DOMPayloadProvider.java
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/resources/hello_world.jsx

Modified: cxf/trunk/rt/frontend/js/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/js/pom.xml?rev=789371&r1=789370&r2=789371&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/js/pom.xml (original)
+++ cxf/trunk/rt/frontend/js/pom.xml Mon Jun 29 16:04:44 2009
@@ -58,6 +58,11 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jaxws_2.1_spec</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>junit</groupId>

Modified: cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/AbstractDOMProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/AbstractDOMProvider.java?rev=789371&r1=789370&r2=789371&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/AbstractDOMProvider.java
(original)
+++ cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/AbstractDOMProvider.java
Mon Jun 29 16:04:44 2009
@@ -19,19 +19,17 @@
 
 package org.apache.cxf.js.rhino;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamSource;
 import javax.xml.ws.Endpoint;
 
 import org.w3c.dom.Node;
 
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.jaxws.EndpointImpl;
+import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.ContextFactory;
 import org.mozilla.javascript.Function;
@@ -137,14 +135,14 @@
         } else {
             throw new JSDOMProviderException(ILLEGAL_INVOKE_TYPE);
         }
-        Endpoint ep = Endpoint.create(binding, this);
-        List<Source> metadata = new ArrayList<Source>();
-        metadata.add(new StreamSource(wsdlLoc));
-        ep.setMetadata(metadata);
-        Map<String, Object> props = new HashMap<String, Object>();
-        props.put(Endpoint.WSDL_SERVICE, new QName(tgtNmspc, svcNm));
-        props.put(Endpoint.WSDL_PORT, new QName(tgtNmspc, portNm));
-        ep.setProperties(props);
+        
+        Bus bus = BusFactory.getThreadDefaultBus();
+        JaxWsServerFactoryBean factory = new JaxWsServerFactoryBean();
+        factory.setWsdlLocation(wsdlLoc);
+        factory.setBindingId(binding); 
+        factory.setServiceName(new QName(tgtNmspc, svcNm));
+        factory.setEndpointName(new QName(tgtNmspc, portNm));
+        Endpoint ep = new EndpointImpl(bus, this, factory);
         ep.publish(addr);
     }
 

Modified: cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/DOMMessageProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/DOMMessageProvider.java?rev=789371&r1=789370&r2=789371&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/DOMMessageProvider.java
(original)
+++ cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/DOMMessageProvider.java
Mon Jun 29 16:04:44 2009
@@ -23,12 +23,10 @@
 import javax.xml.ws.Provider;
 import javax.xml.ws.Service;
 import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceProvider;
 
 import org.mozilla.javascript.Scriptable;
 
 
-@WebServiceProvider
 @ServiceMode(value = Service.Mode.MESSAGE)            
 public class DOMMessageProvider extends AbstractDOMProvider implements Provider<DOMSource>
{
     public DOMMessageProvider(Scriptable scope, Scriptable wspVar,

Modified: cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/DOMPayloadProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/DOMPayloadProvider.java?rev=789371&r1=789370&r2=789371&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/DOMPayloadProvider.java
(original)
+++ cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/DOMPayloadProvider.java
Mon Jun 29 16:04:44 2009
@@ -21,12 +21,10 @@
 
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.ws.Provider;
-import javax.xml.ws.WebServiceProvider;
 
 import org.mozilla.javascript.Scriptable;
 
 
-@WebServiceProvider
 public class DOMPayloadProvider extends AbstractDOMProvider implements Provider<DOMSource>
{
     public DOMPayloadProvider(Scriptable scope, Scriptable wspVar,
                               String epAddr, boolean isBaseAddr, boolean e4x) {

Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/resources/hello_world.jsx
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/resources/hello_world.jsx?rev=789371&r1=789370&r2=789371&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/resources/hello_world.jsx (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/resources/hello_world.jsx Mon
Jun 29 16:04:44 2009
@@ -19,7 +19,7 @@
 
 var WebServiceProvider = {
     'wsdlLocation': 'file:../testutils/target/classes/wsdl/hello_world.wsdl',
-    'serviceName': 'SOAPServiceTest1',
+    'serviceName': 'SOAPService_Test1',
     'portName': 'SoapPort_Test1',
     'targetNamespace': 'http://apache.org/hello_world_soap_http',
 };



Mime
View raw message