[cr2] Point webservice consumer classes to centralrepository, code cleanup
authorIván Perdomo <ivan.perdomo@openbravo.com>
Tue, 22 Sep 2009 10:15:48 +0200
changeset 5062 69e4e32e3412
parent 5061 47af2fa0cb9f
child 5063 c2c265800af4
[cr2] Point webservice consumer classes to centralrepository, code cleanup
- Changed build.xml
- Regenerated classes
- Remove unused classes
src/build.xml
src/org/openbravo/services/webservice/WebServiceImplServiceLocator.java
src/org/openbravo/services/webservice/WebServiceSoapBindingStub.java
src/org/openbravo/services/webservice/deploy.wsdd
--- a/src/build.xml	Mon Sep 21 13:19:43 2009 +0200
+++ b/src/build.xml	Tue Sep 22 10:15:48 2009 +0200
@@ -756,8 +756,8 @@
     </delete>
 
     <mkdir dir="${build}" />
-     <axis-wsdl2java output="${base.src}" verbose="false" url="http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2?wsdl" serverside="true" debug="false">
-      <mapping namespace="http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2" package="org.openbravo.services.webservice" />
+     <axis-wsdl2java output="${base.src}" verbose="false" url="http://centralrepository.openbravo.com/openbravo/services/WebService2?wsdl" serverside="true" debug="false">
+      <mapping namespace="http://centralrepository.openbravo.com/openbravo/services/WebService2" package="org.openbravo.services.webservice" />
       <mapping namespace="/services/WebService2" package="org.openbravo.services.webservice" />
     </axis-wsdl2java>
   </target>
--- a/src/org/openbravo/services/webservice/WebServiceImplServiceLocator.java	Mon Sep 21 13:19:43 2009 +0200
+++ b/src/org/openbravo/services/webservice/WebServiceImplServiceLocator.java	Tue Sep 22 10:15:48 2009 +0200
@@ -22,7 +22,7 @@
     }
 
     // Use to get a proxy class for WebService
-    private java.lang.String WebService_address = "http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2";
+    private java.lang.String WebService_address = "http://centralrepository.openbravo.com/openbravo/services/WebService2";
 
     public java.lang.String getWebServiceAddress() {
         return WebService_address;
@@ -105,7 +105,7 @@
     }
 
     public javax.xml.namespace.QName getServiceName() {
-        return new javax.xml.namespace.QName("http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2", "WebServiceImplService");
+        return new javax.xml.namespace.QName("http://centralrepository.openbravo.com/openbravo/services/WebService2", "WebServiceImplService");
     }
 
     private java.util.HashSet ports = null;
@@ -113,7 +113,7 @@
     public java.util.Iterator getPorts() {
         if (ports == null) {
             ports = new java.util.HashSet();
-            ports.add(new javax.xml.namespace.QName("http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2", "WebService"));
+            ports.add(new javax.xml.namespace.QName("http://centralrepository.openbravo.com/openbravo/services/WebService2", "WebService"));
         }
         return ports.iterator();
     }
--- a/src/org/openbravo/services/webservice/WebServiceSoapBindingStub.java	Mon Sep 21 13:19:43 2009 +0200
+++ b/src/org/openbravo/services/webservice/WebServiceSoapBindingStub.java	Tue Sep 22 10:15:48 2009 +0200
@@ -38,9 +38,9 @@
         oper.setName("moduleSearch");
         param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "word"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
         oper.addParameter(param);
-        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "exclude"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2", "ArrayOf_xsd_string"), java.lang.String[].class, false, false);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "exclude"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://centralrepository.openbravo.com/openbravo/services/WebService2", "ArrayOf_xsd_string"), java.lang.String[].class, false, false);
         oper.addParameter(param);
-        oper.setReturnType(new javax.xml.namespace.QName("http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2", "ArrayOf_tns1_SimpleModule"));
+        oper.setReturnType(new javax.xml.namespace.QName("http://centralrepository.openbravo.com/openbravo/services/WebService2", "ArrayOf_tns1_SimpleModule"));
         oper.setReturnClass(org.openbravo.services.webservice.SimpleModule[].class);
         oper.setReturnQName(new javax.xml.namespace.QName("", "moduleSearchReturn"));
         oper.setStyle(org.apache.axis.constants.Style.RPC);
