axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r472637 - in /webservices/axis2/branches/java/1_1/modules: codegen/src/org/apache/axis2/wsdl/codegen/emitter/ kernel/src/org/apache/axis2/description/
Date Wed, 08 Nov 2006 20:54:01 GMT
Author: dims
Date: Wed Nov  8 12:54:00 2006
New Revision: 472637

URL: http://svn.apache.org/viewvc?view=rev&rev=472637
Log:
Fix for   AXIS2-1633 - Provide compatibility to Axis 1.x for generated code.

Modified:
    webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java

Modified: webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?view=diff&rev=472637&r1=472636&r2=472637
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
Wed Nov  8 12:54:00 2006
@@ -29,8 +29,6 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLStreamException;
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
@@ -65,9 +63,11 @@
     protected static final String STUB_SUFFIX = "Stub";
     protected static final String TEST_SUFFIX = "Test";
     protected static final String SKELETON_CLASS_SUFFIX = "Skeleton";
-    protected static final String SKELETON_CLASS_SUFFIX_BACK = "BindingImpl";
+    protected static final String SKELETON_CLASS_SUFFIX_BACK = "Impl";
     protected static final String SKELETON_INTERFACE_SUFFIX = "SkeletonInterface";
-    protected static final String SKELETON_INTERFACE_SUFFIX_BACK = "Interface";
+    // keep a seperate variable for  SKELETON_INTERFACE_SUFFIX_BACK although it is
+    // "" to accomadate any future changes easily.
+    protected static final String SKELETON_INTERFACE_SUFFIX_BACK = "";
     protected static final String MESSAGE_RECEIVER_SUFFIX = "MessageReceiver";
     protected static final String FAULT_SUFFIX = "Exception";
     protected static final String DATABINDING_SUPPORTER_NAME_SUFFIX = "DatabindingSupporter";
@@ -388,6 +388,9 @@
         // the stubs implementation and not visible outside
         rootElement.appendChild(createDOMElementforDatabinders(doc,false));
         doc.appendChild(rootElement);
+        //////////////////////////////////////////////////////////
+//        System.out.println(DOM2Writer.nodeToString(rootElement));
+        ////////////////////////////////////////////////////////////
 
         return doc;
     }
