geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r547467 - in /geronimo/server/trunk/modules/geronimo-axis2/src: main/java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java test/java/org/apache/geronimo/axis2/testdata/simple/HelloWorld.java
Date Fri, 15 Jun 2007 00:35:46 GMT
Author: gawor
Date: Thu Jun 14 17:35:45 2007
New Revision: 547467

URL: http://svn.apache.org/viewvc?view=rev&rev=547467
Log:
make it work with latest Axis

Modified:
    geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java
    geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/testdata/simple/HelloWorld.java

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java?view=diff&rev=547467&r1=547466&r2=547467
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java
(original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java
Thu Jun 14 17:35:45 2007
@@ -124,13 +124,7 @@
             service = serviceGen.getServiceFromWSDL(portInfo, endpointClass, configurationBaseUrl);
         } else {
             // No WSDL, let Axis2 handle it.
-
-            // FIXME: AxisServiceGenerator method should be used as it understands annotations
-            // but right now that method causes some problems when WSDL is requested.
-            service = AxisService.createService(endpointClassName, 
-                                                configurationContext.getAxisConfiguration(),

-                                                JAXWSMessageReceiver.class);
-            // service = serviceGen.getServiceFromClass(this.endpointClass);
+            service = serviceGen.getServiceFromClass(this.endpointClass);
         }
 
         service.setScope(Constants.SCOPE_APPLICATION);

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/testdata/simple/HelloWorld.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/testdata/simple/HelloWorld.java?view=diff&rev=547467&r1=547466&r2=547467
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/testdata/simple/HelloWorld.java
(original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/testdata/simple/HelloWorld.java
Thu Jun 14 17:35:45 2007
@@ -19,7 +19,8 @@
 import javax.jws.WebMethod;
 import javax.jws.WebService;
 
-@WebService(name="HelloWorld", targetNamespace = "http://example.org")
+@WebService(name="HelloWorld", targetNamespace = "http://simple.axis2.geronimo.apache.org",

+            wsdlLocation="test_service_simple.wsdl", serviceName="HelloService", portName="HelloPort")
 public class HelloWorld {
 
     @WebMethod



Mime
View raw message