@@ -84,7 +84,7 @@
         oper.setName("moduleScanForUpdates");
         param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "moduleIdInstalledModules"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://xml.apache.org/xml-soap", "Map"), java.util.HashMap.class, false, false);
         oper.addParameter(param);
-        oper.setReturnType(new javax.xml.namespace.QName("http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2", "ArrayOf_tns1_SimpleModule"));
+        oper.setReturnType(new javax.xml.namespace.QName("http://centralrepository.openbravo.com/openbravo/services/WebService2", "ArrayOf_tns1_SimpleModule"));
         oper.setReturnClass(org.openbravo.services.webservice.SimpleModule[].class);
         oper.setReturnQName(new javax.xml.namespace.QName("", "moduleScanForUpdatesReturn"));
         oper.setStyle(org.apache.axis.constants.Style.RPC);
@@ -110,9 +110,9 @@
         oper.setName("checkConsistency");
         param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "versionIdInstalled"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://xml.apache.org/xml-soap", "Map"), java.util.HashMap.class, false, false);
         oper.addParameter(param);
-        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "versionIdToInstall"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2", "ArrayOf_xsd_string"), java.lang.String[].class, false, false);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "versionIdToInstall"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://centralrepository.openbravo.com/openbravo/services/WebService2", "ArrayOf_xsd_string"), java.lang.String[].class, false, false);
         oper.addParameter(param);
-        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "versionIdToUpdate"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2", "ArrayOf_xsd_string"), java.lang.String[].class, false, false);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "versionIdToUpdate"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://centralrepository.openbravo.com/openbravo/services/WebService2", "ArrayOf_xsd_string"), java.lang.String[].class, false, false);
         oper.addParameter(param);
         oper.setReturnType(new javax.xml.namespace.QName("/services/WebService2", "ModuleInstallDetail"));
         oper.setReturnClass(org.openbravo.services.webservice.ModuleInstallDetail.class);
@@ -180,7 +180,7 @@
             cachedSerFactories.add(beansf);
             cachedDeserFactories.add(beandf);
 
-            qName = new javax.xml.namespace.QName("http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2", "ArrayOf_tns1_Module");
+            qName = new javax.xml.namespace.QName("http://centralrepository.openbravo.com/openbravo/services/WebService2", "ArrayOf_tns1_Module");
             cachedSerQNames.add(qName);
             cls = org.openbravo.services.webservice.Module[].class;
             cachedSerClasses.add(cls);
@@ -189,7 +189,7 @@
             cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2));
             cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory());
 
-            qName = new javax.xml.namespace.QName("http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2", "ArrayOf_tns1_ModuleDependency");
+            qName = new javax.xml.namespace.QName("http://centralrepository.openbravo.com/openbravo/services/WebService2", "ArrayOf_tns1_ModuleDependency");
             cachedSerQNames.add(qName);
             cls = org.openbravo.services.webservice.ModuleDependency[].class;
             cachedSerClasses.add(cls);
@@ -198,7 +198,7 @@
             cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2));
             cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory());
 
-            qName = new javax.xml.namespace.QName("http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2", "ArrayOf_tns1_SimpleModule");
+            qName = new javax.xml.namespace.QName("http://centralrepository.openbravo.com/openbravo/services/WebService2", "ArrayOf_tns1_SimpleModule");
             cachedSerQNames.add(qName);
             cls = org.openbravo.services.webservice.SimpleModule[].class;
             cachedSerClasses.add(cls);
@@ -207,7 +207,7 @@
             cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2));
             cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory());
 
-            qName = new javax.xml.namespace.QName("http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2", "ArrayOf_xsd_string");
+            qName = new javax.xml.namespace.QName("http://centralrepository.openbravo.com/openbravo/services/WebService2", "ArrayOf_xsd_string");
             cachedSerQNames.add(qName);
             cls = java.lang.String[].class;
             cachedSerClasses.add(cls);
--- a/src/org/openbravo/services/webservice/deploy.wsdd	Mon Sep 21 13:19:43 2009 +0200
+++ b/src/org/openbravo/services/webservice/deploy.wsdd	Tue Sep 22 10:15:48 2009 +0200
@@ -13,9 +13,9 @@
   <!-- Services from WebServiceImplService WSDL service -->
 
   <service name="WebService" provider="java:RPC" style="rpc" use="encoded">