@@ -722,11 +725,16 @@
     protected Document createDOMDocumentForInterface(boolean writeDatabinders) {
         Document doc = getEmptyDocument();
         Element rootElement = doc.createElement("interface");
-        String localPart = makeJavaClassName(axisService.getName());
+        String localPart = null;
+        if (this.codeGenConfiguration.isBackwordCompatibilityMode()){
+            localPart = makeJavaClassName(axisService.getPortTypeName());
+        } else {
+            localPart = makeJavaClassName(axisService.getName());
+        }
 
         addAttribute(doc, "package", codeGenConfiguration.getPackageName(), rootElement);
         addAttribute(doc, "name", localPart, rootElement);
-        addAttribute(doc, "callbackname", localPart + CALL_BACK_HANDLER_SUFFIX,
+        addAttribute(doc, "callbackname", makeJavaClassName(axisService.getName()) + CALL_BACK_HANDLER_SUFFIX,
                 rootElement);
         fillSyncAttributes(doc, rootElement);
         loadOperations(doc, rootElement, null);
@@ -779,7 +787,7 @@
         String localPart = makeJavaClassName(axisService.getName());
         String skeltonName;
         if (this.codeGenConfiguration.isBackwordCompatibilityMode()){
-             skeltonName = packageName + "." + localPart + SKELETON_CLASS_SUFFIX_BACK;
+             skeltonName = packageName + "." + makeJavaClassName(axisService.getBindingName())
+ SKELETON_CLASS_SUFFIX_BACK;
         } else {
              skeltonName = packageName + "." + localPart + SKELETON_CLASS_SUFFIX;
         }
@@ -794,7 +802,7 @@
         String localPart = makeJavaClassName(axisService.getName());
         String skeltonInterfaceName;
         if (this.codeGenConfiguration.isBackwordCompatibilityMode()){
-             skeltonInterfaceName = packageName + "." + localPart + SKELETON_INTERFACE_SUFFIX_BACK;
+             skeltonInterfaceName = packageName + "." + makeJavaClassName(axisService.getPortTypeName())
+ SKELETON_INTERFACE_SUFFIX_BACK;
         } else {
              skeltonInterfaceName = packageName + "." + localPart + SKELETON_INTERFACE_SUFFIX;
         }
@@ -1000,12 +1008,12 @@
 
         addAttribute(doc, "name", localPart + mepToSuffixMap.get(mep), rootElement);
         if (this.codeGenConfiguration.isBackwordCompatibilityMode()){
-            addAttribute(doc, "skeletonname", localPart + SKELETON_CLASS_SUFFIX_BACK, rootElement);
+            addAttribute(doc, "skeletonname", makeJavaClassName(axisService.getBindingName())
+ SKELETON_CLASS_SUFFIX_BACK, rootElement);
             if (isServerSideInterface) {
-                addAttribute(doc, "skeletonInterfaceName", localPart + SKELETON_INTERFACE_SUFFIX_BACK,
+                addAttribute(doc, "skeletonInterfaceName", makeJavaClassName(axisService.getPortTypeName())
+ SKELETON_INTERFACE_SUFFIX_BACK,
                         rootElement);
             } else {
-                addAttribute(doc, "skeletonInterfaceName", localPart + SKELETON_CLASS_SUFFIX_BACK,
+                addAttribute(doc, "skeletonInterfaceName", makeJavaClassName(axisService.getBindingName())
+ SKELETON_CLASS_SUFFIX_BACK,
                         rootElement);
             }
         } else {
@@ -1342,8 +1350,13 @@
 
     protected Document createDOMDocumentForServiceXML() {
         Document doc = getEmptyDocument();
+        String className = null;
         String serviceName = axisService.getName();
-        String className = makeJavaClassName(serviceName);
+        if(this.codeGenConfiguration.isBackwordCompatibilityMode()){
+             className = makeJavaClassName(axisService.getBindingName());
+        } else {
+             className = makeJavaClassName(serviceName);
+        }
 
         doc.appendChild(getServiceElement(serviceName, className, doc));
         return doc;
@@ -1380,7 +1393,7 @@
             Object key = it.next();
 
             if (Boolean.TRUE.equals(infoHolder.get(key))) {
-                Element elt = addElement(doc, "messagereceiver", className + mepToSuffixMap.get(key),
rootElement);
+                Element elt = addElement(doc, "messagereceiver", makeJavaClassName(serviceName)
+ mepToSuffixMap.get(key), rootElement);
                 addAttribute(doc, "mepURI", key.toString(), elt);
             }
 
@@ -1433,7 +1446,7 @@
         String serviceName = makeJavaClassName(axisService.getName());
         addAttribute(doc, "package", codeGenConfiguration.getPackageName(), rootElement);
         if (this.codeGenConfiguration.isBackwordCompatibilityMode()){
-             addAttribute(doc, "name", serviceName + SKELETON_CLASS_SUFFIX_BACK, rootElement);
+             addAttribute(doc, "name", makeJavaClassName(axisService.getBindingName()) +
SKELETON_CLASS_SUFFIX_BACK, rootElement);
         } else {
              addAttribute(doc, "name", serviceName + SKELETON_CLASS_SUFFIX, rootElement);
         }
@@ -1441,7 +1454,7 @@
                 rootElement);
         if (isSkeletonInterface) {
             if (this.codeGenConfiguration.isBackwordCompatibilityMode()){
-                addAttribute(doc, "skeletonInterfaceName", serviceName + SKELETON_INTERFACE_SUFFIX_BACK,
+                addAttribute(doc, "skeletonInterfaceName", makeJavaClassName(axisService.getPortTypeName())
+ SKELETON_INTERFACE_SUFFIX_BACK,
                     rootElement);
             } else {
                 addAttribute(doc, "skeletonInterfaceName", serviceName + SKELETON_INTERFACE_SUFFIX,
@@ -1471,7 +1484,7 @@
         String serviceName = makeJavaClassName(axisService.getName());
         addAttribute(doc, "package", codeGenConfiguration.getPackageName(), rootElement);
         if (this.codeGenConfiguration.isBackwordCompatibilityMode()){
-            addAttribute(doc, "name", serviceName + SKELETON_INTERFACE_SUFFIX_BACK, rootElement);
+            addAttribute(doc, "name", makeJavaClassName(axisService.getPortTypeName()) +
SKELETON_INTERFACE_SUFFIX_BACK, rootElement);
         } else {
             addAttribute(doc, "name", serviceName + SKELETON_INTERFACE_SUFFIX, rootElement);
         }

Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=472637&r1=472636&r2=472637
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
Wed Nov  8 12:54:00 2006
@@ -182,6 +182,11 @@
 
     private TypeTable typeTable;
 
+    // name of the  binding used : use in codegeneration
+    private String bindingName;
+    // name of the port type used : use in codegeneration
+    private String portTypeName;
+
     public String getWSAddressingFlag() {
         return wsaddressingFlag;
     }
@@ -240,6 +245,22 @@
         schemaList = new ArrayList();
         serviceClassLoader = Thread.currentThread().getContextClassLoader();
         objectSupplier = new DefaultObjectSupplier();
+    }
+
+    public String getPortTypeName() {
+        return portTypeName;
+    }
+
+    public void setPortTypeName(String portTypeName) {
+        this.portTypeName = portTypeName;
+    }
+
+    public String getBindingName() {
+        return bindingName;
+    }
+
+    public void setBindingName(String bindingName) {
+        this.bindingName = bindingName;
     }
 
     /**

Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?view=diff&rev=472637&r1=472636&r2=472637
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
Wed Nov  8 12:54:00 2006
@@ -428,6 +428,8 @@
             PortType portType = dif.getPortType(binding.getPortType().getQName());
             processPortType(portType, dif);
 
+            axisService.setBindingName(binding.getQName().getLocalPart());
+
             // String portTypeNs = portType.getQName().getNamespaceURI();
             List list = binding.getBindingOperations();
             for (int i = 0; i < list.size(); i++) {
@@ -883,6 +885,9 @@
 
         copyExtensionAttributes(wsdl4jPortType.getExtensionAttributes(),
                 axisService, PORT_TYPE);
+
+        // set port the type name
+        axisService.setPortTypeName(wsdl4jPortType.getQName().getLocalPart());
 
         Iterator wsdl4JOperationsIterator = wsdl4jPortType.getOperations()
                 .iterator();



---------------------------------------------------------------------
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