axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ami...@apache.org
Subject svn commit: r518048 - in /webservices/axis2/trunk/java/modules: adb/src/org/apache/axis2/databinding/ADBBean.java codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
Date Wed, 14 Mar 2007 07:57:11 GMT
Author: amilas
Date: Wed Mar 14 00:57:10 2007
New Revision: 518048

URL: http://svn.apache.org/viewvc?view=rev&rev=518048
Log:
fixed bug in generating stub files. make interface binding dependent

Modified:
    webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/ADBBean.java
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java

Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/ADBBean.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/ADBBean.java?view=diff&rev=518048&r1=518047&r2=518048
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/ADBBean.java
(original)
+++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/ADBBean.java
Wed Mar 14 00:57:10 2007
@@ -2,6 +2,7 @@
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamReader;
+import java.io.Serializable;
 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?view=diff&rev=518048&r1=518047&r2=518048
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
(original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
Wed Mar 14 00:57:10 2007
@@ -383,15 +383,10 @@
 
             for (Iterator axisServicesIter = this.axisServices.iterator(); axisServicesIter.hasNext();)
{
                 this.axisService = (AxisService) axisServicesIter.next();
-
                 //we have to generate the code for each bininding
                 //for the moment lets genrate the stub name with the service name and end
point name
 
-                // write the inteface
-                // feed the binding information also
-                // note that we do not create this interface if the user switched on the
wrap classes mode
                 if (!codeGenConfiguration.isPackClasses()) {
-                    writeInterface(false);
                     // write the call back handlers
                     writeCallBackHandlers();
                 }
@@ -431,6 +426,14 @@
                     generateAndPopulateFaultNames();
                     updateFaultPackageForStub();
 
+                    // write the inteface
+                    // feed the binding information also
+                    // note that we do not create this interface if the user switched on
the wrap classes mode
+                    // this interface also depends on the binding
+                    if (!codeGenConfiguration.isPackClasses()) {
+                        writeInterface(false);
+                    }
+
                     if (codeGenConfiguration.isPackClasses()) {
                         // write the call back handlers
                         writeCallBackHandlers();
@@ -650,7 +653,9 @@
             addAttribute(doc, "name", makeJavaClassName(axisService.getBindingName()) + STUB_SUFFIX,
                     rootElement);
         } else {
-            addAttribute(doc, "interfaceName", localPart , rootElement);
+            addAttribute(doc, "interfaceName",
+                    makeJavaClassName(axisService.getName() + axisService.getEndpointName())
,
+                    rootElement);
             addAttribute(doc, "name", stubName, rootElement);
         }
 
@@ -1060,7 +1065,7 @@
             localPart =
                     makeJavaClassName(axisService.getEndpointName() + STUB_INTERFACE_SUFFIX_BACK);
         } else {
-            localPart = makeJavaClassName(axisService.getName());
+            localPart = makeJavaClassName(axisService.getName() + axisService.getEndpointName());
         }
 
         addAttribute(doc, "package", codeGenConfiguration.getPackageName(), rootElement);



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message