-      <parameter name="wsdlTargetNamespace" value="http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2"/>
+      <parameter name="wsdlTargetNamespace" value="http://centralrepository.openbravo.com/openbravo/services/WebService2"/>
       <parameter name="wsdlServiceElement" value="WebServiceImplService"/>
-      <parameter name="schemaUnqualified" value="http://xml.apache.org/xml-soap,http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2,/services/WebService2"/>
+      <parameter name="schemaUnqualified" value="http://xml.apache.org/xml-soap,/services/WebService2,http://centralrepository.openbravo.com/openbravo/services/WebService2"/>
       <parameter name="wsdlServicePort" value="WebService"/>
       <parameter name="className" value="org.openbravo.services.webservice.WebServiceSoapBindingImpl"/>
       <parameter name="wsdlPortType" value="WebServiceImpl"/>
@@ -23,9 +23,9 @@
       <operation name="getModule" qname="operNS:getModule" xmlns:operNS="http://services.ws.erpCommon.openbravo.org" returnQName="getModuleReturn" returnType="rtns:base64Binary" xmlns:rtns="http://www.w3.org/2001/XMLSchema" soapAction="" >
         <parameter qname="moduleVersionID" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
       </operation>
-      <operation name="moduleSearch" qname="operNS:moduleSearch" xmlns:operNS="http://services.ws.erpCommon.openbravo.org" returnQName="moduleSearchReturn" returnType="rtns:ArrayOf_tns1_SimpleModule" xmlns:rtns="http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2" returnItemType="tns2:SimpleModule" xmlns:tns2="/services/WebService2" soapAction="" >
+      <operation name="moduleSearch" qname="operNS:moduleSearch" xmlns:operNS="http://services.ws.erpCommon.openbravo.org" returnQName="moduleSearchReturn" returnType="rtns:ArrayOf_tns1_SimpleModule" xmlns:rtns="http://centralrepository.openbravo.com/openbravo/services/WebService2" returnItemType="tns2:SimpleModule" xmlns:tns2="/services/WebService2" soapAction="" >
         <parameter qname="word" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
-        <parameter qname="exclude" type="tns:ArrayOf_xsd_string" xmlns:tns="http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2"/>
+        <parameter qname="exclude" type="tns:ArrayOf_xsd_string" xmlns:tns="http://centralrepository.openbravo.com/openbravo/services/WebService2"/>
       </operation>
       <operation name="moduleDetail" qname="operNS:moduleDetail" xmlns:operNS="http://services.ws.erpCommon.openbravo.org" returnQName="moduleDetailReturn" returnType="rtns:Module" xmlns:rtns="/services/WebService2" soapAction="" >
         <parameter qname="moduleVersionID" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
@@ -36,7 +36,7 @@
       <operation name="isCommercial" qname="operNS:isCommercial" xmlns:operNS="http://services.ws.erpCommon.openbravo.org" returnQName="isCommercialReturn" returnType="rtns:boolean" xmlns:rtns="http://www.w3.org/2001/XMLSchema" soapAction="" >
         <parameter qname="moduleVersionID" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
       </operation>
-      <operation name="moduleScanForUpdates" qname="operNS:moduleScanForUpdates" xmlns:operNS="http://services.ws.erpCommon.openbravo.org" returnQName="moduleScanForUpdatesReturn" returnType="rtns:ArrayOf_tns1_SimpleModule" xmlns:rtns="http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2" returnItemType="tns2:SimpleModule" xmlns:tns2="/services/WebService2" soapAction="" >
+      <operation name="moduleScanForUpdates" qname="operNS:moduleScanForUpdates" xmlns:operNS="http://services.ws.erpCommon.openbravo.org" returnQName="moduleScanForUpdatesReturn" returnType="rtns:ArrayOf_tns1_SimpleModule" xmlns:rtns="http://centralrepository.openbravo.com/openbravo/services/WebService2" returnItemType="tns2:SimpleModule" xmlns:tns2="/services/WebService2" soapAction="" >
         <parameter qname="moduleIdInstalledModules" type="tns:Map" xmlns:tns="http://xml.apache.org/xml-soap"/>
       </operation>
       <operation name="moduleRegister" qname="operNS:moduleRegister" xmlns:operNS="http://services.ws.erpCommon.openbravo.org" returnQName="moduleRegisterReturn" returnType="rtns:Module" xmlns:rtns="/services/WebService2" soapAction="" >
