aslom 2004/10/12 14:34:35
Modified: java build.xml classpath.bat classpath.sh java/doc changes.html java/src/org/apache/wsif/tools/tojava WSIFJavaTestCaseWriter.java java/test/docStyle/zipCodeNW ZipCodeResolverSoapStub.java java/test/interop/wsifserviceWrapped Doc_Test_BindingStub.java java/test/interop/wsifservice Doc_Test_BindingStub.java Removed: java/lib axis-1.1RC2.jar axis-1_1RC2-ant.jar Log: 2004-10-12: moved to use AXIS 1.2 RC1: important backward change in WSIFJavaTestCaseWriter to use new method writeComment(pw, p.getDocumentationElement(), true) instead of writeComment(pw, p.getDocumentationElement()) that no longer exist, additionally replaced all calls to no longer existing setScopedProperty() with setProperty() Revision Changes Path 1.38 +3 -3 ws-wsif/java/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/ws-wsif/java/build.xml,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- build.xml 21 Mar 2003 17:41:14 -0000 1.37 +++ build.xml 12 Oct 2004 21:34:34 -0000 1.38 @@ -48,10 +48,10 @@ <property name="name" value="wsif"/> <property name="dynamic.name" value="wsif-dynamic"/> <property name="Name" value="wsif"/> - <property name="wsif.version" value="2.0"/> + <property name="wsif.version" value="2.0.1_IB2"/> <property name="year-from" value="2002"/> - <property name="year-to" value="2003"/> - <property name="version.postfix" value=""/> + <property name="year-to" value="2004"/> + <property name="version.postfix" value="-${wsif.version}"/> <property name="javadoc.title" value="${Name}"/> <property name="build.compiler" value="classic"/> 1.5 +3 -0 ws-wsif/java/classpath.bat Index: classpath.bat =================================================================== RCS file: /home/cvs/ws-wsif/java/classpath.bat,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- classpath.bat 22 Jan 2003 19:20:33 -0000 1.4 +++ classpath.bat 12 Oct 2004 21:34:34 -0000 1.5 @@ -35,6 +35,9 @@ rem for %%i in (lib\soaprmi11\*.jar) do call lcp.bat %%i for %%i in (lib\*.jar) do call lcp.bat %%i +rem add extra JAR files (local not in CVS) needed for compilation or running +for %%i in (extra_lib\*.jar) do call lcp.bat %%i + if "%1" == "build" goto build_classpath if "%1" == "run" goto run_classpath if "%1" == "clean" goto clean_classpath 1.8 +5 -0 ws-wsif/java/classpath.sh Index: classpath.sh =================================================================== RCS file: /home/cvs/ws-wsif/java/classpath.sh,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- classpath.sh 23 Jan 2003 21:53:25 -0000 1.7 +++ classpath.sh 12 Oct 2004 21:34:34 -0000 1.8 @@ -9,6 +9,11 @@ # written by Aleksander Slominski [http://www.extreme.indiana.edu/~aslom] LOCALCLASSPATH=. +# add extra JAR files (local not in CVS) needed for compilation or running +if [ ! "`echo build/extra_lib/*.jar`" = "build/extra_lib/*.jar" ] ; then + LOCALCLASSPATH=`echo build/extra_lib/*.jar | tr ' ' ':'`:$LOCALCLASSPATH +fi + if [ "$1" = "build" ] ; then LOCALCLASSPATH=`echo lib/*.jar | tr ' ' ':'`:$LOCALCLASSPATH LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$LOCALCLASSPATH 1.19 +10 -1 ws-wsif/java/doc/changes.html Index: changes.html =================================================================== RCS file: /home/cvs/ws-wsif/java/doc/changes.html,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- changes.html 23 Jan 2003 17:24:00 -0000 1.18 +++ changes.html 12 Oct 2004 21:34:34 -0000 1.19 @@ -27,6 +27,15 @@ <li>modularization </ul> +<a name="WSIF_2_0_1"><h3>interim builds(WSIF_2_0_1) </h3></a> + +<ul> +<li>2004-10-12: moved to use AXIS 1.2 RC1: important backward change in WSIFJavaTestCaseWriter to use +new method writeComment(pw, p.getDocumentationElement(), true) instead of writeComment(pw, p.getDocumentationElement()) +that no longer exist, additionally replaced all calls to no longer existing setScopedProperty() with setProperty() +</li> +</ul> + <a name="WSIF_2_0"><h3>first official 2.0 release (WSIF_2_0) </h3></a> <p>current estimate: January 2003 after completing <a href="RELEASE_TASKS.txt">list of tasks scheduled for this release</a>. 1.8 +9 -9 ws-wsif/java/src/org/apache/wsif/tools/tojava/WSIFJavaTestCaseWriter.java Index: WSIFJavaTestCaseWriter.java =================================================================== RCS file: /home/cvs/ws-wsif/java/src/org/apache/wsif/tools/tojava/WSIFJavaTestCaseWriter.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- WSIFJavaTestCaseWriter.java 1 Mar 2004 23:53:19 -0000 1.7 +++ WSIFJavaTestCaseWriter.java 12 Oct 2004 21:34:35 -0000 1.8 @@ -1,12 +1,12 @@ /* * Copyright 2001,2004 The Apache Software Foundation. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -57,10 +57,10 @@ /** * WSIFJavaTestCaseWriter - * + * * WSIF version of the AXIS JavaTestCaseWriter that * generates a WSIF JUnit testcase program source. - * + * * @author <a href="mailto:[EMAIL PROTECTED]">Ant Elder</a> */ public class WSIFJavaTestCaseWriter extends JavaClassWriter { @@ -131,7 +131,7 @@ symbolTable.getPortTypeEntry(portType.getQName()); if (((WSIFEmitter) emitter).isTestcaseGenDII()) { - writeComment(pw, p.getDocumentationElement()); + writeComment(pw, p.getDocumentationElement(), true); String methodName = writeDIITestPortType( pw, @@ -142,7 +142,7 @@ diiPortTypeMethods.put(portType, methodName); } if (((WSIFEmitter) emitter).isTestcaseGenStubs()) { - writeComment(pw, p.getDocumentationElement()); + writeComment(pw, p.getDocumentationElement(), true); String methodName = writeStubTestPortType( pw, @@ -937,7 +937,7 @@ } /** - * Gets the fully qualified Java class name from a QName + * Gets the fully qualified Java class name from a QName */ protected String getClassName(QName type) { String className = ""; @@ -1059,7 +1059,7 @@ } /** - * add code to an already started code line + * add code to an already started code line */ protected void addCode(PrintWriter pw, String lineFragment) { pw.print(lineFragment); 1.2 +45 -43 ws-wsif/java/test/docStyle/zipCodeNW/ZipCodeResolverSoapStub.java Index: ZipCodeResolverSoapStub.java =================================================================== RCS file: /home/cvs/ws-wsif/java/test/docStyle/zipCodeNW/ZipCodeResolverSoapStub.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ZipCodeResolverSoapStub.java 13 Dec 2002 12:17:52 -0000 1.1 +++ ZipCodeResolverSoapStub.java 12 Oct 2004 21:34:35 -0000 1.2 @@ -12,52 +12,52 @@ private java.util.Vector cachedSerQNames = new java.util.Vector(); private java.util.Vector cachedSerFactories = new java.util.Vector(); private java.util.Vector cachedDeserFactories = new java.util.Vector(); - + public ZipCodeResolverSoapStub() throws org.apache.axis.AxisFault { - this(null); + this(null); } - + public ZipCodeResolverSoapStub(java.net.URL endpointURL, javax.xml.rpc.Service service) throws org.apache.axis.AxisFault { - this(service); - super.cachedEndpoint = endpointURL; + this(service); + super.cachedEndpoint = endpointURL; } - + public ZipCodeResolverSoapStub(javax.xml.rpc.Service service) throws org.apache.axis.AxisFault { if (service == null) { super.service = new org.apache.axis.client.Service(); } else { super.service = service; } - java.lang.Class cls; - javax.xml.namespace.QName qName; - java.lang.Class beansf = org.apache.axis.encoding.ser.BeanSerializerFactory.class; - java.lang.Class beandf = org.apache.axis.encoding.ser.BeanDeserializerFactory.class; - java.lang.Class enumsf = org.apache.axis.encoding.ser.EnumSerializerFactory.class; - java.lang.Class enumdf = org.apache.axis.encoding.ser.EnumDeserializerFactory.class; - java.lang.Class arraysf = org.apache.axis.encoding.ser.ArraySerializerFactory.class; - java.lang.Class arraydf = org.apache.axis.encoding.ser.ArrayDeserializerFactory.class; - java.lang.Class simplesf = org.apache.axis.encoding.ser.SimpleSerializerFactory.class; - java.lang.Class simpledf = org.apache.axis.encoding.ser.SimpleDeserializerFactory.class; - qName = new javax.xml.namespace.QName("http://webservices.eraserver.net/", ">ShortZipCodeResponse"); - cachedSerQNames.add(qName); - cls = docStyle.zipCodeNW.ShortZipCodeResponse.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://webservices.eraserver.net/", ">ShortZipCode"); - cachedSerQNames.add(qName); - cls = docStyle.zipCodeNW.ShortZipCode.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - + java.lang.Class cls; + javax.xml.namespace.QName qName; + java.lang.Class beansf = org.apache.axis.encoding.ser.BeanSerializerFactory.class; + java.lang.Class beandf = org.apache.axis.encoding.ser.BeanDeserializerFactory.class; + java.lang.Class enumsf = org.apache.axis.encoding.ser.EnumSerializerFactory.class; + java.lang.Class enumdf = org.apache.axis.encoding.ser.EnumDeserializerFactory.class; + java.lang.Class arraysf = org.apache.axis.encoding.ser.ArraySerializerFactory.class; + java.lang.Class arraydf = org.apache.axis.encoding.ser.ArrayDeserializerFactory.class; + java.lang.Class simplesf = org.apache.axis.encoding.ser.SimpleSerializerFactory.class; + java.lang.Class simpledf = org.apache.axis.encoding.ser.SimpleDeserializerFactory.class; + qName = new javax.xml.namespace.QName("http://webservices.eraserver.net/", ">ShortZipCodeResponse"); + cachedSerQNames.add(qName); + cls = docStyle.zipCodeNW.ShortZipCodeResponse.class; + cachedSerClasses.add(cls); + cachedSerFactories.add(beansf); + cachedDeserFactories.add(beandf); + + qName = new javax.xml.namespace.QName("http://webservices.eraserver.net/", ">ShortZipCode"); + cachedSerQNames.add(qName); + cls = docStyle.zipCodeNW.ShortZipCode.class; + cachedSerClasses.add(cls); + cachedSerFactories.add(beansf); + cachedDeserFactories.add(beandf); + } - + private org.apache.axis.client.Call createCall() throws java.rmi.RemoteException { try { org.apache.axis.client.Call _call = - (org.apache.axis.client.Call) super.service.createCall(); + (org.apache.axis.client.Call) super.service.createCall(); if (super.maintainSessionSet) { _call.setMaintainSession(super.maintainSession); } @@ -81,8 +81,8 @@ java.lang.String key = (java.lang.String) keys.nextElement(); if(_call.isPropertySupported(key)) _call.setProperty(key, super.cachedProperties.get(key)); - else - _call.setScopedProperty(key, super.cachedProperties.get(key)); + //else + // _call.setScopedProperty(key, super.cachedProperties.get(key)); } // All the type mapping information is registered // when the first call is made. @@ -96,11 +96,11 @@ for (int i = 0; i < cachedSerFactories.size(); ++i) { java.lang.Class cls = (java.lang.Class) cachedSerClasses.get(i); javax.xml.namespace.QName qName = - (javax.xml.namespace.QName) cachedSerQNames.get(i); + (javax.xml.namespace.QName) cachedSerQNames.get(i); java.lang.Class sf = (java.lang.Class) - cachedSerFactories.get(i); + cachedSerFactories.get(i); java.lang.Class df = (java.lang.Class) - cachedDeserFactories.get(i); + cachedDeserFactories.get(i); _call.registerTypeMapping(cls, qName, sf, df, false); } } @@ -111,7 +111,7 @@ throw new org.apache.axis.AxisFault("Failure trying to get the Call object", t); } } - + public docStyle.zipCodeNW.ShortZipCodeResponse shortZipCode(docStyle.zipCodeNW.ShortZipCode parameters) throws java.rmi.RemoteException { if (super.cachedEndpoint == null) { throw new org.apache.axis.NoEndPointException(); @@ -122,13 +122,15 @@ _call.setUseSOAPAction(true); _call.setSOAPActionURI("http://webservices.eraserver.net/ShortZipCode"); _call.setEncodingStyle(null); - _call.setScopedProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE); - _call.setScopedProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE); + //_call.setScopedProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE); + //_call.setScopedProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE); + _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE); + _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE); _call.setOperationStyle("document"); _call.setOperationName(new javax.xml.namespace.QName("http://webservices.eraserver.net/", "ShortZipCode")); - + java.lang.Object _resp = _call.invoke(new java.lang.Object[] {parameters}); - + if (_resp instanceof java.rmi.RemoteException) { throw (java.rmi.RemoteException)_resp; } @@ -140,5 +142,5 @@ } } } - + } 1.2 +121 -116 ws-wsif/java/test/interop/wsifserviceWrapped/Doc_Test_BindingStub.java Index: Doc_Test_BindingStub.java =================================================================== RCS file: /home/cvs/ws-wsif/java/test/interop/wsifserviceWrapped/Doc_Test_BindingStub.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Doc_Test_BindingStub.java 3 Jan 2003 14:40:45 -0000 1.1 +++ Doc_Test_BindingStub.java 12 Oct 2004 21:34:35 -0000 1.2 @@ -12,115 +12,115 @@ private java.util.Vector cachedSerQNames = new java.util.Vector(); private java.util.Vector cachedSerFactories = new java.util.Vector(); private java.util.Vector cachedDeserFactories = new java.util.Vector(); - + public Doc_Test_BindingStub() throws org.apache.axis.AxisFault { - this(null); + this(null); } - + public Doc_Test_BindingStub(java.net.URL endpointURL, javax.xml.rpc.Service service) throws org.apache.axis.AxisFault { - this(service); - super.cachedEndpoint = endpointURL; + this(service); + super.cachedEndpoint = endpointURL; } - + public Doc_Test_BindingStub(javax.xml.rpc.Service service) throws org.apache.axis.AxisFault { if (service == null) { super.service = new org.apache.axis.client.Service(); } else { super.service = service; } - java.lang.Class cls; - javax.xml.namespace.QName qName; - java.lang.Class beansf = org.apache.axis.encoding.ser.BeanSerializerFactory.class; - java.lang.Class beandf = org.apache.axis.encoding.ser.BeanDeserializerFactory.class; - java.lang.Class enumsf = org.apache.axis.encoding.ser.EnumSerializerFactory.class; - java.lang.Class enumdf = org.apache.axis.encoding.ser.EnumDeserializerFactory.class; - java.lang.Class arraysf = org.apache.axis.encoding.ser.ArraySerializerFactory.class; - java.lang.Class arraydf = org.apache.axis.encoding.ser.ArrayDeserializerFactory.class; - java.lang.Class simplesf = org.apache.axis.encoding.ser.SimpleSerializerFactory.class; - java.lang.Class simpledf = org.apache.axis.encoding.ser.SimpleDeserializerFactory.class; - qName = new javax.xml.namespace.QName("http://soapinterop.org/", ">ComplexDocument"); - cachedSerQNames.add(qName); - cls = interop.wsifserviceWrapped.ComplexDocument_ElemType.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://soapinterop.org/", ">SingleTagResponse"); - cachedSerQNames.add(qName); - cls = interop.wsifserviceWrapped.SingleTagResponse.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://soapinterop.org/", "ArrayOfSimpleDocument"); - cachedSerQNames.add(qName); - cls = interop.wsifserviceWrapped.ArrayOfSimpleDocument.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://soapinterop.org/", "SingleTag"); - cachedSerQNames.add(qName); - cls = interop.wsifserviceWrapped.SingleTag_Type.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://soapinterop.org/", "ComplexDocument"); - cachedSerQNames.add(qName); - cls = interop.wsifserviceWrapped.ComplexDocument_Type.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://soapinterop.org/", "ChildDocument"); - cachedSerQNames.add(qName); - cls = interop.wsifserviceWrapped.ChildDocument.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://soapinterop.org/", ">SimpleDocumentResponse"); - cachedSerQNames.add(qName); - cls = interop.wsifserviceWrapped.SimpleDocumentResponse.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://soapinterop.org/", ">SimpleDocument"); - cachedSerQNames.add(qName); - cls = interop.wsifserviceWrapped.SimpleDocument_ElemType.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://soapinterop.org/", "SimpleDocument"); - cachedSerQNames.add(qName); - cls = interop.wsifserviceWrapped.SimpleDocument_Type.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(simplesf); - cachedDeserFactories.add(simpledf); - - qName = new javax.xml.namespace.QName("http://soapinterop.org/", ">SingleTag"); - cachedSerQNames.add(qName); - cls = interop.wsifserviceWrapped.SingleTag_ElemType.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://soapinterop.org/", ">ComplexDocumentResponse"); - cachedSerQNames.add(qName); - cls = interop.wsifserviceWrapped.ComplexDocumentResponse.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - + java.lang.Class cls; + javax.xml.namespace.QName qName; + java.lang.Class beansf = org.apache.axis.encoding.ser.BeanSerializerFactory.class; + java.lang.Class beandf = org.apache.axis.encoding.ser.BeanDeserializerFactory.class; + java.lang.Class enumsf = org.apache.axis.encoding.ser.EnumSerializerFactory.class; + java.lang.Class enumdf = org.apache.axis.encoding.ser.EnumDeserializerFactory.class; + java.lang.Class arraysf = org.apache.axis.encoding.ser.ArraySerializerFactory.class; + java.lang.Class arraydf = org.apache.axis.encoding.ser.ArrayDeserializerFactory.class; + java.lang.Class simplesf = org.apache.axis.encoding.ser.SimpleSerializerFactory.class; + java.lang.Class simpledf = org.apache.axis.encoding.ser.SimpleDeserializerFactory.class; + qName = new javax.xml.namespace.QName("http://soapinterop.org/", ">ComplexDocument"); + cachedSerQNames.add(qName); + cls = interop.wsifserviceWrapped.ComplexDocument_ElemType.class; + cachedSerClasses.add(cls); + cachedSerFactories.add(beansf); + cachedDeserFactories.add(beandf); + + qName = new javax.xml.namespace.QName("http://soapinterop.org/", ">SingleTagResponse"); + cachedSerQNames.add(qName); + cls = interop.wsifserviceWrapped.SingleTagResponse.class; + cachedSerClasses.add(cls); + cachedSerFactories.add(beansf); + cachedDeserFactories.add(beandf); + + qName = new javax.xml.namespace.QName("http://soapinterop.org/", "ArrayOfSimpleDocument"); + cachedSerQNames.add(qName); + cls = interop.wsifserviceWrapped.ArrayOfSimpleDocument.class; + cachedSerClasses.add(cls); + cachedSerFactories.add(beansf); + cachedDeserFactories.add(beandf); + + qName = new javax.xml.namespace.QName("http://soapinterop.org/", "SingleTag"); + cachedSerQNames.add(qName); + cls = interop.wsifserviceWrapped.SingleTag_Type.class; + cachedSerClasses.add(cls); + cachedSerFactories.add(beansf); + cachedDeserFactories.add(beandf); + + qName = new javax.xml.namespace.QName("http://soapinterop.org/", "ComplexDocument"); + cachedSerQNames.add(qName); + cls = interop.wsifserviceWrapped.ComplexDocument_Type.class; + cachedSerClasses.add(cls); + cachedSerFactories.add(beansf); + cachedDeserFactories.add(beandf); + + qName = new javax.xml.namespace.QName("http://soapinterop.org/", "ChildDocument"); + cachedSerQNames.add(qName); + cls = interop.wsifserviceWrapped.ChildDocument.class; + cachedSerClasses.add(cls); + cachedSerFactories.add(beansf); + cachedDeserFactories.add(beandf); + + qName = new javax.xml.namespace.QName("http://soapinterop.org/", ">SimpleDocumentResponse"); + cachedSerQNames.add(qName); + cls = interop.wsifserviceWrapped.SimpleDocumentResponse.class; + cachedSerClasses.add(cls); + cachedSerFactories.add(beansf); + cachedDeserFactories.add(beandf); + + qName = new javax.xml.namespace.QName("http://soapinterop.org/", ">SimpleDocument"); + cachedSerQNames.add(qName); + cls = interop.wsifserviceWrapped.SimpleDocument_ElemType.class; + cachedSerClasses.add(cls); + cachedSerFactories.add(beansf); + cachedDeserFactories.add(beandf); + + qName = new javax.xml.namespace.QName("http://soapinterop.org/", "SimpleDocument"); + cachedSerQNames.add(qName); + cls = interop.wsifserviceWrapped.SimpleDocument_Type.class; + cachedSerClasses.add(cls); + cachedSerFactories.add(simplesf); + cachedDeserFactories.add(simpledf); + + qName = new javax.xml.namespace.QName("http://soapinterop.org/", ">SingleTag"); + cachedSerQNames.add(qName); + cls = interop.wsifserviceWrapped.SingleTag_ElemType.class; + cachedSerClasses.add(cls); + cachedSerFactories.add(beansf); + cachedDeserFactories.add(beandf); + + qName = new javax.xml.namespace.QName("http://soapinterop.org/", ">ComplexDocumentResponse"); + cachedSerQNames.add(qName); + cls = interop.wsifserviceWrapped.ComplexDocumentResponse.class; + cachedSerClasses.add(cls); + cachedSerFactories.add(beansf); + cachedDeserFactories.add(beandf); + } - + private org.apache.axis.client.Call createCall() throws java.rmi.RemoteException { try { org.apache.axis.client.Call _call = - (org.apache.axis.client.Call) super.service.createCall(); + (org.apache.axis.client.Call) super.service.createCall(); if (super.maintainSessionSet) { _call.setMaintainSession(super.maintainSession); } @@ -144,8 +144,8 @@ java.lang.String key = (java.lang.String) keys.nextElement(); if(_call.isPropertySupported(key)) _call.setProperty(key, super.cachedProperties.get(key)); - else - _call.setScopedProperty(key, super.cachedProperties.get(key)); + //else + // _call.setScopedProperty(key, super.cachedProperties.get(key)); } // All the type mapping information is registered // when the first call is made. @@ -159,11 +159,11 @@ for (int i = 0; i < cachedSerFactories.size(); ++i) { java.lang.Class cls = (java.lang.Class) cachedSerClasses.get(i); javax.xml.namespace.QName qName = - (javax.xml.namespace.QName) cachedSerQNames.get(i); + (javax.xml.namespace.QName) cachedSerQNames.get(i); java.lang.Class sf = (java.lang.Class) - cachedSerFactories.get(i); + cachedSerFactories.get(i); java.lang.Class df = (java.lang.Class) - cachedDeserFactories.get(i); + cachedDeserFactories.get(i); _call.registerTypeMapping(cls, qName, sf, df, false); } } @@ -174,7 +174,7 @@ throw new org.apache.axis.AxisFault("Failure trying to get the Call object", t); } } - + public interop.wsifserviceWrapped.SingleTagResponse singleTag(interop.wsifserviceWrapped.SingleTag_ElemType parameters) throws java.rmi.RemoteException { if (super.cachedEndpoint == null) { throw new org.apache.axis.NoEndPointException(); @@ -185,13 +185,16 @@ _call.setUseSOAPAction(true); _call.setSOAPActionURI("http://soapinterop.org/SingleTag"); _call.setEncodingStyle(null); - _call.setScopedProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE); - _call.setScopedProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE); + //_call.setScopedProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE); + //_call.setScopedProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE); + _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE); + _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE); + _call.setOperationStyle("document"); _call.setOperationName(new javax.xml.namespace.QName("http://soapinterop.org/", "SingleTag")); - + java.lang.Object _resp = _call.invoke(new java.lang.Object[] {parameters}); - + if (_resp instanceof java.rmi.RemoteException) { throw (java.rmi.RemoteException)_resp; } @@ -203,7 +206,7 @@ } } } - + public interop.wsifserviceWrapped.SimpleDocumentResponse simpleDocument(interop.wsifserviceWrapped.SimpleDocument_ElemType parameters) throws java.rmi.RemoteException { if (super.cachedEndpoint == null) { throw new org.apache.axis.NoEndPointException(); @@ -214,13 +217,15 @@ _call.setUseSOAPAction(true); _call.setSOAPActionURI("http://soapinterop.org/SimpleDocument"); _call.setEncodingStyle(null); - _call.setScopedProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE); - _call.setScopedProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE); +// _call.setScopedProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE); +// _call.setScopedProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE); + _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE); + _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE); _call.setOperationStyle("document"); _call.setOperationName(new javax.xml.namespace.QName("http://soapinterop.org/", "SimpleDocument")); - + java.lang.Object _resp = _call.invoke(new java.lang.Object[] {parameters}); - + if (_resp instanceof java.rmi.RemoteException) { throw (java.rmi.RemoteException)_resp; } @@ -232,7 +237,7 @@ } } } - + public interop.wsifserviceWrapped.ComplexDocumentResponse complexDocument(interop.wsifserviceWrapped.ComplexDocument_ElemType parameters) throws java.rmi.RemoteException { if (super.cachedEndpoint == null) { throw new org.apache.axis.NoEndPointException(); @@ -243,13 +248,13 @@ _call.setUseSOAPAction(true); _call.setSOAPActionURI("http://soapinterop.org/ComplexDocument"); _call.setEncodingStyle(null); - _call.setScopedProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE); - _call.setScopedProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE); + _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE); + _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE); _call.setOperationStyle("document"); _call.setOperationName(new javax.xml.namespace.QName("http://soapinterop.org/", "ComplexDocument")); - + java.lang.Object _resp = _call.invoke(new java.lang.Object[] {parameters}); - + if (_resp instanceof java.rmi.RemoteException) { throw (java.rmi.RemoteException)_resp; } @@ -261,5 +266,5 @@ } } } - + } 1.2 +14 -8 ws-wsif/java/test/interop/wsifservice/Doc_Test_BindingStub.java Index: Doc_Test_BindingStub.java =================================================================== RCS file: /home/cvs/ws-wsif/java/test/interop/wsifservice/Doc_Test_BindingStub.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Doc_Test_BindingStub.java 3 Jan 2003 10:41:40 -0000 1.1 +++ Doc_Test_BindingStub.java 12 Oct 2004 21:34:35 -0000 1.2 @@ -102,8 +102,8 @@ java.lang.String key = (java.lang.String) keys.nextElement(); if(_call.isPropertySupported(key)) _call.setProperty(key, super.cachedProperties.get(key)); - else - _call.setScopedProperty(key, super.cachedProperties.get(key)); + //else + // _call.setScopedProperty(key, super.cachedProperties.get(key)); } // All the type mapping information is registered // when the first call is made. @@ -143,8 +143,10 @@ _call.setUseSOAPAction(true); _call.setSOAPActionURI("http://soapinterop.org/SingleTag"); _call.setEncodingStyle(null); - _call.setScopedProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE); - _call.setScopedProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE); + //_call.setScopedProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE); + //_call.setScopedProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE); + _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE); + _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE); _call.setOperationStyle("wrapped"); _call.setOperationName(new javax.xml.namespace.QName("http://soapinterop.org/", "SingleTag")); _call.setReturnQName(new javax.xml.namespace.QName("http://soapinterop.org/", "SingleTag")); @@ -173,8 +175,10 @@ _call.setUseSOAPAction(true); _call.setSOAPActionURI("http://soapinterop.org/SimpleDocument"); _call.setEncodingStyle(null); - _call.setScopedProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE); - _call.setScopedProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE); + //_call.setScopedProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE); + //_call.setScopedProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE); + _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE); + _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE); _call.setOperationStyle("wrapped"); _call.setOperationName(new javax.xml.namespace.QName("http://soapinterop.org/", "SimpleDocument")); _call.setReturnQName(new javax.xml.namespace.QName("http://soapinterop.org/", "SimpleDocument")); @@ -203,8 +207,10 @@ _call.setUseSOAPAction(true); _call.setSOAPActionURI("http://soapinterop.org/ComplexDocument"); _call.setEncodingStyle(null); - _call.setScopedProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE); - _call.setScopedProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE); + //_call.setScopedProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE); + //_call.setScopedProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE); + _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE); + _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE); _call.setOperationStyle("wrapped"); _call.setOperationName(new javax.xml.namespace.QName("http://soapinterop.org/", "ComplexDocument")); _call.setReturnQName(new javax.xml.namespace.QName("http://soapinterop.org/", "ComplexDocument"));