cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r789755 - in /cxf/branches/2.1.x-fixes: ./ 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 Tue, 30 Jun 2009 14:22:11 GMT
Author: dkulp
Date: Tue Jun 30 14:22:10 2009
New Revision: 789755

URL: http://svn.apache.org/viewvc?rev=789755&view=rev
Log:
Merged revisions 789423 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes

................
  r789423 | dkulp | 2009-06-29 15:51:31 -0400 (Mon, 29 Jun 2009) | 10 lines
  
  Merged revisions 789371 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r789371 | dkulp | 2009-06-29 12:04:44 -0400 (Mon, 29 Jun 2009) | 2 lines
    
    [CXF-94] Remove annotations from JS stuff so the scanners in WebSphere won't try
    to deploy it.
  ........
................

Removed:
    cxf/branches/2.1.x-fixes/rt/frontend/js/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/rt/frontend/js/pom.xml
    cxf/branches/2.1.x-fixes/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/AbstractDOMProvider.java
    cxf/branches/2.1.x-fixes/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/DOMMessageProvider.java
    cxf/branches/2.1.x-fixes/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/DOMPayloadProvider.java
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/js/resources/hello_world.jsx

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 30 14:22:10 2009
@@ -1,2 +1,2 @@
-/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873
 67,788824-788825,788827-788828,788830
-/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703,788774,788820
+/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873
 67,788824-788825,788827-788828,788830,789423
+/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703,788774,788820,789371

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/rt/frontend/js/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/js/pom.xml?rev=789755&r1=789754&r2=789755&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/js/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/js/pom.xml Tue Jun 30 14:22:10 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/branches/2.1.x-fixes/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/AbstractDOMProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/AbstractDOMProvider.java?rev=789755&r1=789754&r2=789755&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/AbstractDOMProvider.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/AbstractDOMProvider.java
Tue Jun 30 14:22:10 2009
@@ -19,22 +19,20 @@
 
 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.apache.xmlbeans.XmlCursor;
 import org.apache.xmlbeans.XmlObject;
-
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Function;
 import org.mozilla.javascript.Scriptable;
@@ -139,14 +137,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/branches/2.1.x-fixes/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/DOMMessageProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/DOMMessageProvider.java?rev=789755&r1=789754&r2=789755&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/DOMMessageProvider.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/DOMMessageProvider.java
Tue Jun 30 14:22:10 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/branches/2.1.x-fixes/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/DOMPayloadProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/DOMPayloadProvider.java?rev=789755&r1=789754&r2=789755&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/DOMPayloadProvider.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/DOMPayloadProvider.java
Tue Jun 30 14:22:10 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/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/js/resources/hello_world.jsx
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/js/resources/hello_world.jsx?rev=789755&r1=789754&r2=789755&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/js/resources/hello_world.jsx
(original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/js/resources/hello_world.jsx
Tue Jun 30 14:22:10 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