@@ -46,25 +46,11 @@
       </operation>
       <operation name="checkConsistency" qname="operNS:checkConsistency" xmlns:operNS="http://services.ws.erpCommon.openbravo.org" returnQName="checkConsistencyReturn" returnType="rtns:ModuleInstallDetail" xmlns:rtns="/services/WebService2" soapAction="" >
         <parameter qname="versionIdInstalled" type="tns:Map" xmlns:tns="http://xml.apache.org/xml-soap"/>
-        <parameter qname="versionIdToInstall" type="tns:ArrayOf_xsd_string" xmlns:tns="http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2"/>
-        <parameter qname="versionIdToUpdate" type="tns:ArrayOf_xsd_string" xmlns:tns="http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2"/>
+        <parameter qname="versionIdToInstall" type="tns:ArrayOf_xsd_string" xmlns:tns="http://centralrepository.openbravo.com/openbravo/services/WebService2"/>
+        <parameter qname="versionIdToUpdate" type="tns:ArrayOf_xsd_string" xmlns:tns="http://centralrepository.openbravo.com/openbravo/services/WebService2"/>
       </operation>
       <parameter name="allowedMethods" value="checkConsistency getModule moduleRegister moduleScanForUpdates isCommercial getURLforDownload moduleDetail moduleSearch"/>
 
-      <arrayMapping
-        xmlns:ns="http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2"
-        qname="ns:ArrayOf_xsd_string"
-        type="java:java.lang.String[]"
-        innerType="cmp-ns:string" xmlns:cmp-ns="http://www.w3.org/2001/XMLSchema"
-        encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-      />
-      <arrayMapping
-        xmlns:ns="http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2"
-        qname="ns:ArrayOf_tns1_ModuleDependency"
-        type="java:org.openbravo.services.webservice.ModuleDependency[]"
-        innerType="cmp-ns:ModuleDependency" xmlns:cmp-ns="/services/WebService2"
-        encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-      />
       <typeMapping
         xmlns:ns="/services/WebService2"
         qname="ns:ModuleInstallDetail"
@@ -89,20 +75,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
       />
-      <arrayMapping
-        xmlns:ns="http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2"
-        qname="ns:ArrayOf_tns1_Module"
-        type="java:org.openbravo.services.webservice.Module[]"
-        innerType="cmp-ns:Module" xmlns:cmp-ns="/services/WebService2"
-        encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-      />
-      <arrayMapping
-        xmlns:ns="http://stage.openbravo.essentiaforge.com/openbravo/services/WebService2"
-        qname="ns:ArrayOf_tns1_SimpleModule"
-        type="java:org.openbravo.services.webservice.SimpleModule[]"
-        innerType="cmp-ns:SimpleModule" xmlns:cmp-ns="/services/WebService2"
-        encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-      />
       <typeMapping
         xmlns:ns="/services/WebService2"
         qname="ns:ModuleDependency"
@@ -111,5 +83,33 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
       />
+      <arrayMapping
+        xmlns:ns="http://centralrepository.openbravo.com/openbravo/services/WebService2"
+        qname="ns:ArrayOf_tns1_SimpleModule"
+        type="java:org.openbravo.services.webservice.SimpleModule[]"
+        innerType="cmp-ns:SimpleModule" xmlns:cmp-ns="/services/WebService2"
+        encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+      />
+      <arrayMapping
+        xmlns:ns="http://centralrepository.openbravo.com/openbravo/services/WebService2"
+        qname="ns:ArrayOf_tns1_Module"
+        type="java:org.openbravo.services.webservice.Module[]"
+        innerType="cmp-ns:Module" xmlns:cmp-ns="/services/WebService2"
+        encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+      />
+      <arrayMapping
+        xmlns:ns="http://centralrepository.openbravo.com/openbravo/services/WebService2"
+        qname="ns:ArrayOf_tns1_ModuleDependency"
+        type="java:org.openbravo.services.webservice.ModuleDependency[]"
+        innerType="cmp-ns:ModuleDependency" xmlns:cmp-ns="/services/WebService2"
+        encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+      />
+      <arrayMapping
+        xmlns:ns="http://centralrepository.openbravo.com/openbravo/services/WebService2"
+        qname="ns:ArrayOf_xsd_string"
+        type="java:java.lang.String[]"
+        innerType="cmp-ns:string" xmlns:cmp-ns="http://www.w3.org/2001/XMLSchema"
+        encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+      />
   </service>
 </deployment>