You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/05/06 21:52:22 UTC

svn commit: r400355 - in /incubator/tuscany/java: samples/bigbank/account/src/main/java/bigbank/account/services/stockquote/ sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/

Author: jsdelfino
Date: Sat May  6 12:52:19 2006
New Revision: 400355

URL: http://svn.apache.org/viewcvs?rev=400355&view=rev
Log:
Fix for TUSCANY-267 - with Axis2 1.0 we need name the AxisService like the portType to get the correct interface name generated

Modified:
    incubator/tuscany/java/samples/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteWebservicexServiceImpl.java
    incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java

Modified: incubator/tuscany/java/samples/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteWebservicexServiceImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteWebservicexServiceImpl.java?rev=400355&r1=400354&r2=400355&view=diff
==============================================================================
--- incubator/tuscany/java/samples/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteWebservicexServiceImpl.java (original)
+++ incubator/tuscany/java/samples/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteWebservicexServiceImpl.java Sat May  6 12:52:19 2006
@@ -28,6 +28,8 @@
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamReader;
 
+import net.x.webservice.StockQuoteSoap;
+
 import org.osoa.sca.annotations.Reference;
 import org.osoa.sca.annotations.Scope;
 import org.osoa.sca.annotations.Service;
@@ -41,7 +43,7 @@
 public class StockQuoteWebservicexServiceImpl implements StockQuoteService {
 
     @Reference
-    public net.x.webservice.StockQuote stockQuoteService = null; // Injected by the SCA container.
+    public StockQuoteSoap stockQuoteService = null; // Injected by the SCA container.
 
     /**
      * @throws RemoteException

Modified: incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java?rev=400355&r1=400354&r2=400355&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java (original)
+++ incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java Sat May  6 12:52:19 2006
@@ -57,7 +57,7 @@
         
         Definition definition;
         try {
-            definition = readInTheWSDLFile(uri);
+            definition = readWSDL(uri);
         } catch (WSDLException e) {
             throw new CodeGenerationException(e);
         }
@@ -81,6 +81,7 @@
         } catch (AxisFault e) {
             throw new CodeGenerationException(e);
         }
+        axisService.setName(port.getBinding().getPortType().getQName().getLocalPart());
 
         codegenConfiguration= new CodeGenConfiguration(Collections.EMPTY_MAP);
         codegenConfiguration.setAxisService(axisService);
@@ -137,7 +138,7 @@
      * @return
      * @throws WSDLException
      */
-    private Definition readInTheWSDLFile(String uri) throws WSDLException {
+    private Definition readWSDL(String uri) throws WSDLException {
 
         WSDLReader reader =
                 WSDLFactory.newInstance().newWSDLReader();
@@ -159,7 +160,6 @@
                 baseURI = file.getParentFile().toURI().toString();
             }
         }
-
 
         Document doc;
         try {