jbossws-commits November 2006

jbossws-commits@lists.jboss.org

1 participants
190 discussions

JBossWS SVN: r1496 - in trunk: . src/main/java/org/jboss/ws/binding src/main/java/org/jboss/ws/common src/main/java/org/jboss/ws/metadata src/main/java/org/jboss/ws/metadata/wsdl src/main/java/org/jboss/ws/server src/main/java/org/jboss/ws/soap src/test/java/org/jboss/test/ws/jaxrpc/marshall

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-21 15:58:12 -0500 (Tue, 21 Nov 2006) New Revision: 1496 Modified: trunk/ant.properties.example trunk/src/main/java/org/jboss/ws/binding/EndpointInvocation.java trunk/src/main/java/org/jboss/ws/common/CommonClient.java trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java trunk/src/main/java/org/jboss/ws/server/AbstractServiceEndpointInvoker.java trunk/src/main/java/org/jboss/ws/soap/SOAPContentElement.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/marshall/StandardTypesBean.java Log: Fix opMetaData initialization when SEI mapping was not found. Message style parameters should not cause a wrapped endpoint to become bare FIXME: [JBWS-1333] Fix marshalling of null values in base64Binary, hexBinary Add marshalling of null values in base64Binary and hexBinary Modified: trunk/ant.properties.example =================================================================== --- trunk/ant.properties.example 2006-11-21 20:29:19 UTC (rev 1495) +++ trunk/ant.properties.example 2006-11-21 20:58:12 UTC (rev 1496) @@ -3,9 +3,8 @@ # # Required JBoss Home -#jboss.jdk15.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta +#jboss.jdk15.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta1 - # Optional JBoss Home #jboss.jdk14.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_4_GA/build/output/jboss-4.0.4.GA Modified: trunk/src/main/java/org/jboss/ws/binding/EndpointInvocation.java =================================================================== --- trunk/src/main/java/org/jboss/ws/binding/EndpointInvocation.java 2006-11-21 20:29:19 UTC (rev 1495) +++ trunk/src/main/java/org/jboss/ws/binding/EndpointInvocation.java 2006-11-21 20:58:12 UTC (rev 1496) @@ -229,7 +229,7 @@ } else if (paramValue instanceof SOAPContentElement) { - // For xsd:anyType we return the SOAPElement + // For type other than xsd:anyType we return the object value if (xmlType.getLocalPart().equals("anyType") == false) { SOAPContentElement soapElement = (SOAPContentElement)paramValue; @@ -294,7 +294,7 @@ Method method = opMetaData.getJavaMethod(); Class[] targetParameterTypes = method.getParameterTypes(); - if (opMetaData.isDocumentWrapped() && paramMetaData.isInHeader() == false) + if (opMetaData.isDocumentWrapped() && paramMetaData.isInHeader() == false && paramMetaData.isMessageType() == false) { outParameters = ParameterWrapping.unwrapRequestParameters(paramMetaData, paramValue, payload); syncOutWrappedParameters(targetParameterTypes); Modified: trunk/src/main/java/org/jboss/ws/common/CommonClient.java =================================================================== --- trunk/src/main/java/org/jboss/ws/common/CommonClient.java 2006-11-21 20:29:19 UTC (rev 1495) +++ trunk/src/main/java/org/jboss/ws/common/CommonClient.java 2006-11-21 20:58:12 UTC (rev 1496) @@ -363,7 +363,7 @@ if (retMetaData != null) { retValue = epInv.getReturnValue(); - if (opMetaData.isDocumentWrapped()) + if (opMetaData.isDocumentWrapped() && retMetaData.isMessageType() == false) retValue = ParameterWrapping.unwrapResponseParameters(retMetaData, retValue, inParams); } Modified: trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java 2006-11-21 20:29:19 UTC (rev 1495) +++ trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java 2006-11-21 20:58:12 UTC (rev 1496) @@ -25,6 +25,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Type; +import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -81,6 +82,13 @@ public AccessorFactory create(ParameterMetaData parameter); } + private static final List<String> messageTypes = new ArrayList<String>(); + static + { + messageTypes.add("javax.xml.soap.SOAPElement"); + messageTypes.add("org.w3c.dom.Element"); + } + public ParameterMetaData(OperationMetaData opMetaData, QName xmlName, QName xmlType, String javaTypeName) { this(opMetaData, xmlName, javaTypeName); @@ -195,7 +203,8 @@ ClassLoader loader = opMetaData.getEndpointMetaData().getClassLoader(); tmpJavaType = JavaUtils.loadJavaType(javaTypeName, loader); - if (opMetaData.getEndpointMetaData().getServiceMetaData().getUnifiedMetaData().isEagerInitialized()) + UnifiedMetaData wsMetaData = opMetaData.getEndpointMetaData().getServiceMetaData().getUnifiedMetaData(); + if (wsMetaData.isEagerInitialized()) { // This should not happen, see the warning in setJavaTypeName javaType = tmpJavaType; @@ -292,6 +301,16 @@ { this.soapArrayCompType = xmlType; } + + public boolean isMessageType() + { + return messageTypes.contains(javaTypeName); + } + + public static boolean isMessageType(String javaTypeName) + { + return messageTypes.contains(javaTypeName); + } /** Converts a proprietary JBossWS attachment xml type to the MIME type that it represents. */ @@ -350,7 +369,7 @@ // references like this is not very flexible. if (opMetaData.isDocumentWrapped()) { - (new DynamicWrapperGenerator(getClassLoader())).generate(this); + new DynamicWrapperGenerator(getClassLoader()).generate(this); // Initialize accessors AccessorFactory factory = accessorFactoryCreator.create(this); Modified: trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java 2006-11-21 20:29:19 UTC (rev 1495) +++ trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java 2006-11-21 20:58:12 UTC (rev 1496) @@ -359,7 +359,7 @@ // <xsd:import namespace="http://org.jboss.webservice/example/types" schemaLocation="Hello.xsd"/> // <xsd:import namespace="http://org.jboss.webservice/example/types/arrays/org/jboss/test/webservic..." schemaLocation="subdir/HelloArr.xsd"/> // </xsd:schema> - if (targetNS.length() == 0) + if (targetNS == null) { log.trace("Schema element without target namespace in: " + wsdlLoc); } Modified: trunk/src/main/java/org/jboss/ws/server/AbstractServiceEndpointInvoker.java =================================================================== --- trunk/src/main/java/org/jboss/ws/server/AbstractServiceEndpointInvoker.java 2006-11-21 20:29:19 UTC (rev 1495) +++ trunk/src/main/java/org/jboss/ws/server/AbstractServiceEndpointInvoker.java 2006-11-21 20:58:12 UTC (rev 1496) @@ -208,9 +208,9 @@ msgContext.setSOAPMessage(faultMessage); // call the handler chain - boolean handlersPass = handlerDelegate.callFaultHandlerChain(seInfo, HandlerType.POST, ex); - handlersPass = handlersPass && handlerDelegate.callFaultHandlerChain(seInfo, HandlerType.ENDPOINT, ex); - handlersPass = handlersPass && handlerDelegate.callFaultHandlerChain(seInfo, HandlerType.PRE, ex); + boolean handlersPass = callFaultHandlerChain(seInfo, HandlerType.POST, ex); + handlersPass = handlersPass && callFaultHandlerChain(seInfo, HandlerType.ENDPOINT, ex); + handlersPass = handlersPass && callFaultHandlerChain(seInfo, HandlerType.PRE, ex); } catch (Exception subEx) { Modified: trunk/src/main/java/org/jboss/ws/soap/SOAPContentElement.java =================================================================== --- trunk/src/main/java/org/jboss/ws/soap/SOAPContentElement.java 2006-11-21 20:29:19 UTC (rev 1495) +++ trunk/src/main/java/org/jboss/ws/soap/SOAPContentElement.java 2006-11-21 20:58:12 UTC (rev 1496) @@ -809,7 +809,6 @@ expandingToDOM = true; // DOM expansion should only happen when a handler accesses the DOM API. - // We do not allow DOM expansion on a dev release. CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); if (msgContext != null && UnifiedMetaData.isFinalRelease() == false) { Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2006-11-21 20:29:19 UTC (rev 1495) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2006-11-21 20:58:12 UTC (rev 1496) @@ -206,15 +206,23 @@ public void testBase64Binary() throws Exception { byte[] in = "base64Binary".getBytes(); - byte[] out = base64BinaryTest(in); - assertEquals(new String(in), new String(out)); + Object out = base64BinaryTest(in); + assertEquals(new String(in), new String((byte[])out)); + + System.out.println("FIXME: [JBWS-1333] Fix marshalling of null values in base64Binary, hexBinary"); + //out = base64BinaryTest(null); + //assertNull(out); } public void testHexBinary() throws Exception { byte[] in = "hexBinary".getBytes(); byte[] out = hexBinaryTest(in); - assertEquals(new String(in), new String(out)); + assertEquals(new String(in), new String((byte[])out)); + + System.out.println("FIXME: [JBWS-1333] Fix marshalling of null values in base64Binary, hexBinary"); + //out = hexBinaryTest(null); + //assertNull(out); } public void testCalendar() throws Exception Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/marshall/StandardTypesBean.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/marshall/StandardTypesBean.java 2006-11-21 20:29:19 UTC (rev 1495) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/marshall/StandardTypesBean.java 2006-11-21 20:58:12 UTC (rev 1496) @@ -166,13 +166,13 @@ public byte[] base64BinaryTest(byte[] param) { - log.info("base64BinaryTest: " + new String(param)); + log.info("base64BinaryTest: " + (param != null ? new String(param) : null)); return param; } public byte[] hexBinaryTest(byte[] param) { - log.info("hexBinaryTest: " + new String(param)); + log.info("hexBinaryTest: " + (param != null ? new String(param) : null)); return param; }

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r1495 - in trunk: . docs docs/user-guide/project docs/user-guide/project/en/modules docs/user-guide/project/en/modules/installation src/main/java/org/jboss/ws/deployment src/main/java/org/jboss/ws/integration/tomcat src/main/java/org/jboss/ws/metadata src/main/resources/dist src/main/resources/jbossws.war/Tomcat/WEB-INF src/main/resources/schema src/test/ant src/test/java/org/jboss/test/ws/jaxrpc src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest src/test/java/org/jbo

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-21 15:29:19 -0500 (Tue, 21 Nov 2006) New Revision: 1495 Added: trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentLoader.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/ trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/TestEndpoint.java trunk/src/test/resources/jaxrpc/jbws1093/ trunk/src/test/resources/jaxrpc/jbws1093/META-INF/ trunk/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml trunk/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/ trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/web.xml trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/webservices.xml trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/ trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl trunk/src/test/resources/jaxrpc/jbws1093/wstools-config.xml trunk/src/test/resources/jaxws/jbws981/ trunk/src/test/resources/jaxws/jbws981/META-INF/ trunk/src/test/resources/jaxws/jbws981/META-INF/application-client.xml trunk/src/test/resources/jaxws/jbws981/META-INF/jaxrpc-mapping.xml trunk/src/test/resources/jaxws/jbws981/META-INF/jboss-client.xml trunk/src/test/resources/jaxws/jbws981/META-INF/wsdl/ trunk/src/test/resources/jaxws/jbws981/META-INF/wsdl/TestService.wsdl trunk/src/test/resources/jaxws/jbws981/wstools-config.xml trunk/src/test/resources/tools/jbws1080/ trunk/src/test/resources/tools/jbws1080/wstools-config.xml Removed: trunk/docs/JBossWS.doc trunk/docs/project/ trunk/docs/wscompileIssues.txt trunk/docs/wsdl_mapping.doc trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/TestEndpoint.java trunk/src/test/resources/jaxrpc/jbws1093/META-INF/ trunk/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml trunk/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/ trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/web.xml trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/webservices.xml trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/ trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl trunk/src/test/resources/jaxrpc/jbws1093/wstools-config.xml trunk/src/test/resources/jaxws/jbws981/META-INF/ trunk/src/test/resources/jaxws/jbws981/META-INF/application-client.xml trunk/src/test/resources/jaxws/jbws981/META-INF/jaxrpc-mapping.xml trunk/src/test/resources/jaxws/jbws981/META-INF/jboss-client.xml trunk/src/test/resources/jaxws/jbws981/META-INF/wsdl/ trunk/src/test/resources/jaxws/jbws981/META-INF/wsdl/TestService.wsdl trunk/src/test/resources/jaxws/jbws981/wstools-config.xml trunk/src/test/resources/tools/jbws1080/wstools-config.xml Modified: trunk/build.xml trunk/docs/user-guide/project/build.xml trunk/docs/user-guide/project/en/modules/installation/install-jboss.xml trunk/docs/user-guide/project/en/modules/installation/install-tomcat.xml trunk/docs/user-guide/project/en/modules/introduction.xml trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java trunk/src/main/resources/dist/ReleaseNotes.txt trunk/src/main/resources/jbossws.war/Tomcat/WEB-INF/log4j.xml trunk/src/main/resources/schema/jbossws-tool_1_0.xsd trunk/src/test/ant/build-jars-jaxrpc.xml trunk/src/test/ant/build-jars-jaxws.xml trunk/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java Log: [JBWS-1301] Link install instructions in the user guide to release specific file [JBWS-1080] Made namespaces element mandatory in wstools configuration as it is required. [JBWS-981] Allow virtual hosts to be specified for EJB3 endpoints. [JBWS-1093] Refactoring of deployment to allow correct identification of servlets and web services. Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/build.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -468,7 +468,7 @@ <target name="most" description="Builds almost everything." depends="jars"/> <target name="all" description="Create a distribution zip file" - depends="main,jbossws-thirdparty-jar,build-samples,build-docs,build-bin-dist,build-src-dist"> + depends="build-bin-dist,build-src-dist"> </target>  @@ -477,7 +477,8 @@ </target>  - <target name="build-bin-dist" description="Build the binary distribution"> + <target name="build-bin-dist" description="Build the binary distribution" + depends="main,jbossws-thirdparty-jar,build-samples,build-docs"> <mkdir dir="${build.bin.dist}"/> <mkdir dir="${build.bin.dist}/bin"/> @@ -489,6 +490,7 @@ <mkdir dir="${build.bin.dist}/lib/tomcat/common/lib"/> <mkdir dir="${build.bin.dist}/lib/tomcat/webapps"/> + <copy todir="${build.bin.dist}" file="${src.etc.dir}/JBossORG-EULA.txt" overwrite="true"/> <copy todir="${build.bin.dist}" filtering="true" overwrite="true"> <fileset dir="${src.dist.dir}"/> <filterset> Deleted: trunk/docs/JBossWS.doc =================================================================== (Binary files differ) Modified: trunk/docs/user-guide/project/build.xml =================================================================== --- trunk/docs/user-guide/project/build.xml 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/docs/user-guide/project/build.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -16,10 +16,14 @@  <target name="all.doc" depends="get-docbook-support, copy-templates"> - <ant antfile="${doc.module.home}/build-docbook.xml" inheritall="false"> <property name="docbook-support.home" value="${docbook-support.home}"/> </ant> + <copy todir="build/en" file="../../../src/main/resources/dist/Install.txt" filtering="yes" overwrite="yes"> + <filterset> + <filtersfile file="../../../version.properties"/> + </filterset> + </copy> </target>  Modified: trunk/docs/user-guide/project/en/modules/installation/install-jboss.xml =================================================================== --- trunk/docs/user-guide/project/en/modules/installation/install-jboss.xml 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/docs/user-guide/project/en/modules/installation/install-jboss.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -34,5 +34,7 @@ <para>The integration layer hooks into the JBoss deployer architecture and allows you to hot-deploy POJO and EJB endpoints. The packaging of a standard portable J2EE-1.4 web service endpoints is defined by the JSR109 specification. JBossWS also supports JSR181 endpoints, which are significantly easier to develop and maintain.</para> + + <para>Additionally, please have a look at the <ulink url="http://labs.jboss.com/jbossws/user-guide/en/Install.txt">release specific install instructions</ulink>.</para> </sect1> Modified: trunk/docs/user-guide/project/en/modules/installation/install-tomcat.xml =================================================================== --- trunk/docs/user-guide/project/en/modules/installation/install-tomcat.xml 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/docs/user-guide/project/en/modules/installation/install-tomcat.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -64,4 +64,6 @@ </tomcat-users> ]]></programlisting></para> + <para>Additionally, please have a look at the <ulink url="http://labs.jboss.com/jbossws/user-guide/en/Install.txt">release specific install instructions</ulink>.</para> + </sect1> Modified: trunk/docs/user-guide/project/en/modules/introduction.xml =================================================================== --- trunk/docs/user-guide/project/en/modules/introduction.xml 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/docs/user-guide/project/en/modules/introduction.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <chapter id="introduction"> - <title>Introdcution</title> + <title>Introduction</title> <sect1 id="features"> <title>Features</title> Deleted: trunk/docs/wscompileIssues.txt =================================================================== --- trunk/docs/wscompileIssues.txt 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/docs/wscompileIssues.txt 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,10 +0,0 @@ -Issues seen using wscompile tool from Sun -======================================== -1. wscompile tool does not support element groups. It does not support the presence of <xsd:group> inside a complex type. -2. wscompile does not support complex type inheritance with restriction. -3. xsd:choice construct is unsupported. -4. Complex Types with mixed content. Does not generate java classes, but does the trick in serializers. -5. When <xsd:anyAttribute/> is added to a schema type, wscompile will not generate the java type for that schema type. It generates a literalserializer class instead. -6. When <xsd:element name="street" substitutionGroup="avenue"/> substitutionGroup will make wscompile to not generate a Java class but a literalserializer class. -7. Noticed an issue with Nillable Types where wscompile does not generate accessors for byte. This is the reason for the sole failure in XSDToJavaTestCase. - Deleted: trunk/docs/wsdl_mapping.doc =================================================================== (Binary files differ) Modified: trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -34,10 +34,8 @@ import org.jboss.ws.metadata.UnifiedMetaData; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCServerMetaDataBuilder; -import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilderEJB21; import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilderEJB3; import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilderJSE; -import org.jboss.ws.metadata.builder.jaxws.JAXWSProviderMetaDataBuilder; import org.jboss.ws.server.ServiceEndpointInfo; import org.jboss.ws.server.ServiceEndpointManager; import org.jboss.ws.server.WSDLFilePublisher; Copied: trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentLoader.java (from rev 1385, branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/DeploymentLoader.java) Modified: trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -150,7 +150,7 @@ { this.virtualHosts = virtualHosts; } - + public String getURLPattern() { return urlPattern; Modified: trunk/src/main/resources/dist/ReleaseNotes.txt =================================================================== --- trunk/src/main/resources/dist/ReleaseNotes.txt 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/src/main/resources/dist/ReleaseNotes.txt 2006-11-21 20:29:19 UTC (rev 1495) @@ -13,27 +13,72 @@ If you have any questions, please post to the JBossWS User Forum http://www.jboss.org/index.html?module=bb&op=viewforum&f=200 +For details see the change log. +http://jira.jboss.com/jira/browse/JBWS?report=com.atlassian.jira.plugin.system.project:changelog-panel + +For issues that are scheduled for future versions see the road map. +http://jira.jboss.com/jira/browse/JBWS?report=com.atlassian.jira.plugin.system.project:roadmap-panel + What's new in jbossws-(a)version.id@ ---------------------------------- -* [JBWS-852] Integration with Mikrocontainer -* [JBWS-865] Support security annotations for EJB3 endpoints -* [JBWS-871] Arrays with JSR181 endpoints -* [JBWS-923] Complete MTOM for rpc/literal -* [JBWS-776] WSDLToJava Support wildcards +* [JBWS-660] XOP inline base64Binary and sign message +* [JBWS-779] Add webservices.xml support to wsdlTojava +* [JBWS-868] BPEL in jbossws-samples +* [JBWS-1113] Improve performance of Service.getPort() +* [JBWS-1178] Multiple virtual host and soap:address problem +* [JBWS-1182] Change wsdl-java@file to wsdl-java@location +* [JBWS-1200] Provide source download for GA release +* [JBWS-1261] Provide support for additional MTOM java types besides byte[] +* [JBWS-1299] Add support for wsdl-java@parameter-style +* [JBWS-1302] Use EAR name in context root for EJB endpoints +* [JBWS-1323] Add JBoss EULA * Bug fixes -For details see the change log. -http://jira.jboss.com/jira/browse/JBWS?report=com.atlassian.jira.plugin.system.project:changelog-panel - Errata ------ -* None +* FIXME: [JBWS-1291] Fix JaxrpcMappingValidator +* FIXME: [JBWS-1292] Fix XOPElementRPCTestCase +* FIXME: [JBWS-269] Support attachments in Web Services Tools +* FIXME: [JBWS-269] Support attachments in Web Services Tools +* FIXME: [JBWS-434] Support sequences of anys +* FIXME: [JBWS-798] Complete EventingTestCase +* FIXME: [JBWS-798] Complete EventingTestCase +* FIXME: [JBWS-798] Complete EventingTestCase +* FIXME: [JBWS-940] Add wsdl-java support for jdk 1.4 typesafe enums -For issues that are scheduled for future versions see the road map. -http://jira.jboss.com/jira/browse/JBWS?report=com.atlassian.jira.plugin.system.project:roadmap-panel +Enjoy, +The JBossWS Team +Previous Releases ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +What's new in jbossws-1.0.3 +---------------------------------- + +* [JBWS-983] Configure SOAPAction on the Call object +* [JBWS-1090] preventing override of webservices.xml when multiple web services are processed with wstools +* [JBWS-1160] XOP Inline base64 for doc/lit requests +* Bug fixes + +What's new in jbossws-1.0.2 +---------------------------------- + +* [JBWS-855] Provide MTOM for document/literal +* [JBWS-920] integrate wstools wsdl2java functionality +* [JBWS-921] integrate wstools java2wsdl functionality +* [JBWS-932] Performance bottleneck when marshalling array types +* Bug fixes + +What's new in jbossws-1.0.1 +---------------------------------- + +* [JBWS-776] WSDLToJava Support wildcards +* [JBWS-852] Integration with Mikrocontainer +* [JBWS-865] Support security annotations for EJB3 endpoints +* [JBWS-871] Arrays with JSR181 endpoints +* [JBWS-923] Complete MTOM for rpc/literal +* Bug fixes + Enjoy, The JBossWS Team \ No newline at end of file Modified: trunk/src/main/resources/jbossws.war/Tomcat/WEB-INF/log4j.xml =================================================================== --- trunk/src/main/resources/jbossws.war/Tomcat/WEB-INF/log4j.xml 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/src/main/resources/jbossws.war/Tomcat/WEB-INF/log4j.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -7,7 +7,7 @@   - +  <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> - <param name="File" value="/usr/java/tomcat/logs/jbossws.log"/> + <param name="File" value="../logs/jbossws.log"/> <param name="Append" value="false"/>  Modified: trunk/src/main/resources/schema/jbossws-tool_1_0.xsd =================================================================== --- trunk/src/main/resources/schema/jbossws-tool_1_0.xsd 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/src/main/resources/schema/jbossws-tool_1_0.xsd 2006-11-21 20:29:19 UTC (rev 1495) @@ -201,7 +201,7 @@ <xs:complexType name="javaToWsdlType"> <xs:sequence> <xs:element name="service" type="ns1:serviceType"/> - <xs:element name="namespaces" type="ns1:namespacesType" minOccurs="0"> + <xs:element name="namespaces" type="ns1:namespacesType"> <xs:annotation> <xs:documentation>Namespaces to use when generating the WSDL file.</xs:documentation> </xs:annotation> Modified: trunk/src/test/ant/build-jars-jaxrpc.xml =================================================================== --- trunk/src/test/ant/build-jars-jaxrpc.xml 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/src/test/ant/build-jars-jaxrpc.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -565,6 +565,33 @@ </metainf> </jar> +  + <war warfile="${build.test.dir}/libs/jaxrpc-jbws1093.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1093/WEB-INF/web.xml"> + <classes dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.class"/> + </classes> + <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1093/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1093-client.jar"> + <fileset dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jbws1093/TestEndpoint.class"/> + </fileset> + <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1093/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1093/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> +  <war warfile="${build.test.dir}/libs/jaxrpc-jbws1107.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1107/WEB-INF/web.xml"> <classes dir="${build.test.dir}/classes"> Modified: trunk/src/test/ant/build-jars-jaxws.xml =================================================================== --- trunk/src/test/ant/build-jars-jaxws.xml 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/src/test/ant/build-jars-jaxws.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -106,6 +106,25 @@ </fileset> </jar> +  + <jar destfile="${build.test.dir}/libs/jaxws-jbws981.jar"> + <fileset dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws981/EJB3Bean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.class"/> + </fileset> + </jar> + <jar destfile="${build.test.dir}/libs/jaxws-jbws981-client.jar"> + <fileset dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws981/EndpointInterface.class"/> + </fileset> + <metainf dir="${build.test.dir}/resources/jaxws/jbws981/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/TestService.wsdl"/> + </metainf> + </jar> +  <war destfile="${build.test.dir}/libs/jaxws-jbws1178.war" webxml="${build.test.dir}/resources/jaxws/jbws1178/WEB-INF/web.xml"> <classes dir="${build.test.dir}/classes"> Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -320,12 +320,9 @@ inObj.setMyString("String1"); inObj.setMyStringArray(new String[] { "String1", "String2" }); - System.out.println("FIXME: [JBWS-485] SOAP encoded arrays as bean properties"); - if (true) - return; - - JavaBean retObj = port.javaBeanTest(inObj); - assertEquals(inObj, retObj); + //Wont't fix: [JBWS-485] SOAP encoded arrays as bean properties + //JavaBean retObj = port.javaBeanTest(inObj); + //assertEquals(inObj, retObj); } public void testLongArrayTest() throws Exception @@ -470,12 +467,9 @@ inObj.setMyString("String1"); inObj.setMyStringArray(new String[] { "String1", "String2" }); - System.out.println("FIXME: [JBWS-485] SOAP encoded arrays as bean properties"); - if (true) - return; - - ValueType retObj = port.valueTypeTest(inObj); - assertEquals(inObj, retObj); + //Wont't fix: [JBWS-485] SOAP encoded arrays as bean properties + //ValueType retObj = port.valueTypeTest(inObj); + //assertEquals(inObj, retObj); } public void testVoidTest() throws Exception Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093 (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,99 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.jbws1093; - -import java.io.BufferedReader; -import java.io.File; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.URL; - -import javax.naming.InitialContext; -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.jaxrpc.ServiceFactoryImpl; - -/** - * Test case to test that when a deployment contains both an endpoint and a - * servlet both are deployed correctly and can be accessed. - * - * @author darran.lofthouse(a)jboss.com - * @since 17-October-2006 - */ -public class JBWS1093TestCase extends JBossWSTest -{ - - private static TestEndpoint port; - - public static Test suite() throws Exception - { - return JBossWSTestSetup.newTestSetup(JBWS1093TestCase.class, "jaxrpc-jbws1093.war, jaxrpc-jbws1093-client.jar"); - } - - public void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - if (isTargetServerJBoss()) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - } - else - { - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new File("resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.test.ws/jbws1093", "TestService"); - Service service = factory.createService(wsdlURL, qname, mappingURL); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - } - } - } - - public void testAccessServlet() throws Exception - { - String host = System.getProperty("jbosstest.host.name"); - URL servletURL = new URL("http://" + host + ":8080" + "/jaxrpc-jbws1093/ServletTest"); - - InputStream is = servletURL.openStream(); - InputStreamReader isr = new InputStreamReader(is); - BufferedReader br = new BufferedReader(isr); - - String line = br.readLine(); - - assertEquals(ServletTest.MESSAGE, line); - } - - public void testAccessEnpoint() throws Exception - { - assertEquals(ServletTest.MESSAGE, port.echoString(ServletTest.MESSAGE)); - } - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,53 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.jbws1093; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * JBWS-1093 - This servlet is called ServletTest to check that we are - * not identifying servlets by the classname ending in 'Servlet'. - * - * @author darran.lofthouse(a)jboss.com - * @since 17-October-2006 - */ -public class ServletTest extends HttpServlet -{ - - private static final long serialVersionUID = 8465532467878198647L; - - public static final String MESSAGE = "Success!!"; - - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException - { - ServletOutputStream sos = response.getOutputStream(); - sos.println(MESSAGE); - } - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.java 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,36 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.jbws1093; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * @author darran.lofthouse(a)jboss.com - * @since 17-October-2006 - */ -public interface TestEndpoint extends Remote -{ - - public String echoString(final String message) throws RemoteException; - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.java (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.java 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.jbws1093; - -import java.rmi.RemoteException; - -/** - * @author darran.lofthouse(a)jboss.com - * @since 17-October-2006 - */ -public class TestEndpointImpl implements TestEndpoint -{ - - public String echoString(String message) throws RemoteException - { - return message; - } - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.java (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.java) Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -133,6 +133,31 @@ } + /** + * An element declared as wildcard uses an element + * declared in schema as wildcard contents. + */ + public void testWildCardContentsDeclared() throws Exception + { + SOAPFactory factory = SOAPFactory.newInstance(); + + SOAPElement el1 = factory.createElement("knownWildcard", "ns1", "http://somens"); + el1.setValue("Kermmit"); + + System.out.println("FIXME: [JBWS-434] Support sequences of anys"); + if (true) return; + + TypeOfAny3 inObj = new TypeOfAny3(el1); + TypeOfAny3 retObj = port.echo3(inObj); + + assertNotNull(retObj); + assertNotNull(retObj._any); + + SOAPElement inE = inObj._any; + SOAPElement retE = retObj._any; + assertEquals(inE, retE); + } + private static void assertEquals(SOAPElement myE, SOAPElement otherE) { assertEquals(otherE.getLocalName(), myE.getLocalName()); Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981 (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws981) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,67 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jbws981; - -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.management.MBeanServer; -import javax.management.ObjectName; - -import org.jboss.logging.Logger; -import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.ws.annotation.PortComponent; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since Nov 2, 2006 - */ -@Stateless -@WebService(name = "EndpointInterface", targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws981", serviceName = "TestService") -@SOAPBinding(style = SOAPBinding.Style.RPC) -@PortComponent(virtualHosts = { "localhost", "www.jboss.org" }) -public class EJB3Bean implements EJB3RemoteInterface -{ - - private static final Logger log = Logger.getLogger(EJB3Bean.class); - - @WebMethod - public String hello(final String message) - { - MBeanServer mbeanServer = MBeanServerLocator.locateJBoss(); - try - { - ObjectName on = new ObjectName("jboss.web:J2EEApplication=none,J2EEServer=none,WebModule=//www.jboss.org/..."); - mbeanServer.getMBeanInfo(on); - } - catch (Exception e) - { - log.error(e); - return e.getMessage(); - } - - return message; - } - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.java 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,35 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jbws981; - - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since Nov 2, 2006 - */ -public interface EJB3RemoteInterface -{ - - public String hello(final String message); - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.java (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Nov 02 21:17:37 CET 2006 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jaxws.jbws981; -public interface EndpointInterface extends java.rmi.Remote -{ - - public java.lang.String hello(java.lang.String string_1) throws java.rmi.RemoteException; -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,64 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jbws981; - -import javax.naming.InitialContext; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since Nov 2, 2006 - */ -public class JBWS981TestCase extends JBossWSTest -{ - - private static EndpointInterface port; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(JBWS981TestCase.class, "jaxws-jbws981.jar, jaxws-jbws981-client.jar"); - } - - protected void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (EndpointInterface)service.getPort(EndpointInterface.class); - } - } - - public void testCall() throws Exception - { - String message = "hello"; - assertEquals(message, port.hello(message)); - } - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java) Copied: trunk/src/test/java/org/jboss/test/ws/tools/jbws1080 (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080) Deleted: trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,54 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.tools.jbws1080; - -import java.io.IOException; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.ws.tools.WSTools; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since Nov 2, 2006 - */ -public class JBWS1080TestCase extends JBossWSTest -{ - - public final void testNoNamespaceElement() throws Exception - { - String resourceDir = "resources/tools/jbws1080"; - String toolsDir = "tools/jbws1080"; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - - try - { - new WSTools().generate(args); - fail("Expected exception not thrown."); - } - catch (IOException e) - { - assertTrue("Expected error", e.getMessage().contains("'{\"http://www.jboss.org/jbossws-tools\":namespaces}' is expected.")); - } - } - -} Copied: trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java) Deleted: trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/TestEndpoint.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080/TestEndpoint.java 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/TestEndpoint.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.tools.jbws1080; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since Nov 2, 2006 - */ -public interface TestEndpoint extends Remote -{ - - public String hello(final String message) throws RemoteException; - -} Copied: trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/TestEndpoint.java (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080/TestEndpoint.java) Modified: trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -65,7 +65,8 @@ System.out.println("FIXME: [JBWS-940] Add wsdl-java support for jdk 1.4 typesafe enums"); JBossSourceComparator sc = new JBossSourceComparator(file1, file2); - //Add Enum support! + + System.out.println("FIXME: [JBWS-940] Add wsdl-java support for jdk 1.4 typesafe enums"); //assertTrue("Source Files Match:", sc.validate()); //sc.validateImports(); Copied: trunk/src/test/resources/jaxrpc/jbws1093 (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093) Copied: trunk/src/test/resources/jaxrpc/jbws1093/META-INF (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/META-INF) Deleted: trunk/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" - version="1.4"> - - <display-name>TestService</display-name> - - <service-ref> - <service-ref-name>service/TestService</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1093.TestEndpoint</service-endpoint-interface> - </port-component-ref> - </service-ref> - -</application-client> - Copied: trunk/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml) Deleted: trunk/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - - <service-ref> - <service-ref-name>service/TestService</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws1093/TestEndpoint?wsdl</wsdl-override> - </service-ref> - -</jboss-client> Copied: trunk/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml) Copied: trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF) Deleted: trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,37 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.jbws1093</package-type> - <namespaceURI>http://org.jboss.test.ws/jbws1093/types</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws1093.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1093'>serviceNS:TestService</wsdl-service-name> - <port-mapping> - <port-name>TestEndpointPort</port-name> - <java-port-name>TestEndpointPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1093.TestEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1093'>portTypeNS:TestEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1093'>bindingNS:TestEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>echoString</java-method-name> - <wsdl-operation>echoString</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1093'>wsdlMsgNS:TestEndpoint_echoString</wsdl-message> - <wsdl-message-part-name>String_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1093'>wsdlMsgNS:TestEndpoint_echoStringResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml) Deleted: trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/web.xml 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/web.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>ServletTest</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1093.ServletTest</servlet-class> - </servlet> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1093.TestEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>ServletTest</servlet-name> - <url-pattern>/ServletTest</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/TestEndpoint</url-pattern> - </servlet-mapping> - -</web-app> - Copied: trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/web.xml (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/web.xml) Deleted: trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/webservices.xml 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/webservices.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,15 +0,0 @@ -<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1093' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> - <webservice-description> - <webservice-description-name>TestService</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestEndpointPort</port-component-name> - <wsdl-port>impl:TestEndpointPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1093.TestEndpoint</service-endpoint-interface> - <service-impl-bean> - <servlet-link>TestEndpoint</servlet-link> - </service-impl-bean> - </port-component> - </webservice-description> -</webservices> \ No newline at end of file Copied: trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/webservices.xml (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/webservices.xml) Copied: trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl) Deleted: trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1093' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1093' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types/> - <message name='TestEndpoint_echoString'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='TestEndpoint_echoStringResponse'> - <part name='result' type='xsd:string'/> - </message> - <portType name='TestEndpoint'> - <operation name='echoString' parameterOrder='String_1'> - <input message='tns:TestEndpoint_echoString'/> - <output message='tns:TestEndpoint_echoStringResponse'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echoString'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws/jbws1093' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws/jbws1093' use='literal'/> - </output> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='http://localhost:8080//jaxrpc-jbws1093/TestEndpoint?wsdl'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl) Deleted: trunk/src/test/resources/jaxrpc/jbws1093/wstools-config.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/wstools-config.xml 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/jaxrpc/jbws1093/wstools-config.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - -<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <java-wsdl> - <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1093.TestEndpoint" style="rpc"> - </service> - <namespaces target-namespace="http://org.jboss.test.ws/jbws1093" type-namespace="http://org.jboss.test.ws/jbws1093/types"/> - <mapping file="jaxrpc-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> -</configuration> Copied: trunk/src/test/resources/jaxrpc/jbws1093/wstools-config.xml (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/wstools-config.xml) Copied: trunk/src/test/resources/jaxws/jbws981 (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxws/jbws981) Copied: trunk/src/test/resources/jaxws/jbws981/META-INF (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxws/jbws981/META-INF) Deleted: trunk/src/test/resources/jaxws/jbws981/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxws/jbws981/META-INF/application-client.xml 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/jaxws/jbws981/META-INF/application-client.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" - version="1.4"> - - <display-name>JBWS981 Test</display-name> - - <service-ref> - <service-ref-name>service/TestService</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxws.jbws981.EndpointInterface</service-endpoint-interface> - </port-component-ref> - </service-ref> - -</application-client> - Copied: trunk/src/test/resources/jaxws/jbws981/META-INF/application-client.xml (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxws/jbws981/META-INF/application-client.xml) Deleted: trunk/src/test/resources/jaxws/jbws981/META-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxws/jbws981/META-INF/jaxrpc-mapping.xml 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/jaxws/jbws981/META-INF/jaxrpc-mapping.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,37 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jaxws.jbws981</package-type> - <namespaceURI>http://www.jboss.org/test/ws/jaxws/jbws981</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxws.jbws981.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://www.jboss.org/test/ws/jaxws/jbws981'>serviceNS:TestService</wsdl-service-name> - <port-mapping> - <port-name>EndpointInterfacePort</port-name> - <java-port-name>EndpointInterfacePort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxws.jbws981.EndpointInterface</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://www.jboss.org/test/ws/jaxws/jbws981'>portTypeNS:EndpointInterface</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://www.jboss.org/test/ws/jaxws/jbws981'>bindingNS:EndpointInterfaceBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>hello</java-method-name> - <wsdl-operation>hello</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://www.jboss.org/test/ws/jaxws/jbws981'>wsdlMsgNS:EndpointInterface_hello</wsdl-message> - <wsdl-message-part-name>String_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://www.jboss.org/test/ws/jaxws/jbws981'>wsdlMsgNS:EndpointInterface_helloResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: trunk/src/test/resources/jaxws/jbws981/META-INF/jaxrpc-mapping.xml (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxws/jbws981/META-INF/jaxrpc-mapping.xml) Deleted: trunk/src/test/resources/jaxws/jbws981/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxws/jbws981/META-INF/jboss-client.xml 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/jaxws/jbws981/META-INF/jboss-client.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,9 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> -</jboss-client> Copied: trunk/src/test/resources/jaxws/jbws981/META-INF/jboss-client.xml (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxws/jbws981/META-INF/jboss-client.xml) Copied: trunk/src/test/resources/jaxws/jbws981/META-INF/wsdl (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxws/jbws981/META-INF/wsdl) Deleted: trunk/src/test/resources/jaxws/jbws981/META-INF/wsdl/TestService.wsdl =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxws/jbws981/META-INF/wsdl/TestService.wsdl 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/jaxws/jbws981/META-INF/wsdl/TestService.wsdl 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,35 +0,0 @@ -<definitions name='TestService' targetNamespace='http://www.jboss.org/test/ws/jaxws/jbws981' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://www.jboss.org/test/ws/jaxws/jbws981' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types></types> - <message name='EndpointInterface_hello'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='EndpointInterface_helloResponse'> - <part name='result' type='xsd:string'/> - </message> - <portType name='EndpointInterface'> - - <operation name='hello' parameterOrder='String_1'> - <input message='tns:EndpointInterface_hello'/> - <output message='tns:EndpointInterface_helloResponse'/> - </operation> - </portType> - <binding name='EndpointInterfaceBinding' type='tns:EndpointInterface'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='hello'> - <soap:operation soapAction=''/> - - <input> - <soap:body namespace='http://www.jboss.org/test/ws/jaxws/jbws981' use='literal'/> - </input> - <output> - <soap:body namespace='http://www.jboss.org/test/ws/jaxws/jbws981' use='literal'/> - </output> - </operation> - </binding> - <service name='TestService'> - - <port binding='tns:EndpointInterfaceBinding' name='EndpointInterfacePort'> - <soap:address location='http://localhost.localdomain:8080/jaxws-jbws981/EJB3Bean'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/src/test/resources/jaxws/jbws981/META-INF/wsdl/TestService.wsdl (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxws/jbws981/META-INF/wsdl/TestService.wsdl) Deleted: trunk/src/test/resources/jaxws/jbws981/wstools-config.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxws/jbws981/wstools-config.xml 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/jaxws/jbws981/wstools-config.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<configuration xmlns="http://www.jboss.org/jbossws-tools" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <wsdl-java location="META-INF/wsdl/TestService.wsdl"> - <mapping file="jaxrpc-mapping.xml" /> - </wsdl-java> - -</configuration> \ No newline at end of file Copied: trunk/src/test/resources/jaxws/jbws981/wstools-config.xml (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxws/jbws981/wstools-config.xml) Copied: trunk/src/test/resources/tools/jbws1080 (from rev 1385, branches/jbossws-1.0/src/test/resources/tools/jbws1080) Deleted: trunk/src/test/resources/tools/jbws1080/wstools-config.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/tools/jbws1080/wstools-config.xml 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/tools/jbws1080/wstools-config.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,14 +0,0 @@ -<configuration xmlns="http://www.jboss.org/jbossws-tools" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <java-wsdl> - <service name="TestService" - endpoint="org.jboss.test.ws.tools.jbws1080.TestEndpoint" style="rpc" /> -  - <mapping file="jaxrpc-mapping.xml" /> - <webservices servlet-link="TestService" append="true" /> - </java-wsdl> - -</configuration> \ No newline at end of file Copied: trunk/src/test/resources/tools/jbws1080/wstools-config.xml (from rev 1385, branches/jbossws-1.0/src/test/resources/tools/jbws1080/wstools-config.xml)

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r1494 - in trunk/src: main/java/org/jboss/ws/common main/java/org/jboss/ws/integration/tomcat main/java/org/jboss/ws/metadata/j2ee main/java/org/jboss/ws/server test/ant test/java/org/jboss/test/ws/jaxrpc test/java/org/jboss/test/ws/jaxrpc/jbws1148 test/java/org/jboss/test/ws/jaxrpc/jbws1179 test/java/org/jboss/test/ws/jaxrpc/jbws1190 test/java/org/jboss/test/ws/jaxws test/java/org/jboss/test/ws/jaxws/jbws1190 test/resources/jaxrpc test/resources/jaxrpc/jbws1148 test/resources

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-21 15:02:08 -0500 (Tue, 21 Nov 2006) New Revision: 1494 Added: trunk/src/main/java/org/jboss/ws/common/MessageContextPropertyHelper.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java trunk/src/test/resources/jaxrpc/jbws1148/ trunk/src/test/resources/jaxrpc/jbws1148/META-INF/ trunk/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml trunk/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/ trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/jaxrpc-mapping.xml trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/web.xml trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/webservices.xml trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl/ trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl/TestService.wsdl trunk/src/test/resources/jaxrpc/jbws1148/wstools-config.xml trunk/src/test/resources/jaxrpc/jbws1179/ trunk/src/test/resources/jaxrpc/jbws1179/META-INF/ trunk/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml trunk/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/ trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/ trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl trunk/src/test/resources/jaxrpc/jbws1179/wstools-config.xml trunk/src/test/resources/jaxrpc/jbws1190/ trunk/src/test/resources/jaxrpc/jbws1190/META-INF/ trunk/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml trunk/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/ trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/confidential-mapping.xml trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/test-mapping.xml trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/webservices.xml trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl trunk/src/test/resources/jaxrpc/jbws1190/confidential-config.xml trunk/src/test/resources/jaxrpc/jbws1190/test-config.xml trunk/src/test/resources/jaxws/jbws1190/ trunk/src/test/resources/jaxws/jbws1190/WEB-INF/ trunk/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml Removed: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java trunk/src/test/resources/jaxrpc/jbws1148/META-INF/ trunk/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml trunk/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/ trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/jaxrpc-mapping.xml trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/web.xml trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/webservices.xml trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl/ trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl/TestService.wsdl trunk/src/test/resources/jaxrpc/jbws1148/wstools-config.xml trunk/src/test/resources/jaxrpc/jbws1179/META-INF/ trunk/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml trunk/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/ trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/ trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl trunk/src/test/resources/jaxrpc/jbws1179/wstools-config.xml trunk/src/test/resources/jaxrpc/jbws1190/META-INF/ trunk/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml trunk/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/ trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/confidential-mapping.xml trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/test-mapping.xml trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/webservices.xml trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl trunk/src/test/resources/jaxrpc/jbws1190/confidential-config.xml trunk/src/test/resources/jaxrpc/jbws1190/test-config.xml trunk/src/test/resources/jaxws/jbws1190/WEB-INF/ trunk/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml Modified: trunk/src/main/java/org/jboss/ws/common/CommonMessageContext.java trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java trunk/src/test/ant/build-jars-jaxrpc.xml trunk/src/test/ant/build-jars-jaxws.xml Log: [JBWS-1190] Respect transport-guarantee as specified in web.xml for POJO deployments. [JBWS-1179] Delay creation of HttpSession until it is actually used. [JBWS-1148] Test Case for anonymous simple types with restrictions. Modified: trunk/src/main/java/org/jboss/ws/common/CommonMessageContext.java =================================================================== --- trunk/src/main/java/org/jboss/ws/common/CommonMessageContext.java 2006-11-21 19:52:20 UTC (rev 1493) +++ trunk/src/main/java/org/jboss/ws/common/CommonMessageContext.java 2006-11-21 20:02:08 UTC (rev 1494) @@ -119,7 +119,14 @@ */ public Object getProperty(String name) { - return props.get(name); + Object value = props.get(name); + + if (value instanceof MessageContextPropertyHelper) + { + return ((MessageContextPropertyHelper)value).get(); + } + + return value; } /** Copied: trunk/src/main/java/org/jboss/ws/common/MessageContextPropertyHelper.java (from rev 1281, branches/jbossws-1.0/src/main/java/org/jboss/ws/common/MessageContextPropertyHelper.java) Modified: trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java 2006-11-21 19:52:20 UTC (rev 1493) +++ trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java 2006-11-21 20:02:08 UTC (rev 1494) @@ -28,8 +28,10 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; +import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; +import java.util.List; import java.util.Map; import javax.servlet.ServletContext; @@ -39,6 +41,8 @@ import org.jboss.ws.deployment.UnifiedDeploymentInfo; import org.jboss.ws.deployment.AbstractServiceEndpointPublisher; import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; import org.w3c.dom.Element; /** @@ -82,6 +86,7 @@ wmd.setContextRoot(getContextRoot(udi.url)); wmd.setConfigName(ctx.getInitParameter("jbossws-config-name")); wmd.setConfigFile(ctx.getInitParameter("jbossws-config-file")); + wmd.setSecurityMetaData(getSecurityMetaData(webXML)); return wmd; } @@ -143,6 +148,45 @@ return servletClassMap; } + private static List<UnifiedWebSecurityMetaData> getSecurityMetaData(final Element root) + { + ArrayList<UnifiedWebSecurityMetaData> securityMetaData = new ArrayList<UnifiedWebSecurityMetaData>(); + + Iterator itSecurityConstraint = DOMUtils.getChildElements(root, "security-constraint"); + while (itSecurityConstraint.hasNext()) + { + UnifiedWebSecurityMetaData uwsmd = new UnifiedWebSecurityMetaData(); + securityMetaData.add(uwsmd); + + Element securityConstraint = (Element)itSecurityConstraint.next(); + + Iterator itWebResCol = DOMUtils.getChildElements(securityConstraint, "web-resource-collection"); + while (itWebResCol.hasNext()) + { + Element webResCol = (Element)itWebResCol.next(); + String webResName = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(webResCol, "web-resource-name")); + UnifiedWebResourceCollection uwrc = uwsmd.addWebResource(webResName); + + Iterator itUrlPatters = DOMUtils.getChildElements(webResCol, "url-pattern"); + while (itUrlPatters.hasNext()) + { + Element urlPattern = (Element)itUrlPatters.next(); + uwrc.addPattern(DOMUtils.getTextContent(urlPattern)); + } + } + + Element userData = DOMUtils.getFirstChildElement(securityConstraint, "user-data-constraint"); + if (userData != null) + { + String transportGuarantee = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(userData, "transport-guarantee")); + uwsmd.setTransportGuarantee(transportGuarantee); + } + + } + + return securityMetaData; + } + private static Element getWebXMLDocument(ServletContext ctx) { URL webXML = null; Modified: trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java 2006-11-21 19:52:20 UTC (rev 1493) +++ trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java 2006-11-21 20:02:08 UTC (rev 1494) @@ -41,8 +41,6 @@ private Map<String, String> servletMappings = new HashMap<String, String>(); /** The servlet <servlet-name, servlet-class> */ private Map<String, String> servletClassNames = new HashMap<String, String>(); - /** web.xml security-constraints */ - private List<UnifiedWebSecurityMetaData> securityMetaData; /** The optional JBossWS config-name */ private String configName; /** The optional JBossWS config-file */ @@ -51,7 +49,9 @@ private String securityDomain; /** A HashMap<String, String> for webservice description publish locations */ private Map<String, String> wsdlPublishLocationMap = new HashMap<String, String>(); - + /** web.xml security-constraints */ + private List<UnifiedWebSecurityMetaData> securityMetaData; + public String getContextRoot() { return contextRoot; @@ -121,7 +121,7 @@ { this.securityMetaData = securityMetaData; } - + public void setWsdlPublishLocationMap(Map<String, String> wsdlPublishLocationMap) { this.wsdlPublishLocationMap = wsdlPublishLocationMap; @@ -131,5 +131,6 @@ { // if not found, the we will use default return wsdlPublishLocationMap.get(name); - } + } + } Modified: trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java =================================================================== --- trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java 2006-11-21 19:52:20 UTC (rev 1493) +++ trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java 2006-11-21 20:02:08 UTC (rev 1494) @@ -48,7 +48,6 @@ import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; @@ -60,6 +59,7 @@ import org.jboss.ws.WSException; import org.jboss.ws.addressing.AddressingConstantsImpl; import org.jboss.ws.common.CommonMessageContext; +import org.jboss.ws.common.MessageContextPropertyHelper; import org.jboss.ws.jaxrpc.handler.MessageContextJAXRPC; import org.jboss.ws.jaxrpc.handler.SOAPMessageContextJAXRPC; import org.jboss.ws.jaxws.handler.MessageContextJAXWS; @@ -346,7 +346,7 @@ ServerEndpointMetaData sepMetaData = wsEndpoint.getServiceEndpointInfo().getServerEndpointMetaData(); Type type = sepMetaData.getType(); - HttpSession httpSession = null; // context.getHttpSession(); + MessageContextPropertyHelper httpSession = new HttpSessionPropertyHelper(context); ServletContext servletContext = context.getServletContext(); HttpServletRequest httpRequest = context.getHttpServletRequest(); HttpServletResponse httpResponse = context.getHttpServletResponse(); @@ -639,4 +639,21 @@ } return server; } + + public static class HttpSessionPropertyHelper implements MessageContextPropertyHelper + { + + private EndpointContext context; + + public HttpSessionPropertyHelper(final EndpointContext context) + { + this.context = context; + } + + public Object get() + { + return context.getHttpSession(); + } + + } } Modified: trunk/src/test/ant/build-jars-jaxrpc.xml =================================================================== --- trunk/src/test/ant/build-jars-jaxrpc.xml 2006-11-21 19:52:20 UTC (rev 1493) +++ trunk/src/test/ant/build-jars-jaxrpc.xml 2006-11-21 20:02:08 UTC (rev 1494) @@ -716,6 +716,59 @@ </metainf> </jar> +  + <war warfile="${build.test.dir}/libs/jaxrpc-jbws1148.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1148/WEB-INF/web.xml"> + <classes dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.class"/> + </classes> + <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1148/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${build.test.dir}/libs/jaxrpc-jbws1148-client.jar"> + <fileset dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.class"/> + </fileset> + <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1148/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1148/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + +  + <war warfile="${build.test.dir}/libs/jaxrpc-jbws1179.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1179/WEB-INF/web.xml"> + <classes dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/> + </classes> + <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1179/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1179-client.jar"> + <fileset dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/> + </fileset> + <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1179/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1179/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> +  <war warfile="${build.test.dir}/libs/jaxrpc-jbws1186.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1186/WEB-INF/web.xml"> <classes dir="${build.test.dir}/classes"> @@ -730,6 +783,36 @@ <include name="wsdl/**"/> </webinf> </war> + +  + <war warfile="${build.test.dir}/libs/jaxrpc-jbws1190.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1190/WEB-INF/web.xml"> + <classes dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl$1.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.class"/> + </classes> + <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1190/WEB-INF"> + <include name="webservices.xml"/> + <include name="test-mapping.xml"/> + <include name="confidential-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${build.test.dir}/libs/jaxrpc-jbws1190-client.jar"> + <fileset dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.class"/> + </fileset> + <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1190/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1190/WEB-INF"> + <include name="test-mapping.xml"/> + </metainf> + </jar>  <war warfile="${build.test.dir}/libs/jaxrpc-jbws1205-simple.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml"> Modified: trunk/src/test/ant/build-jars-jaxws.xml =================================================================== --- trunk/src/test/ant/build-jars-jaxws.xml 2006-11-21 19:52:20 UTC (rev 1493) +++ trunk/src/test/ant/build-jars-jaxws.xml 2006-11-21 20:02:08 UTC (rev 1494) @@ -113,6 +113,16 @@ </classes> </war> +  + <war destfile="${build.test.dir}/libs/jaxws-jbws1190.war" webxml="${build.test.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml"> + <classes dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl*.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.class"/> + </classes> + </war> +  <war warfile="${build.test.dir}/libs/jaxws-jsr181-complex.war" webxml="${build.test.dir}/resources/jaxws/jsr181/complex/WEB-INF/web.xml"> <classes dir="${build.test.dir}/classes"> Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148 (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,67 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.jbws1148; - -import javax.naming.InitialContext; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * Test a call to an endpoint that uses an anonymous simple - * type with restriction. - * - * @author darran.lofthouse(a)jboss.com - * @since Oct 22, 2006 - */ -public class JBWS1148TestCase extends JBossWSTest -{ - - private static TestEndpoint port; - - public static Test suite() throws Exception - { - return JBossWSTestSetup.newTestSetup(JBWS1148TestCase.class, "jaxrpc-jbws1148.war, jaxrpc-jbws1148-client.jar"); - } - - public void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - } - } - - public void testCall() throws Exception - { - TelephoneNumber number = port.lookup("SomeName"); - assertEquals("areaCode", "12345", number.getAreaCode()); - assertEquals("number", "678901", number.getNumber()); - } - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.java 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.java 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,56 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.jbws1148; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since Oct 22, 2006 - */ -public class TelephoneNumber -{ - - private String areaCode; - - private String number; - - public String getAreaCode() - { - return areaCode; - } - - public void setAreaCode(String areaCode) - { - this.areaCode = areaCode; - } - - public String getNumber() - { - return number; - } - - public void setNumber(String number) - { - this.number = number; - } - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.java 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.java 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.jbws1148; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since Oct 22, 2006 - */ -public interface TestEndpoint extends Remote -{ - - public TelephoneNumber lookup(final String surname) throws RemoteException; - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.java 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.java 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,45 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.jbws1148; - - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since Oct 22, 2006 - */ -public class TestEndpointImpl implements TestEndpoint -{ - - /** - * @see org.jboss.test.ws.jaxrpc.jbws1148.TestEndpoint#lookup(java.lang.String) - */ - public TelephoneNumber lookup(final String surname) - { - TelephoneNumber number = new TelephoneNumber(); - number.setAreaCode("12345"); - number.setNumber("678901"); - - return number; - } - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.java) Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179 (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,89 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.jbws1179; - -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; -import javax.naming.InitialContext; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 18-October-2006 - */ -public class JBWS1179TestCase extends JBossWSTest -{ - - public static TestEndpoint port; - - public static Test suite() throws Exception - { - return JBossWSTestSetup.newTestSetup(JBWS1179TestCase.class, "jaxrpc-jbws1179.war, jaxrpc-jbws1179-client.jar"); - } - - protected void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - } - } - - protected int getActiveSessions() throws Exception - { - MBeanServerConnection server = getServer(); - ObjectName objectName = new ObjectName("jboss.web:host=localhost,path=/jaxrpc-jbws1179,type=Manager"); - - return ((Integer)server.getAttribute(objectName, "activeSessions")).intValue(); - } - - public void testCallCreateNoSession() throws Exception - { - int originalSessions = getActiveSessions(); - - port.echoMessage("Hello"); - - int finalSessions = getActiveSessions(); - - assertEquals("activeSessions after call", originalSessions, finalSessions); - } - - public void testAccessSession() throws Exception - { - int originalSessions = getActiveSessions(); - - assertTrue("Can access session", port.canAccessSession()); - - int finalSessions = getActiveSessions(); - - assertEquals("activeSessions after call", originalSessions + 1, finalSessions); - } -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,51 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.jbws1179; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 18-October-2006 - */ -public interface TestEndpoint extends Remote -{ - - /** - * Simple call to test if a session is created. - * - * @param message - * @return - * @throws RemoteException - */ - public String echoMessage(final String message) throws RemoteException; - - /** - * Call to test if the session can be accessed. - * - * @return - * @throws RemoteException - */ - public boolean canAccessSession() throws RemoteException; -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,60 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.jbws1179; - -import java.rmi.RemoteException; - -import javax.servlet.http.HttpSession; - -import org.jboss.ws.common.CommonMessageContext; -import org.jboss.ws.jaxrpc.handler.MessageContextJAXRPC; -import org.jboss.ws.soap.MessageContextAssociation; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 18-October-2006 - */ -public class TestEndpointImpl implements TestEndpoint -{ - - public String echoMessage(String message) - { - return message; - } - - public boolean canAccessSession() throws RemoteException - { - CommonMessageContext context = MessageContextAssociation.peekMessageContext(); - HttpSession session = (HttpSession)context.getProperty(MessageContextJAXRPC.SERVLET_SESSION); - - session.setAttribute("Test", "Test String"); - String testString = (String)session.getAttribute("Test"); - if ("Test String".equals(testString) == false) - { - throw new RuntimeException("Invalid attribute returned."); - } - - return true; - } - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java) Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190 (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.java 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.java 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.jbws1190; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 19-October-2006 - */ -public interface ConfidentialEndpoint extends Remote -{ - - public String helloWorld(final String message) throws RemoteException; - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.java 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.java 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,42 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.jbws1190; - -import java.rmi.RemoteException; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since Oct 22, 2006 - */ -public class ConfidentialEndpointImpl implements ConfidentialEndpoint -{ - - /** - * @see org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialEndpoint#helloWorld(java.lang.String) - */ - public String helloWorld(final String message) throws RemoteException - { - return message; - } - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.java 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.java 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,55 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.jbws1190; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 19-October-2006 - */ -public class JBWS1190Exception extends RuntimeException -{ - - /** */ - private static final long serialVersionUID = 5957186382787505270L; - - public JBWS1190Exception() - { - super(); - } - - public JBWS1190Exception(final String message, final Throwable cause) - { - super(message, cause); - } - - public JBWS1190Exception(final String message) - { - super(message); - } - - public JBWS1190Exception(final Throwable cause) - { - super(cause); - } - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,67 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.jbws1190; - -import javax.naming.InitialContext; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since Oct 22, 2006 - */ -public class JBWS1190TestCase extends JBossWSTest -{ - private static final String ARCHIVE_NAME = "jaxrpc-jbws1190.war"; - - private static TestEndpoint port; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(JBWS1190TestCase.class, ARCHIVE_NAME+", jaxrpc-jbws1190-client.jar"); - } - - protected void setUp() throws Exception - { - if (port == null) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - } - } - - public void testTestEndpoint() throws Exception - { - port.testAddress(ARCHIVE_NAME, "TestService", "http", "8080"); - } - - public void testConfidentialEndpoint() throws Exception - { - port.testAddress(ARCHIVE_NAME, "ConfidentialService", "https", "8443"); - } -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.java 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.java 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.jbws1190; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 19-October-2006 - */ -public interface TestEndpoint extends Remote -{ - - public void testAddress(final String archive, final String service, final String scheme, final String port) throws RemoteException; - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,102 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.jbws1190; - -import java.io.File; -import java.io.FilenameFilter; -import java.net.MalformedURLException; - -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory; -import org.jboss.ws.metadata.wsdl.WSDLEndpoint; -import org.jboss.ws.metadata.wsdl.WSDLService; -import org.jboss.ws.server.ServerConfig; -import org.jboss.ws.server.ServerConfigFactory; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 19-October-2006 - */ -public class TestEndpointImpl implements TestEndpoint -{ - - public void testAddress(final String archive, final String service, final String scheme, final String port) - { - ServerConfigFactory serverConfigFactory = ServerConfigFactory.getInstance(); - ServerConfig serverConfig = serverConfigFactory.getServerConfig(); - - File dataDir = serverConfig.getServerDataDir(); - File wsdlDir = new File(dataDir.getAbsolutePath() + File.separator + "wsdl" + File.separator + archive); - - if (wsdlDir.exists() == false) - { - throw new JBWS1190Exception(wsdlDir.getAbsolutePath() + " does not exist."); - } - - File[] wsdls = wsdlDir.listFiles(new FilenameFilter() { - public boolean accept(File dir, String name) - { - return name.startsWith(service); - } - }); - - assertEquals("WSDL files found", 1, wsdls.length); - - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdl; - try - { - wsdl = factory.parse(wsdls[0].toURL()); - } - catch (MalformedURLException e) - { - throw new JBWS1190Exception("Error readin WSDL", e); - } - - WSDLService[] services = wsdl.getServices(); - assertEquals("No of services", 1, services.length); - - WSDLEndpoint[] endpoints = services[0].getEndpoints(); - assertEquals("No of endpoints", 1, endpoints.length); - - String address = endpoints[0].getAddress(); - assertTrue("Expected Scheme '" + scheme + "'", address.startsWith(scheme + "://")); - assertTrue("Expected Port '" + port + "'", address.contains(":" + port + "/")); - } - - private void assertEquals(final String message, final int expected, final int actual) - { - if (expected != actual) - { - throw new JBWS1190Exception(message + " expected=" + expected + " actual=" + actual); - } - } - - private void assertTrue(final String message, final boolean value) - { - if (value == false) - { - throw new JBWS1190Exception(message); - } - } -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java) Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190 (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,42 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jbws1190; - -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 19-October-2006 - */ -@WebService(targetNamespace = "http://org.jboss/test/ws/jbws1190") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public class ConfidentialEndpoint -{ - - public String helloWorld(final String message) - { - return message; - } - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,52 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jbws1190; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 19-October-2006 - */ -public class JBWS1190Exception extends RuntimeException -{ - - public JBWS1190Exception() - { - super(); - } - - public JBWS1190Exception(final String message, final Throwable cause) - { - super(message, cause); - } - - public JBWS1190Exception(final String message) - { - super(message); - } - - public JBWS1190Exception(final Throwable cause) - { - super(cause); - } - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,85 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jbws1190; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.rpc.Call; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.jaxrpc.ServiceFactoryImpl; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 19-October-2006 - */ -public class JBWS1190TestCase extends JBossWSTest -{ - - private static final String ARCHIVE_NAME = "jaxws-jbws1190.war"; - - private static Service service; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(JBWS1190TestCase.class, ARCHIVE_NAME); - } - - protected void setUp() throws Exception - { - if (service == null) - { - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1190/TestEndpoint?wsdl"); - - QName qname = new QName("http://org.jboss/test/ws/jbws1190", "TestEndpointService"); - service = factory.createService(wsdlURL, qname); - } - } - - public void testTestEndpoint() throws Exception - { - QName portName = new QName("http://org.jboss/test/ws/jbws1190", "TestEndpointPort"); - QName methodName = new QName("http://org.jboss/test/ws/jbws1190", "testAddress"); - - Call call = service.createCall(portName); - call.setOperationName(methodName); - call.invoke(new Object[] { ARCHIVE_NAME, "TestEndpointService", "http", "8080" }); - } - - public void testConfidentialEndpoint() throws Exception - { - QName portName = new QName("http://org.jboss/test/ws/jbws1190", "TestEndpointPort"); - QName methodName = new QName("http://org.jboss/test/ws/jbws1190", "testAddress"); - - Call call = service.createCall(portName); - call.setOperationName(methodName); - call.invoke(new Object[] { ARCHIVE_NAME, "ConfidentialEndpointService", "https", "8443" }); - } - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jbws1190; - -import java.rmi.Remote; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 19-October-2006 - */ -@WebService(targetNamespace = "http://org.jboss/test/ws/jbws1190") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface TestEndpoint extends Remote -{ - - @WebMethod - public void testAddress(final String archive, final String service, final String scheme, final String port); - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,105 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jbws1190; - -import java.io.File; -import java.io.FilenameFilter; -import java.net.MalformedURLException; - -import javax.jws.WebService; - -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory; -import org.jboss.ws.metadata.wsdl.WSDLEndpoint; -import org.jboss.ws.metadata.wsdl.WSDLService; -import org.jboss.ws.server.ServerConfig; -import org.jboss.ws.server.ServerConfigFactory; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 19-October-2006 - */ -@WebService(name = "TestEndpoint", endpointInterface = "org.jboss.test.ws.jaxws.jbws1190.TestEndpoint") -public class TestEndpointImpl implements TestEndpoint -{ - - public void testAddress(final String archive, final String service, final String scheme, final String port) - { - ServerConfigFactory serverConfigFactory = ServerConfigFactory.getInstance(); - ServerConfig serverConfig = serverConfigFactory.getServerConfig(); - - File dataDir = serverConfig.getServerDataDir(); - File wsdlDir = new File(dataDir.getAbsolutePath() + File.separator + "wsdl" + File.separator + archive); - - if (wsdlDir.exists() == false) - { - throw new JBWS1190Exception(wsdlDir.getAbsolutePath() + " does not exist."); - } - - File[] wsdls = wsdlDir.listFiles(new FilenameFilter() { - public boolean accept(File dir, String name) - { - return name.startsWith(service); - } - }); - - assertEquals("WSDL files found", 1, wsdls.length); - - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdl; - try - { - wsdl = factory.parse(wsdls[0].toURL()); - } - catch (MalformedURLException e) - { - throw new JBWS1190Exception("Error readin WSDL", e); - } - - WSDLService[] services = wsdl.getServices(); - assertEquals("No of services", 1, services.length); - - WSDLEndpoint[] endpoints = services[0].getEndpoints(); - assertEquals("No of endpoints", 1, endpoints.length); - - String address = endpoints[0].getAddress(); - assertTrue("Expected Scheme '" + scheme + "'", address.startsWith(scheme + "://")); - assertTrue("Expected Port '" + port + "'", address.contains(":" + port + "/")); - } - - private void assertEquals(final String message, final int expected, final int actual) - { - if (expected != actual) - { - throw new JBWS1190Exception(message + " expected=" + expected + " actual=" + actual); - } - } - - private void assertTrue(final String message, final boolean value) - { - if (value == false) - { - throw new JBWS1190Exception(message); - } - } -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java) Copied: trunk/src/test/resources/jaxrpc/jbws1148 (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148) Copied: trunk/src/test/resources/jaxrpc/jbws1148/META-INF (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/META-INF) Deleted: trunk/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" - version="1.4"> - - <display-name>Test Service</display-name> - - <service-ref> - <service-ref-name>service/TestService</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1148.TestEndpoint</service-endpoint-interface> - </port-component-ref> - </service-ref> - -</application-client> - Copied: trunk/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml) Deleted: trunk/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - - <service-ref> - <service-ref-name>service/TestService</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws1148?wsdl</wsdl-override> - </service-ref> - -</jboss-client> Copied: trunk/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml) Copied: trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF) Deleted: trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/jaxrpc-mapping.xml 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/jaxrpc-mapping.xml 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,50 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.jbws1148</package-type> - <namespaceURI>http://org.jboss.test.ws/jbws1148/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws1148.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1148/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws1148.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1148'>serviceNS:TestService</wsdl-service-name> - <port-mapping> - <port-name>TestEndpointPort</port-name> - <java-port-name>TestEndpointPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1148.TestEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1148'>portTypeNS:TestEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1148'>bindingNS:TestEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1148'>wsdlMsgNS:TestEndpoint_lookup</wsdl-message> - <wsdl-message-part-name>String_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.jbws1148.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1148'>wsdlMsgNS:TestEndpoint_lookupResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/jaxrpc-mapping.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/jaxrpc-mapping.xml) Deleted: trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/web.xml 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/web.xml 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1148.TestEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - -</web-app> - Copied: trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/web.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/web.xml) Deleted: trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/webservices.xml 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/webservices.xml 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,15 +0,0 @@ -<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1148' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> - <webservice-description> - <webservice-description-name>TestService</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestEndpointPort</port-component-name> - <wsdl-port>impl:TestEndpointPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1148.TestEndpoint</service-endpoint-interface> - <service-impl-bean> - <servlet-link>TestEndpoint</servlet-link> - </service-impl-bean> - </port-component> - </webservice-description> -</webservices> \ No newline at end of file Copied: trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/webservices.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/webservices.xml) Copied: trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl) Deleted: trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl/TestService.wsdl =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl/TestService.wsdl 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl/TestService.wsdl 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1148' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1148/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1148' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://org.jboss.test.ws/jbws1148/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1148/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <complexType name='TelephoneNumber'> - <sequence> - <element name='areaCode' nillable='true'> - <simpleType> - <restriction base='string'> - <pattern value='[0-9]{5}'/> - </restriction> - </simpleType> - </element> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - </schema> - </types> - <message name='TestEndpoint_lookup'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='TestEndpoint_lookupResponse'> - <part name='result' type='ns1:TelephoneNumber'/> - </message> - <portType name='TestEndpoint'> - <operation name='lookup' parameterOrder='String_1'> - <input message='tns:TestEndpoint_lookup'/> - <output message='tns:TestEndpoint_lookupResponse'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws/jbws1148' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws/jbws1148' use='literal'/> - </output> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl/TestService.wsdl (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl/TestService.wsdl) Deleted: trunk/src/test/resources/jaxrpc/jbws1148/wstools-config.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/wstools-config.xml 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxrpc/jbws1148/wstools-config.xml 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <java-wsdl> - <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1148.TestEndpoint" style="rpc"> - </service> - <namespaces target-namespace="http://org.jboss.test.ws/jbws1148" type-namespace="http://org.jboss.test.ws/jbws1148/types"/> - <mapping file="jaxrpc-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> -</configuration> - - Copied: trunk/src/test/resources/jaxrpc/jbws1148/wstools-config.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/wstools-config.xml) Copied: trunk/src/test/resources/jaxrpc/jbws1179 (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179) Copied: trunk/src/test/resources/jaxrpc/jbws1179/META-INF (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF) Deleted: trunk/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" - version="1.4"> - - <display-name>TestService</display-name> - - <service-ref> - <service-ref-name>service/TestService</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1179.TestEndpoint</service-endpoint-interface> - </port-component-ref> - </service-ref> - -</application-client> - Copied: trunk/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml) Deleted: trunk/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - - <service-ref> - <service-ref-name>service/TestService</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws1179/TestEndpoint?wsdl</wsdl-override> - </service-ref> - -</jboss-client> Copied: trunk/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml) Copied: trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF) Deleted: trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,46 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.jbws1179</package-type> - <namespaceURI>http://org.jboss.test.ws/jbws1179/types</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws1179.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1179'>serviceNS:TestService</wsdl-service-name> - <port-mapping> - <port-name>TestEndpointPort</port-name> - <java-port-name>TestEndpointPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1179.TestEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1179'>portTypeNS:TestEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1179'>bindingNS:TestEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>echoMessage</java-method-name> - <wsdl-operation>echoMessage</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1179'>wsdlMsgNS:TestEndpoint_echoMessage</wsdl-message> - <wsdl-message-part-name>String_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1179'>wsdlMsgNS:TestEndpoint_echoMessageResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - <service-endpoint-method-mapping> - <java-method-name>canAccessSession</java-method-name> - <wsdl-operation>canAccessSession</wsdl-operation> - <wsdl-return-value-mapping> - <method-return-value>boolean</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1179'>wsdlMsgNS:TestEndpoint_canAccessSessionResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml) Deleted: trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1179.TestEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/TestEndpoint</url-pattern> - </servlet-mapping> - -</web-app> - Copied: trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml) Deleted: trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,15 +0,0 @@ -<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1179' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> - <webservice-description> - <webservice-description-name>TestService</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestEndpointPort</port-component-name> - <wsdl-port>impl:TestEndpointPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1179.TestEndpoint</service-endpoint-interface> - <service-impl-bean> - <servlet-link>TestEndpoint</servlet-link> - </service-impl-bean> - </port-component> - </webservice-description> -</webservices> \ No newline at end of file Copied: trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml) Copied: trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl) Deleted: trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1179' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1179' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types/> - <message name='TestEndpoint_canAccessSession'/> - <message name='TestEndpoint_canAccessSessionResponse'> - <part name='result' type='xsd:boolean'/> - </message> - <message name='TestEndpoint_echoMessage'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='TestEndpoint_echoMessageResponse'> - <part name='result' type='xsd:string'/> - </message> - <portType name='TestEndpoint'> - <operation name='canAccessSession'> - <input message='tns:TestEndpoint_canAccessSession'/> - <output message='tns:TestEndpoint_canAccessSessionResponse'/> - </operation> - <operation name='echoMessage' parameterOrder='String_1'> - <input message='tns:TestEndpoint_echoMessage'/> - <output message='tns:TestEndpoint_echoMessageResponse'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='canAccessSession'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws/jbws1179' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws/jbws1179' use='literal'/> - </output> - </operation> - <operation name='echoMessage'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws/jbws1179' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws/jbws1179' use='literal'/> - </output> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl) Deleted: trunk/src/test/resources/jaxrpc/jbws1179/wstools-config.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/wstools-config.xml 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxrpc/jbws1179/wstools-config.xml 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <java-wsdl> - <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1179.TestEndpoint" style="rpc"> - </service> - <namespaces target-namespace="http://org.jboss.test.ws/jbws1179" type-namespace="http://org.jboss.test.ws/jbws1179/types"/> - <mapping file="jaxrpc-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> -</configuration> Copied: trunk/src/test/resources/jaxrpc/jbws1179/wstools-config.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/wstools-config.xml) Copied: trunk/src/test/resources/jaxrpc/jbws1190 (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190) Copied: trunk/src/test/resources/jaxrpc/jbws1190/META-INF (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF) Deleted: trunk/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" - version="1.4"> - - <display-name>TestService</display-name> - - <service-ref> - <service-ref-name>service/TestService</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>META-INF/test-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1190.TestEndpoint</service-endpoint-interface> - </port-component-ref> - </service-ref> - -</application-client> - Copied: trunk/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml) Deleted: trunk/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - - <service-ref> - <service-ref-name>service/TestService</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws1190/TestEndpoint?wsdl</wsdl-override> - </service-ref> - -</jboss-client> Copied: trunk/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml) Copied: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF) Deleted: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/confidential-mapping.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/confidential-mapping.xml 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/confidential-mapping.xml 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,37 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.jbws1190</package-type> - <namespaceURI>http://org.jboss.test.ws/jbws1190/types</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1190'>serviceNS:ConfidentialService</wsdl-service-name> - <port-mapping> - <port-name>ConfidentialEndpointPort</port-name> - <java-port-name>ConfidentialEndpointPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1190'>portTypeNS:ConfidentialEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1190'>bindingNS:ConfidentialEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>helloWorld</java-method-name> - <wsdl-operation>helloWorld</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1190'>wsdlMsgNS:ConfidentialEndpoint_helloWorld</wsdl-message> - <wsdl-message-part-name>String_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1190'>wsdlMsgNS:ConfidentialEndpoint_helloWorldResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/confidential-mapping.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/confidential-mapping.xml) Deleted: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/test-mapping.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/test-mapping.xml 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/test-mapping.xml 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,59 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.jbws1190</package-type> - <namespaceURI>http://org.jboss.test.ws/jbws1190/types</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws1190.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1190'>serviceNS:TestService</wsdl-service-name> - <port-mapping> - <port-name>TestEndpointPort</port-name> - <java-port-name>TestEndpointPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1190.TestEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1190'>portTypeNS:TestEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1190'>bindingNS:TestEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>testAddress</java-method-name> - <wsdl-operation>testAddress</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1190'>wsdlMsgNS:TestEndpoint_testAddress</wsdl-message> - <wsdl-message-part-name>String_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1190'>wsdlMsgNS:TestEndpoint_testAddress</wsdl-message> - <wsdl-message-part-name>String_2</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>2</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1190'>wsdlMsgNS:TestEndpoint_testAddress</wsdl-message> - <wsdl-message-part-name>String_3</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>3</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1190'>wsdlMsgNS:TestEndpoint_testAddress</wsdl-message> - <wsdl-message-part-name>String_4</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/test-mapping.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/test-mapping.xml) Deleted: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> - - <servlet> - <servlet-name>ConfidentialEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialEndpoint</servlet-class> - </servlet> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1190.TestEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>ConfidentialEndpoint</servlet-name> - <url-pattern>/ConfidentialEndpoint</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/TestEndpoint</url-pattern> - </servlet-mapping> - - <security-constraint> - <web-resource-collection> - <web-resource-name>ConfidentialEndpoint</web-resource-name> - <url-pattern>/ConfidentialEndpoint</url-pattern> - </web-resource-collection> - <user-data-constraint> - <transport-guarantee>CONFIDENTIAL</transport-guarantee> - </user-data-constraint> - </security-constraint> -</web-app> \ No newline at end of file Copied: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml) Deleted: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/webservices.xml 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/webservices.xml 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,28 +0,0 @@ -<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1190' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> - <webservice-description> - <webservice-description-name>TestService</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/test-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestEndpointPort</port-component-name> - <wsdl-port>impl:TestEndpointPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1190.TestEndpoint</service-endpoint-interface> - <service-impl-bean> - <servlet-link>TestEndpoint</servlet-link> - </service-impl-bean> - </port-component> - </webservice-description> - <webservice-description> - <webservice-description-name>ConfidentialService</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/ConfidentialService.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/confidential-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>ConfidentialEndpointPort</port-component-name> - <wsdl-port>impl:ConfidentialEndpointPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialEndpoint</service-endpoint-interface> - <service-impl-bean> - <servlet-link>ConfidentialEndpoint</servlet-link> - </service-impl-bean> - </port-component> - </webservice-description> -</webservices> \ No newline at end of file Copied: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/webservices.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/webservices.xml) Copied: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl) Deleted: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='ConfidentialService' targetNamespace='http://org.jboss.test.ws/jbws1190' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1190' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types/> - <message name='ConfidentialEndpoint_helloWorld'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='ConfidentialEndpoint_helloWorldResponse'> - <part name='result' type='xsd:string'/> - </message> - <portType name='ConfidentialEndpoint'> - <operation name='helloWorld' parameterOrder='String_1'> - <input message='tns:ConfidentialEndpoint_helloWorld'/> - <output message='tns:ConfidentialEndpoint_helloWorldResponse'/> - </operation> - </portType> - <binding name='ConfidentialEndpointBinding' type='tns:ConfidentialEndpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='helloWorld'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws/jbws1190' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws/jbws1190' use='literal'/> - </output> - </operation> - </binding> - <service name='ConfidentialService'> - <port binding='tns:ConfidentialEndpointBinding' name='ConfidentialEndpointPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl) Deleted: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1190' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1190' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types/> - <message name='TestEndpoint_testAddress'> - <part name='String_1' type='xsd:string'/> - <part name='String_2' type='xsd:string'/> - <part name='String_3' type='xsd:string'/> - <part name='String_4' type='xsd:string'/> - </message> - <message name='TestEndpoint_testAddressResponse'/> - <portType name='TestEndpoint'> - <operation name='testAddress' parameterOrder='String_1 String_2 String_3 String_4'> - <input message='tns:TestEndpoint_testAddress'/> - <output message='tns:TestEndpoint_testAddressResponse'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='testAddress'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws/jbws1190' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws/jbws1190' use='literal'/> - </output> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl) Deleted: trunk/src/test/resources/jaxrpc/jbws1190/confidential-config.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/confidential-config.xml 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxrpc/jbws1190/confidential-config.xml 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - -<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <java-wsdl> - <service name="ConfidentialService" endpoint="org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialEndpoint" style="rpc"> - </service> - <namespaces target-namespace="http://org.jboss.test.ws/jbws1190" type-namespace="http://org.jboss.test.ws/jbws1190/types"/> - <mapping file="confidential-mapping.xml"/> - <webservices servlet-link="ConfidentialEndpoint" append="true"/> - </java-wsdl> -</configuration> Copied: trunk/src/test/resources/jaxrpc/jbws1190/confidential-config.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/confidential-config.xml) Deleted: trunk/src/test/resources/jaxrpc/jbws1190/test-config.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/test-config.xml 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxrpc/jbws1190/test-config.xml 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - -<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <java-wsdl> - <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1190.TestEndpoint" style="rpc"> - </service> - <namespaces target-namespace="http://org.jboss.test.ws/jbws1190" type-namespace="http://org.jboss.test.ws/jbws1190/types"/> - <mapping file="test-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> -</configuration> Copied: trunk/src/test/resources/jaxrpc/jbws1190/test-config.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/test-config.xml) Copied: trunk/src/test/resources/jaxws/jbws1190 (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxws/jbws1190) Copied: trunk/src/test/resources/jaxws/jbws1190/WEB-INF (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxws/jbws1190/WEB-INF) Deleted: trunk/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml 2006-10-22 18:57:24 UTC (rev 1281) +++ trunk/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml 2006-11-21 20:02:08 UTC (rev 1494) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> - - <servlet> - <servlet-name>ConfidentialEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws1190.ConfidentialEndpoint</servlet-class> - </servlet> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws1190.TestEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>ConfidentialEndpoint</servlet-name> - <url-pattern>/ConfidentialEndpoint</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/TestEndpoint</url-pattern> - </servlet-mapping> - - <security-constraint> - <web-resource-collection> - <web-resource-name>ConfidentialEndpoint</web-resource-name> - <url-pattern>/ConfidentialEndpoint</url-pattern> - </web-resource-collection> - <user-data-constraint> - <transport-guarantee>CONFIDENTIAL</transport-guarantee> - </user-data-constraint> - </security-constraint> -</web-app> \ No newline at end of file Copied: trunk/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml)

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r1493 - trunk/src/main/java/org/jboss/ws/integration/tomcat

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-21 14:52:20 -0500 (Tue, 21 Nov 2006) New Revision: 1493 Modified: trunk/src/main/java/org/jboss/ws/integration/tomcat/CrossContextLoader.java Log: svn:Id Modified: trunk/src/main/java/org/jboss/ws/integration/tomcat/CrossContextLoader.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/tomcat/CrossContextLoader.java 2006-11-21 19:49:34 UTC (rev 1492) +++ trunk/src/main/java/org/jboss/ws/integration/tomcat/CrossContextLoader.java 2006-11-21 19:52:20 UTC (rev 1493) @@ -21,7 +21,7 @@ */ package org.jboss.ws.integration.tomcat; -// $Id$ +// $Id: $ import java.io.File; import java.net.MalformedURLException;

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r1492 - in trunk: . src/main/java/org/jboss/ws/common src/main/java/org/jboss/ws/integration/tomcat src/main/java/org/jboss/ws/jaxrpc src/main/java/org/jboss/ws/jaxrpc/handler src/main/java/org/jboss/ws/server src/main/resources/jbossws.war/JBoss/WEB-INF src/main/resources/jbossws.war/Tomcat/WEB-INF src/test src/test/ant src/test/etc src/test/java/org/jboss/test/ws/jaxrpc/jbws1125 src/test/resources src/test/resources/jaxrpc/jbws1121/WEB-INF src/test/resources/jaxrpc/samples/w

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-21 14:49:34 -0500 (Tue, 21 Nov 2006) New Revision: 1492 Added: trunk/src/main/java/org/jboss/ws/common/CommonContextServlet.java trunk/src/main/java/org/jboss/ws/integration/tomcat/CrossContextLoader.java trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatContextServlet.java trunk/src/main/resources/jbossws.war/Tomcat/WEB-INF/log4j.xml Removed: trunk/src/main/java/org/jboss/ws/integration/tomcat/ContextServlet.java trunk/src/main/java/org/jboss/ws/integration/tomcat/CrossContextLoader.java trunk/src/main/java/org/jboss/ws/server/ContextServlet.java trunk/src/test/resources/jaxrpc/jbws1121/WEB-INF/jboss-web.xml trunk/src/test/resources/jaxrpc/samples/wssecurity/WEB-INF/jboss-web.xml trunk/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/jboss-web.xml Modified: trunk/ant.properties.example trunk/build.xml trunk/src/main/java/org/jboss/ws/common/CommonClient.java trunk/src/main/java/org/jboss/ws/integration/tomcat/KernelBootstrap.java trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java trunk/src/main/java/org/jboss/ws/jaxrpc/CallImpl.java trunk/src/main/java/org/jboss/ws/jaxrpc/HandlerRegistryImpl.java trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java trunk/src/main/java/org/jboss/ws/jaxrpc/StubExt.java trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerChainBaseImpl.java trunk/src/main/resources/jbossws.war/JBoss/WEB-INF/web.xml trunk/src/main/resources/jbossws.war/Tomcat/WEB-INF/web.xml trunk/src/test/ant/build-jars-jaxrpc.xml trunk/src/test/build.xml trunk/src/test/etc/log4j.xml trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java trunk/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml trunk/src/test/resources/tests-tomcat-excludes.txt Log: Enable message style test Tomcat integration Update JEE5 schema Modified: trunk/ant.properties.example =================================================================== --- trunk/ant.properties.example 2006-11-21 19:32:58 UTC (rev 1491) +++ trunk/ant.properties.example 2006-11-21 19:49:34 UTC (rev 1492) @@ -13,7 +13,7 @@ jboss.server.instance=default # Tomcat Home -#tomcat.home=/usr/java/apache/apache-tomcat-5.5.17 +#tomcat.home=/usr/java/tomcat #tomcat.manager.username=manager #tomcat.manager.password=manager Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-11-21 19:32:58 UTC (rev 1491) +++ trunk/build.xml 2006-11-21 19:49:34 UTC (rev 1492) @@ -304,6 +304,9 @@ <include name="META-INF/standard-jaxws-client-config.xml"/> <include name="META-INF/standard-jaxws-endpoint-config.xml"/> </fileset> + <classes dir="${build.resources.dir}/jbossws.war/Tomcat/WEB-INF"> + <include name="log4j.xml"/> + </classes> </war>  Modified: trunk/src/main/java/org/jboss/ws/common/CommonClient.java =================================================================== --- trunk/src/main/java/org/jboss/ws/common/CommonClient.java 2006-11-21 19:32:58 UTC (rev 1491) +++ trunk/src/main/java/org/jboss/ws/common/CommonClient.java 2006-11-21 19:49:34 UTC (rev 1492) @@ -42,6 +42,7 @@ import org.jboss.ws.binding.UnboundHeader; import org.jboss.ws.jaxrpc.ParameterWrapping; import org.jboss.ws.jaxrpc.Style; +import org.jboss.ws.jaxrpc.handler.HandlerChainBaseImpl; import org.jboss.ws.metadata.ClientEndpointMetaData; import org.jboss.ws.metadata.EndpointMetaData; import org.jboss.ws.metadata.OperationMetaData; @@ -307,8 +308,14 @@ // unbind the return values if (handlerPass) { + // BP-1.0 R1027 + HandlerChainBaseImpl.checkMustUnderstand(msgContext, new String[]{}); + + // unbind the return values SOAPMessage resMessage = msgContext.getSOAPMessage(); binding.unbindResponseMessage(opMetaData, resMessage, epInv, unboundHeaders); + + retObj = syncOutputParams(inputParams, epInv); } handlerPass = handlerPass && callResponseHandlerChain(portName, HandlerType.ENDPOINT); Copied: trunk/src/main/java/org/jboss/ws/common/CommonContextServlet.java (from rev 1262, branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonContextServlet.java) Deleted: trunk/src/main/java/org/jboss/ws/integration/tomcat/ContextServlet.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/tomcat/ContextServlet.java 2006-11-21 19:32:58 UTC (rev 1491) +++ trunk/src/main/java/org/jboss/ws/integration/tomcat/ContextServlet.java 2006-11-21 19:49:34 UTC (rev 1492) @@ -1,110 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.tomcat; - -// $Id: ContextServlet.java 293 2006-05-08 16:31:50Z thomas.diesler(a)jboss.com $ - -import java.io.File; -import java.io.IOException; -import java.io.PrintWriter; -import java.net.URL; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.jboss.logging.Logger; -import org.jboss.ws.WSException; -import org.jboss.ws.server.ServiceEndpointManager; -import org.jboss.ws.server.ServiceEndpointManagerFactory; - -/** - * The servlet that that is associated with context /jbossws - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-Mar-2005 - */ -public class ContextServlet extends HttpServlet -{ - // provide logging - protected final Logger log = Logger.getLogger(ContextServlet.class); - - protected ServiceEndpointManager epManager; - - public void init(ServletConfig config) throws ServletException - { - super.init(config); - initServiceEndpointManager(); - } - - private void initServiceEndpointManager() - { - try - { - URL beansXML = new File(getServletContext().getRealPath("/META-INF/jboss-beans.xml")).toURL(); - if (beansXML == null) - throw new IllegalStateException("Invalid null kernel deployment"); - - new KernelBootstrap().bootstrap(beansXML); - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception ex) - { - throw new WSException("Cannot bootstrap kernel", ex); - } - - // Initialize the ServiceEndpointManager - ServiceEndpointManagerFactory factory = ServiceEndpointManagerFactory.getInstance(); - epManager = factory.getServiceEndpointManager(); - } - - /** Process GET requests. - */ - public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException - { - PrintWriter writer = res.getWriter(); - res.setContentType("text/html"); - - writer.print("<html>"); - setupHTMLResponseHeader(writer); - - writer.print("<body>"); - writer.print(epManager.showServiceEndpointTable()); - writer.print("</body>"); - writer.print("</html>"); - writer.close(); - } - - private void setupHTMLResponseHeader(PrintWriter writer) - { - writer.println("<head>"); - writer.println("<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'>"); - writer.println("<title>JBossWS</title>"); - writer.println("<link rel='stylesheet' href='./styles.css'>"); - writer.println("</head>"); - } -} Deleted: trunk/src/main/java/org/jboss/ws/integration/tomcat/CrossContextLoader.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/tomcat/CrossContextLoader.java 2006-11-21 19:32:58 UTC (rev 1491) +++ trunk/src/main/java/org/jboss/ws/integration/tomcat/CrossContextLoader.java 2006-11-21 19:49:34 UTC (rev 1492) @@ -1,96 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.tomcat; - -// $Id: ContextServlet.java 293 2006-05-08 16:31:50Z thomas.diesler(a)jboss.com $ - -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLClassLoader; - -import javax.servlet.ServletContext; - -/** - * A URLClassLoader that provides access to the webapp base dir - * - * @author Thomas.Diesler(a)jboss.org - * @since 16-May-2006 - */ -public class CrossContextLoader extends URLClassLoader -{ - public CrossContextLoader(URL[] urls, ClassLoader parent) - { - super(urls, parent); - } - - public static CrossContextLoader newInstance(ServletContext context) - { - ClassLoader parent = Thread.currentThread().getContextClassLoader(); - if (parent instanceof CrossContextLoader) - throw new IllegalStateException("Circular classloader parent association"); - - CrossContextLoader loader = new CrossContextLoader(new URL[] {}, parent); - - String path = context.getRealPath("/"); - File contextDir = new File(path); - if (contextDir.exists() == false || contextDir.isDirectory() == false) - throw new IllegalStateException("Cannot find expanded dir: " + contextDir); - - // Add URL to context root - loader.addURL(toURL(contextDir)); - - File jbosswsDir = new File(path + "../jbossws"); - if (jbosswsDir.exists() == false || jbosswsDir.isDirectory() == false) - throw new IllegalStateException("Cannot find expanded dir: " + jbosswsDir); - - // Add URL to jbossws context root - loader.addURL(toURL(jbosswsDir)); - - // Add jars in jbossws/WEB-INF/lib - File libDir = new File(path + "../jbossws/WEB-INF/lib"); - if (libDir.exists() && libDir.isDirectory()) - { - File[] files = libDir.listFiles(); - for (int i=0; i < files.length; i++) - { - File file = files[i]; - loader.addURL(toURL(file)); - } - } - - return loader; - } - - private static URL toURL(File file) - { - try - { - return file.toURL(); - } - catch (MalformedURLException e) - { - // ignore - return null; - } - } -} Copied: trunk/src/main/java/org/jboss/ws/integration/tomcat/CrossContextLoader.java (from rev 1262, branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/CrossContextLoader.java) Modified: trunk/src/main/java/org/jboss/ws/integration/tomcat/KernelBootstrap.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/tomcat/KernelBootstrap.java 2006-11-21 19:32:58 UTC (rev 1491) +++ trunk/src/main/java/org/jboss/ws/integration/tomcat/KernelBootstrap.java 2006-11-21 19:49:34 UTC (rev 1492) @@ -21,7 +21,7 @@ */ package org.jboss.ws.integration.tomcat; -// $Id: ContextServlet.java 293 2006-05-08 16:31:50Z thomas.diesler(a)jboss.com $ +// $Id:KernelBootstrap.java 915 2006-09-08 08:40:45Z thomas.diesler(a)jboss.com $ import java.net.URL; @@ -38,17 +38,17 @@ */ public class KernelBootstrap extends BasicBootstrap { + // provide logging + protected final Logger log = Logger.getLogger(KernelBootstrap.class); + + protected BeanXMLDeployer deployer; + // FIXME: remove ctor that throws exception public KernelBootstrap() throws Exception { super(); } - // provide logging - protected final Logger log = Logger.getLogger(KernelBootstrap.class); - - protected BeanXMLDeployer deployer; - public void bootstrap(URL beansXML) { // synchronize bootstrap access Copied: trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatContextServlet.java (from rev 1262, branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatContextServlet.java) Modified: trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java 2006-11-21 19:32:58 UTC (rev 1491) +++ trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java 2006-11-21 19:49:34 UTC (rev 1492) @@ -23,6 +23,7 @@ // $Id: ServiceEndpointServlet.java 296 2006-05-08 19:45:49Z thomas.diesler(a)jboss.com $ +import java.io.File; import java.io.IOException; import java.net.URL; import java.net.URLClassLoader; @@ -66,8 +67,14 @@ super.init(config); deployServiceEndpoints(getServletContext()); } - catch (Exception e) + catch (Exception ex) { + String message = "Failed to initialze service endpoint"; + log.error(message, ex); + throw new WSException(message, ex); + } + finally + { Thread.currentThread().setContextClassLoader(ctxLoader); } } @@ -102,23 +109,24 @@ */ protected void initServiceEndpointManager() { - // bootstrap the microkernel - URLClassLoader ctxLoader = (URLClassLoader)Thread.currentThread().getContextClassLoader(); - URL beansXML = ctxLoader.findResource("META-INF/jboss-beans.xml"); - if (beansXML == null) - throw new IllegalStateException("Invalid null kernel deployment"); + String jbosswsPath = getServletContext().getRealPath("/") + "../jbossws"; + File jbosswsDir = new File(jbosswsPath); + if (jbosswsDir.exists() == false || jbosswsDir.isDirectory() == false) + throw new IllegalStateException("Cannot find expanded dir: " + jbosswsDir); + + File beansFile = new File(jbosswsPath + "/META-INF/jboss-beans.xml"); + if (beansFile.exists() == false) + throw new IllegalStateException("Cannot find jboss-beans.xml at: " + beansFile); try { - new KernelBootstrap().bootstrap(beansXML); + new KernelBootstrap().bootstrap(beansFile.toURL()); } - catch (RuntimeException rte) - { - throw rte; - } catch (Exception ex) { - throw new WSException("Cannot bootstrap kernel", ex); + String message = "Failed to bootstrap kernel"; + log.error(message, ex); + throw new WSException(message, ex); } // init the service endpoint manager @@ -139,13 +147,11 @@ deployer.create(udi); deployer.start(udi); } - catch (RuntimeException rte) - { - throw rte; - } catch (Throwable th) { - throw new WSException("Cannot deploy service endpoint", th); + String message = "Failed to deploy service endpoint"; + log.error(message); + throw new WSException(message, th); } } } @@ -180,13 +186,10 @@ deployer.stop(udi); deployer.destroy(udi); } - catch (RuntimeException rte) - { - throw rte; - } catch (Throwable th) { - throw new WSException("Cannot deploy service endpoint", th); + String message = "Failed to undeploy service endpoint"; + log.error(message); } } } Modified: trunk/src/main/java/org/jboss/ws/jaxrpc/CallImpl.java =================================================================== --- trunk/src/main/java/org/jboss/ws/jaxrpc/CallImpl.java 2006-11-21 19:32:58 UTC (rev 1491) +++ trunk/src/main/java/org/jboss/ws/jaxrpc/CallImpl.java 2006-11-21 19:49:34 UTC (rev 1492) @@ -46,9 +46,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.Constants; -import org.jboss.ws.xop.XOPContext; import org.jboss.ws.binding.UnboundHeader; -import org.jboss.ws.common.CommonBindingProvider; import org.jboss.ws.common.CommonClient; import org.jboss.ws.jaxrpc.handler.HandlerChainBaseImpl; import org.jboss.ws.jaxrpc.handler.SOAPMessageContextJAXRPC; @@ -63,6 +61,7 @@ import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.soap.MessageContextAssociation; import org.jboss.ws.utils.JavaUtils; +import org.jboss.ws.xop.XOPContext; /** Provides support for the dynamic invocation of a service endpoint. * The javax.xml.rpc.Service interface acts as a factory for the creation of Call instances. @@ -548,7 +547,7 @@ // Check or generate the the schema if this call is unconfigured generateOrUpdateSchemas(opMetaData); - + // Associate a message context with the current thread SOAPMessageContextJAXRPC msgContext = new SOAPMessageContextJAXRPC(); MessageContextAssociation.pushMessageContext(msgContext); @@ -595,21 +594,14 @@ @Override protected boolean callResponseHandlerChain(QName portName, HandlerType type) { - boolean status = true; - String[] roles = null; - SOAPMessageContextJAXRPC msgContext = (SOAPMessageContextJAXRPC)MessageContextAssociation.peekMessageContext(); - HandlerChainBaseImpl handlerChain = (HandlerChainBaseImpl)jaxrpcService.getHandlerChain(portName); + + boolean status = true; if (handlerChain != null) { - roles = handlerChain.getRoles(); status = handlerChain.handleResponse(msgContext, type); } - - // BP-1.0 R1027 - HandlerChainBaseImpl.checkMustUnderstand(msgContext, roles); - return status; } Modified: trunk/src/main/java/org/jboss/ws/jaxrpc/HandlerRegistryImpl.java =================================================================== --- trunk/src/main/java/org/jboss/ws/jaxrpc/HandlerRegistryImpl.java 2006-11-21 19:32:58 UTC (rev 1491) +++ trunk/src/main/java/org/jboss/ws/jaxrpc/HandlerRegistryImpl.java 2006-11-21 19:49:34 UTC (rev 1492) @@ -34,7 +34,12 @@ import javax.xml.rpc.handler.HandlerInfo; import javax.xml.rpc.handler.HandlerRegistry; +import org.jboss.logging.Logger; import org.jboss.ws.jaxrpc.handler.ClientHandlerChain; +import org.jboss.ws.metadata.EndpointMetaData; +import org.jboss.ws.metadata.HandlerMetaDataJAXRPC; +import org.jboss.ws.metadata.ServiceMetaData; +import org.jboss.ws.metadata.HandlerMetaData.HandlerType; /** * Provides support for the programmatic configuration of @@ -52,11 +57,21 @@ */ public class HandlerRegistryImpl implements HandlerRegistry { + // provide logging + private static Logger log = Logger.getLogger(HandlerRegistryImpl.class); + // Map<QName,HandlerChain> the endpoint name to a HandlerChain private Map<QName, HandlerChain> handlerChains = new HashMap<QName, HandlerChain>(); // Maps the port name to a list of HandlerInfo objects private Map<QName, List<HandlerInfo>> handlerInfos = new HashMap<QName, List<HandlerInfo>>(); + // The service this registry is associated with + private ServiceMetaData serviceMetaData; + public HandlerRegistryImpl(ServiceMetaData serviceMetaData) + { + this.serviceMetaData = serviceMetaData; + } + public List getHandlerChain(QName portName) { List<HandlerInfo> list = handlerInfos.get(portName); @@ -82,10 +97,24 @@ /** Register a handler chain for the given endpoint name */ - void registerClientHandlerChain(QName portName, List<HandlerInfo> infos, Set roles) + void registerClientHandlerChain(QName portName, List<HandlerInfo> infos, Set<String> roles) { ClientHandlerChain chain = new ClientHandlerChain(infos, roles); handlerChains.put(portName, chain); handlerInfos.put(portName, infos); + + EndpointMetaData epMetaData = serviceMetaData.getEndpoint(portName); + if (epMetaData == null) + throw new IllegalStateException("Cannot obtain endpoint meta data for: " + portName); + + epMetaData.clearHandlers(); + for (HandlerInfo info : infos) + { + HandlerMetaDataJAXRPC handler = new HandlerMetaDataJAXRPC(epMetaData, HandlerType.ENDPOINT); + handler.setHandlerClassName(info.getHandlerClass().getName()); + handler.setSoapRoles(roles); + log.debug("Add handler to: " + portName + handler); + epMetaData.addHandler(handler); + } } } Modified: trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java =================================================================== --- trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java 2006-11-21 19:32:58 UTC (rev 1491) +++ trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java 2006-11-21 19:49:34 UTC (rev 1492) @@ -78,7 +78,7 @@ { UnifiedMetaData wsMetaData = new UnifiedMetaData(); serviceMetaData = new ServiceMetaData(wsMetaData, serviceName); - handlerRegistry = new HandlerRegistryImpl(); + handlerRegistry = new HandlerRegistryImpl(serviceMetaData); } /** @@ -92,7 +92,7 @@ ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader(); serviceMetaData = builder.buildMetaData(serviceName, wsdlURL, mappingURL, securityURL, null, ctxClassLoader); - handlerRegistry = new HandlerRegistryImpl(); + handlerRegistry = new HandlerRegistryImpl(serviceMetaData); } /** @@ -106,7 +106,7 @@ ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader(); serviceMetaData = builder.buildMetaData(serviceName, wsdlURL, mappingURL, securityConfig, serviceRefMetaData, ctxClassLoader); - handlerRegistry = new HandlerRegistryImpl(); + handlerRegistry = new HandlerRegistryImpl(serviceMetaData); } public ServiceMetaData getServiceMetaData() Modified: trunk/src/main/java/org/jboss/ws/jaxrpc/StubExt.java =================================================================== --- trunk/src/main/java/org/jboss/ws/jaxrpc/StubExt.java 2006-11-21 19:32:58 UTC (rev 1491) +++ trunk/src/main/java/org/jboss/ws/jaxrpc/StubExt.java 2006-11-21 19:49:34 UTC (rev 1492) @@ -26,6 +26,8 @@ import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; +import org.jboss.ws.metadata.EndpointMetaData; + // $Id$ /** @@ -56,10 +58,13 @@ static final String PROPERTY_AUTH_TYPE_BASIC = "org.jboss.ws.authType.basic"; /** Authentication type, WSEE */ static final String PROPERTY_AUTH_TYPE_WSSE = "org.jboss.ws.authType.wsse"; - + /** Enable MTOM on the stub */ static final String PROPERTY_MTOM_ENABLED= "org.jboss.ws.mtom.enabled"; - // if you add a property here, make sure its registered in CallProxy + /** + * Get the endpoint meta data for this stub + */ + EndpointMetaData getEndpointMetaData(); /** * Add a header that is not bound to an input parameter. Modified: trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerChainBaseImpl.java =================================================================== --- trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerChainBaseImpl.java 2006-11-21 19:32:58 UTC (rev 1491) +++ trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerChainBaseImpl.java 2006-11-21 19:49:34 UTC (rev 1492) @@ -502,13 +502,13 @@ * soap:mustUnderstand attribute with the value "1") targeted at the * receiver (via soap:actor) that the receiver does not understand. */ - public static void checkMustUnderstand(SOAPMessageContextJAXRPC msgContext, String[] roles) + public static void checkMustUnderstand(CommonMessageContext msgContext, String[] roles) { SOAPHeaderElement mustUnderstandHeaderElement = null; List roleList = (roles != null ? Arrays.asList(roles) : new ArrayList()); try { - SOAPMessageImpl soapMessage = (SOAPMessageImpl)msgContext.getMessage(); + SOAPMessageImpl soapMessage = (SOAPMessageImpl)msgContext.getSOAPMessage(); // A SOAPHeaderElement is possibly bound to the endpoint operation // in order to check that we need a the opMetaData Deleted: trunk/src/main/java/org/jboss/ws/server/ContextServlet.java =================================================================== --- trunk/src/main/java/org/jboss/ws/server/ContextServlet.java 2006-11-21 19:32:58 UTC (rev 1491) +++ trunk/src/main/java/org/jboss/ws/server/ContextServlet.java 2006-11-21 19:49:34 UTC (rev 1492) @@ -1,88 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.server; - -// $Id: AbstractContextServlet.java 396 2006-05-23 09:48:45Z thomas.diesler(a)jboss.com $ - -import java.io.IOException; -import java.io.PrintWriter; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.jboss.logging.Logger; - -/** - * The servlet that that is associated with context /jbossws - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-Mar-2005 - */ -public class ContextServlet extends HttpServlet -{ - // provide logging - protected final Logger log = Logger.getLogger(ContextServlet.class); - - protected ServiceEndpointManager epManager; - - public void init(ServletConfig config) throws ServletException - { - super.init(config); - initServiceEndpointManager(); - } - - protected void initServiceEndpointManager() - { - ServiceEndpointManagerFactory factory = ServiceEndpointManagerFactory.getInstance(); - epManager = factory.getServiceEndpointManager(); - } - - /** Process GET requests. - */ - public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException - { - PrintWriter writer = res.getWriter(); - res.setContentType("text/html"); - - writer.print("<html>"); - setupHTMLResponseHeader(writer); - - writer.print("<body>"); - writer.print(epManager.showServiceEndpointTable()); - writer.print("</body>"); - writer.print("</html>"); - writer.close(); - } - - private void setupHTMLResponseHeader(PrintWriter writer) - { - Package wsPackage = Package.getPackage("org.jboss.ws"); - writer.println("<head>"); - writer.println("<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'>"); - writer.println("<title>JBossWS / "+wsPackage.getImplementationVersion()+"</title>"); - writer.println("<link rel='stylesheet' href='./styles.css'>"); - writer.println("</head>"); - } -} Modified: trunk/src/main/resources/jbossws.war/JBoss/WEB-INF/web.xml =================================================================== --- trunk/src/main/resources/jbossws.war/JBoss/WEB-INF/web.xml 2006-11-21 19:32:58 UTC (rev 1491) +++ trunk/src/main/resources/jbossws.war/JBoss/WEB-INF/web.xml 2006-11-21 19:49:34 UTC (rev 1492) @@ -14,7 +14,7 @@ <servlet> <servlet-name>ContextServlet</servlet-name> - <servlet-class>org.jboss.ws.server.ContextServlet</servlet-class> + <servlet-class>org.jboss.ws.integration.jboss.JBossContextServlet</servlet-class> </servlet> <servlet> Copied: trunk/src/main/resources/jbossws.war/Tomcat/WEB-INF/log4j.xml (from rev 1262, branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/WEB-INF/log4j.xml) Modified: trunk/src/main/resources/jbossws.war/Tomcat/WEB-INF/web.xml =================================================================== --- trunk/src/main/resources/jbossws.war/Tomcat/WEB-INF/web.xml 2006-11-21 19:32:58 UTC (rev 1491) +++ trunk/src/main/resources/jbossws.war/Tomcat/WEB-INF/web.xml 2006-11-21 19:49:34 UTC (rev 1492) @@ -13,7 +13,7 @@ <servlet> <servlet-name>ContextServlet</servlet-name> - <servlet-class>org.jboss.ws.integration.other.ContextServlet</servlet-class> + <servlet-class>org.jboss.ws.integration.tomcat.TomcatContextServlet</servlet-class> <load-on-startup>1</load-on-startup> </servlet> Modified: trunk/src/test/ant/build-jars-jaxrpc.xml =================================================================== --- trunk/src/test/ant/build-jars-jaxrpc.xml 2006-11-21 19:32:58 UTC (rev 1491) +++ trunk/src/test/ant/build-jars-jaxrpc.xml 2006-11-21 19:49:34 UTC (rev 1492) @@ -601,7 +601,6 @@ <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="jboss-wsse-server.xml"/> - <include name="jboss-web.xml"/> <include name="wsdl/*"/> </webinf> <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1121"> @@ -1411,7 +1410,6 @@ <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> - <include name="jboss-web.xml"/> <include name="wsdl/**"/> </webinf> <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/simple-sign"> @@ -1448,7 +1446,6 @@ <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> - <include name="jboss-web.xml"/> <include name="wsdl/**"/> </webinf> <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt"> @@ -1492,9 +1489,6 @@ <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt"> <include name="jboss-wsse-server.xml"/> </webinf> - <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity"> <include name="wsse.keystore"/> <include name="wsse.truststore"/> Modified: trunk/src/test/build.xml =================================================================== --- trunk/src/test/build.xml 2006-11-21 19:32:58 UTC (rev 1491) +++ trunk/src/test/build.xml 2006-11-21 19:49:34 UTC (rev 1492) @@ -21,6 +21,7 @@ <property name="build.dir" value="${basedir}/output"/> <property name="build.lib.dir" value="${build.dir}/lib"/> + <property name="build.resources.dir" value="${build.dir}/resources"/> <property name="build.test.dir" value="${build.dir}/tests"/> <property name="test.dir" value="${basedir}/src/test"/> <property name="test.etc.dir" value="${test.dir}/etc"/> @@ -125,21 +126,30 @@  <condition property="jbossws.deployed"> - <filesmatch file1="${jboss.client}/${jbossws.client.jar}" file2="${build.lib.dir}/${jbossws.client.jar}"/> + <and> + <filesmatch file1="${jboss.client}/${jbossws.client.jar}" file2="${build.lib.dir}/${jbossws.client.jar}"/> + <equals arg1="${jbossws.target.server}" arg2="jboss"/> + </and> </condition> - <fail message="jbossws not deployed, run 'ant deploy-jbossws'" unless="jbossws.deployed"/> + <condition property="jbossws.deployed"> + <and> + <filesmatch file1="${tomcat.home}/common/lib/jbossws-core.jar" file2="${build.lib.dir}/jbossws-core.jar"/> + <equals arg1="${jbossws.target.server}" arg2="tomcat"/> + </and> + </condition> + <fail message="jbossws not deployed, run the deploy target" unless="jbossws.deployed"/>  - <property name="jbossws.target.server.${jbossws.target.server}" value="true"/> <condition property="tests.excludesfile" value="${test.resources.dir}/tests-no-excludes.txt"> - <isset property="jbossws.target.server.jboss"/> + <equals arg1="${jbossws.target.server}" arg2="jboss"/> </condition> <condition property="tests.excludesfile" value="${test.resources.dir}/tests-tomcat-excludes.txt"> - <isset property="jbossws.target.server.tomcat"/> + <equals arg1="${jbossws.target.server}" arg2="tomcat"/> </condition>  <path id="jbossws.client.classpath"> + <pathelement location="${build.lib.dir}/${jbossws.client.jar}"/> <pathelement location="${jboss.client}/activation.jar"/> <pathelement location="${jboss.client}/commons-logging.jar"/> <pathelement location="${jboss.client}/javassist.jar"/> @@ -185,10 +195,10 @@ <pathelement location="${jboss.server.lib}/jboss.jar"/> <pathelement location="${thirdparty.dir}/hibernate3.jar"/> <pathelement location="${thirdparty.dir}/qdox.jar"/> + <pathelement location="${thirdparty.dir}/servlet-api.jar"/> + <pathelement location="${thirdparty.dir}/stax-api-1.0.jar"/> + <pathelement location="${thirdparty.dir}/wstx-lgpl-2.9.3.jar"/> <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/> - <pathelement location="${thirdparty.dir}/policy-1.0.jar"/> - <pathelement location="${thirdparty.dir}/wstx-lgpl-2.9.3.jar"/> - <pathelement location="${thirdparty.dir}/stax-api-1.0.jar"/> </path>  Modified: trunk/src/test/etc/log4j.xml =================================================================== --- trunk/src/test/etc/log4j.xml 2006-11-21 19:32:58 UTC (rev 1491) +++ trunk/src/test/etc/log4j.xml 2006-11-21 19:49:34 UTC (rev 1492) @@ -56,13 +56,19 @@ <priority value="TRACE" class="org.jboss.logging.XLevel"/> </category> - <category name="org.jboss.remoting"> + <category name="org.jboss.remoting"> <priority value="INFO"/> </category> + +  + <category name="org.apache.xml.security"> + <priority value="INFO"/> + </category> - <category name="jbossws.SOAPMessage"> +  + <category name="jbossws.SOAPMessage"> <priority value="TRACE" class="org.jboss.logging.XLevel"/> - </category> + </category> <!-- <category name="org.jboss.xb"> Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java 2006-11-21 19:32:58 UTC (rev 1491) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java 2006-11-21 19:49:34 UTC (rev 1492) @@ -66,15 +66,18 @@ } } - public void testClientAccess() throws Exception + public void testNoParamPart() throws Exception { String retObj = port.noParamPart(); assertEquals("noParamPart", retObj); - + } + + public void testNoReturnPart() throws Exception + { port.noReturnPart("hello"); } - public void _testMessageAccess() throws Exception + public void testMessageAccess() throws Exception { String reqEnv = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + Deleted: trunk/src/test/resources/jaxrpc/jbws1121/WEB-INF/jboss-web.xml =================================================================== --- trunk/src/test/resources/jaxrpc/jbws1121/WEB-INF/jboss-web.xml 2006-11-21 19:32:58 UTC (rev 1491) +++ trunk/src/test/resources/jaxrpc/jbws1121/WEB-INF/jboss-web.xml 2006-11-21 19:49:34 UTC (rev 1492) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> - -<jboss-web> - - <webservice-description> - <webservice-description-name>HelloWorldService</webservice-description-name> - <config-name>Standard WSSecurity Endpoint</config-name> - </webservice-description> - -</jboss-web> Deleted: trunk/src/test/resources/jaxrpc/samples/wssecurity/WEB-INF/jboss-web.xml =================================================================== --- trunk/src/test/resources/jaxrpc/samples/wssecurity/WEB-INF/jboss-web.xml 2006-11-21 19:32:58 UTC (rev 1491) +++ trunk/src/test/resources/jaxrpc/samples/wssecurity/WEB-INF/jboss-web.xml 2006-11-21 19:49:34 UTC (rev 1492) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> - -<jboss-web> - - <webservice-description> - <webservice-description-name>HelloService</webservice-description-name> - <config-name>Standard WSSecurity Endpoint</config-name> - </webservice-description> - -</jboss-web> Deleted: trunk/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/jboss-web.xml =================================================================== --- trunk/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/jboss-web.xml 2006-11-21 19:32:58 UTC (rev 1491) +++ trunk/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/jboss-web.xml 2006-11-21 19:49:34 UTC (rev 1492) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> - -<jboss-web> - - <webservice-description> - <webservice-description-name>HelloService</webservice-description-name> - <config-name>Standard WSSecurity Endpoint</config-name> - </webservice-description> - -</jboss-web> Modified: trunk/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml =================================================================== --- trunk/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml 2006-11-21 19:32:58 UTC (rev 1491) +++ trunk/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml 2006-11-21 19:49:34 UTC (rev 1492) @@ -5,6 +5,11 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> + <context-param> + <param-name>jbossws-config-name</param-name>> + <param-value>Standard WSSecurity Endpoint</param-value> + </context-param> + <servlet> <servlet-name>HelloService</servlet-name> <servlet-class>org.jboss.test.ws.jaxrpc.samples.wssecurity.HelloJavaBean</servlet-class> Modified: trunk/src/test/resources/tests-tomcat-excludes.txt =================================================================== --- trunk/src/test/resources/tests-tomcat-excludes.txt 2006-11-21 19:32:58 UTC (rev 1491) +++ trunk/src/test/resources/tests-tomcat-excludes.txt 2006-11-21 19:49:34 UTC (rev 1492) @@ -1,6 +1,8 @@ -org/jboss/test/ws/samples/dynamichandler/** -org/jboss/test/ws/samples/jmstransport/** -org/jboss/test/ws/samples/jsr109ejb/** -org/jboss/test/ws/samples/jsr181ejb/** -org/jboss/test/ws/samples/secureejb/** -org/jboss/test/ws/jbws1011/** +org/jboss/test/ws/jaxrpc/jbws1011/** +org/jboss/test/ws/jaxrpc/samples/dynamichandler/** +org/jboss/test/ws/jaxrpc/samples/jmstransport/** +org/jboss/test/ws/jaxrpc/samples/jsr109ejb/** +org/jboss/test/ws/jaxrpc/samples/secureejb/** +org/jboss/test/ws/jaxrpc/samples/wsbpel/** +org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.class +org/jboss/test/ws/jaxws/samples/jsr181ejb/**

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r1491 - trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-21 14:32:58 -0500 (Tue, 21 Nov 2006) New Revision: 1491 Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java Log: Prevent NPE on on fault with no xmlType [JBWS-1303] Unmarshall issue with xsi:type specified bean property Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java 2006-11-21 19:27:40 UTC (rev 1490) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java 2006-11-21 19:32:58 UTC (rev 1491) @@ -21,7 +21,7 @@ */ package org.jboss.test.ws.jaxrpc.jbws1303; -// $Id$ +// $Id:JBWS1303TestCase.java 1490 2006-11-21 19:27:40Z thomas.diesler(a)jboss.com $ import javax.naming.InitialContext; import javax.xml.rpc.Service; @@ -61,11 +61,6 @@ public void testEndpoint() throws Exception { - if (true) - { - System.out.println("FIXME: JBWS-1303"); - return; - } Lastmod lastmod = new Lastmod("yesterday"); LastmodResponse lastmodRes = port.lastmod(lastmod); assertEquals("yesterday", lastmodRes.getTimeChanged()); Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java 2006-11-21 19:27:40 UTC (rev 1490) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java 2006-11-21 19:32:58 UTC (rev 1491) @@ -27,8 +27,11 @@ import javax.xml.rpc.handler.soap.SOAPMessageContext; import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPMessage; +import org.jboss.ws.Constants; + public class ServerHandler extends GenericHandler { public QName[] getHeaders() @@ -37,11 +40,11 @@ } /** - * <env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> + * <env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> * <env:Header/> * <env:Body> * <lastmodResponse xmlns='http://netid.msu.edu:8080/lastmod.pl'> - * <TimeChanged xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='string'>yesterday</TimeChanged> + * <TimeChanged xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='xsd:string'>yesterday</TimeChanged> * </lastmodResponse> * </env:Body> * </env:Envelope> @@ -51,11 +54,13 @@ try { SOAPMessage soapMessage = MessageFactory.newInstance().createMessage(); + SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope(); + soapEnvelope.addNamespaceDeclaration(Constants.PREFIX_XSD, Constants.NS_SCHEMA_XSD); SOAPElement bodyElement = soapMessage.getSOAPBody().addChildElement("lastmodResponse"); bodyElement.setAttribute("xmlns", "http://netid.msu.edu:8080/lastmod.pl"); SOAPElement soapElement = bodyElement.addChildElement("TimeChanged"); - soapElement.addNamespaceDeclaration("xsi", "http://www.w3.org/2001/XMLSchema-instance"); - soapElement.setAttribute("xsi:type", "string"); + soapElement.addNamespaceDeclaration(Constants.PREFIX_XSI, Constants.NS_SCHEMA_XSI); + soapElement.setAttribute("xsi:type", "xsd:string"); soapElement.setValue("yesterday"); ((SOAPMessageContext)msgContext).setMessage(soapMessage); }

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r1490 - in trunk/src: main/java/org/jboss/ws/tools/helpers test test/ant test/java/org/jboss/test/ws/jaxrpc test/java/org/jboss/test/ws/jaxrpc/jbws1186 test/java/org/jboss/test/ws/jaxrpc/jbws1303 test/resources/jaxrpc test/resources/jaxrpc/jbws1186/WEB-INF test/resources/jaxrpc/jbws1303 test/resources/jaxrpc/jbws1303/META-INF test/resources/jaxrpc/jbws1303/WEB-INF test/resources/jaxrpc/jbws1303/WEB-INF/wsdl test/resources/jaxrpc/jbws718

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-21 14:27:40 -0500 (Tue, 21 Nov 2006) New Revision: 1490 Added: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/ServerHandler.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastModImpl.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java trunk/src/test/resources/jaxrpc/jbws1303/ trunk/src/test/resources/jaxrpc/jbws1303/META-INF/ trunk/src/test/resources/jaxrpc/jbws1303/META-INF/application-client.xml trunk/src/test/resources/jaxrpc/jbws1303/META-INF/jboss-client.xml trunk/src/test/resources/jaxrpc/jbws1303/WEB-INF/ trunk/src/test/resources/jaxrpc/jbws1303/WEB-INF/web.xml trunk/src/test/resources/jaxrpc/jbws1303/WEB-INF/webservices.xml trunk/src/test/resources/jaxrpc/jbws1303/WEB-INF/wsdl/ trunk/src/test/resources/jaxrpc/jbws1303/WEB-INF/wsdl/lastmodified.wsdl trunk/src/test/resources/jaxrpc/jbws1303/wstools-config.xml Removed: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastModImpl.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java trunk/src/test/resources/jaxrpc/jbws1303/META-INF/ trunk/src/test/resources/jaxrpc/jbws1303/META-INF/application-client.xml trunk/src/test/resources/jaxrpc/jbws1303/META-INF/jboss-client.xml trunk/src/test/resources/jaxrpc/jbws1303/WEB-INF/ trunk/src/test/resources/jaxrpc/jbws1303/WEB-INF/web.xml trunk/src/test/resources/jaxrpc/jbws1303/WEB-INF/webservices.xml trunk/src/test/resources/jaxrpc/jbws1303/WEB-INF/wsdl/ trunk/src/test/resources/jaxrpc/jbws1303/WEB-INF/wsdl/lastmodified.wsdl trunk/src/test/resources/jaxrpc/jbws1303/wstools-config.xml trunk/src/test/resources/jaxrpc/jbws718/null Modified: trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java trunk/src/test/ant/build-jars-jaxrpc.xml trunk/src/test/build.xml trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/TestEndpointImpl.java trunk/src/test/resources/jaxrpc/jbws1186/WEB-INF/web.xml trunk/src/test/resources/jaxrpc/jbws1186/WEB-INF/webservices.xml Log: [JBWS-1303] Unmarshall issue with xsi:type specified bean property Modified: trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2006-11-21 17:37:18 UTC (rev 1489) +++ trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2006-11-21 19:27:40 UTC (rev 1490) @@ -181,7 +181,7 @@ WSDLInterface wsdlintf = wsdlDefinitions.getInterface(new NCName(portTypeName)); String portName = wsdlintf.getName().toString(); String javaPortName = utils.chopPortType(portName); - if(wsdlDefinitions.getService(new NCName(portName)) != null) + if (wsdlDefinitions.getService(new NCName(javaPortName)) != null) javaPortName += "_PortType"; ServiceEndpointInterfaceMapping seim = new ServiceEndpointInterfaceMapping(jwm); Modified: trunk/src/test/ant/build-jars-jaxrpc.xml =================================================================== --- trunk/src/test/ant/build-jars-jaxrpc.xml 2006-11-21 17:37:18 UTC (rev 1489) +++ trunk/src/test/ant/build-jars-jaxrpc.xml 2006-11-21 19:27:40 UTC (rev 1490) @@ -717,11 +717,12 @@ </metainf> </jar> -  +  <war warfile="${build.test.dir}/libs/jaxrpc-jbws1186.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1186/WEB-INF/web.xml"> <classes dir="${build.test.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1186/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1186/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1186/ServerHandler.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1186/UserType.class"/> </classes> <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1186/WEB-INF"> @@ -779,6 +780,33 @@ </metainf> </jar> +  + <war warfile="${build.test.dir}/libs/jaxrpc-jbws1303.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1303/WEB-INF/web.xml"> + <classes dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1303/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws1303/*TestCase.class"/> + </classes> + <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1303/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1303-client.jar"> + <fileset dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1303/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws1303/*TestCase.class"/> + </fileset> + <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1303/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1303/WEB-INF"> + <include name="wsdl/**"/> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> +  <war warfile="${build.test.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${build.test.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml"> <classes dir="${build.test.dir}/classes"> Modified: trunk/src/test/build.xml =================================================================== --- trunk/src/test/build.xml 2006-11-21 17:37:18 UTC (rev 1489) +++ trunk/src/test/build.xml 2006-11-21 19:27:40 UTC (rev 1490) @@ -306,6 +306,7 @@ </taskdef> <mkdir dir="${build.test.dir}/wstools/java"/> <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/jbws718/WEB-INF" config="${test.resources.dir}/jaxrpc/jbws718/wstools-config.xml"/> + <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/jbws1303/WEB-INF" config="${test.resources.dir}/jaxrpc/jbws1303/wstools-config.xml"/> <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/> <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/> <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/> @@ -328,6 +329,7 @@ <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/wsaddressing/META-INF" config="${test.resources.dir}/jaxws/samples/wsaddressing/wstools-config.xml"/> <move todir="${build.test.dir}/wstools/java"> <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/jbws718/WEB-INF" includes="org/**"/> + <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/jbws1303/WEB-INF" includes="org/**"/> <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> </move> </target> Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java 2006-11-21 17:37:18 UTC (rev 1489) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java 2006-11-21 19:27:40 UTC (rev 1490) @@ -96,10 +96,10 @@ { UserType userType = new UserType(); UserType retObj = port.echo(null, userType); - assertEquals("null null", retObj.getName()); + assertNull("null expected", retObj); } - public void testAccessMessage() throws Exception + public void testMessageAccess() throws Exception { MessageFactory factory = MessageFactory.newInstance(); @@ -121,7 +121,6 @@ SOAPMessage resMessage = con.call(reqMessage, "http://" + getServerHost() + ":8080/jaxrpc-jbws1186"); SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next(); soapElement = (SOAPElement)soapElement.getChildElements().next(); - soapElement = (SOAPElement)soapElement.getChildElements().next(); - assertEquals("null null", soapElement.getValue()); + assertEquals("1", soapElement.getAttribute("xsi:nil")); } } Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/ServerHandler.java (from rev 1225, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/ServerHandler.java) Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/TestEndpointImpl.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/TestEndpointImpl.java 2006-11-21 17:37:18 UTC (rev 1489) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/TestEndpointImpl.java 2006-11-21 19:27:40 UTC (rev 1490) @@ -32,7 +32,12 @@ public UserType echo(String message, UserType ut) throws RemoteException { log.info("echo: " + message); - ut.setName(message + " " + ut.getName()); + + if (message != null || ut.getName() != null) + ut.setName(message + " " + ut.getName()); + else + ut = null; + return ut; } Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303 (from rev 1225, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java 2006-10-16 10:40:10 UTC (rev 1225) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java 2006-11-21 19:27:40 UTC (rev 1490) @@ -1,73 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.jbws1303; - -// $Id$ - -import javax.naming.InitialContext; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * Unmarshall issue with xsi:type specified bean property - * - * http://jira.jboss.org/jira/browse/JBWS-1303 - * - * @author Thomas.Diesler(a)jboss.org - * @since 16-Oct-2006 - */ -public class JBWS1303TestCase extends JBossWSTest -{ - private static LastMod_PortType port; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(JBWS1303TestCase.class, "jaxrpc-jbws1303.war, jaxrpc-jbws1303-client.jar"); - } - - protected void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (LastMod_PortType)service.getPort(LastMod_PortType.class); - } - } - - public void testEndpoint() throws Exception - { - if (true) - { - System.out.println("FIXME: JBWS-1303"); - return; - } - Lastmod lastmod = new Lastmod("yesterday"); - LastmodResponse lastmodRes = port.lastmod(lastmod); - assertEquals("yesterday", lastmodRes.getTimeChanged()); - } -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java (from rev 1225, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastModImpl.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastModImpl.java 2006-10-16 10:40:10 UTC (rev 1225) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastModImpl.java 2006-11-21 19:27:40 UTC (rev 1490) @@ -1,39 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.jbws1303; - -import java.rmi.RemoteException; - -import org.jboss.logging.Logger; - -public class LastModImpl implements LastMod_PortType -{ - // Provide logging - private static Logger log = Logger.getLogger(LastModImpl.class); - - public LastmodResponse lastmod(Lastmod lastmod) throws RemoteException - { - String req = lastmod.getLastmodRequest(); - log.info("lastmod: " + req); - return new LastmodResponse(req); - } -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastModImpl.java (from rev 1225, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastModImpl.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java 2006-10-16 10:40:10 UTC (rev 1225) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java 2006-11-21 19:27:40 UTC (rev 1490) @@ -1,68 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.jbws1303; - -import javax.xml.namespace.QName; -import javax.xml.rpc.handler.GenericHandler; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.rpc.handler.soap.SOAPMessageContext; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPMessage; - -public class ServerHandler extends GenericHandler -{ - public QName[] getHeaders() - { - return new QName[] {}; - } - - /** - * <env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> - * <env:Header/> - * <env:Body> - * <lastmodResponse xmlns='http://netid.msu.edu:8080/lastmod.pl'> - * <TimeChanged xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='string'>yesterday</TimeChanged> - * </lastmodResponse> - * </env:Body> - * </env:Envelope> - */ - public boolean handleResponse(MessageContext msgContext) - { - try - { - SOAPMessage soapMessage = MessageFactory.newInstance().createMessage(); - SOAPElement bodyElement = soapMessage.getSOAPBody().addChildElement("lastmodResponse"); - bodyElement.setAttribute("xmlns", "http://netid.msu.edu:8080/lastmod.pl"); - SOAPElement soapElement = bodyElement.addChildElement("TimeChanged"); - soapElement.addNamespaceDeclaration("xsi", "http://www.w3.org/2001/XMLSchema-instance"); - soapElement.setAttribute("xsi:type", "string"); - soapElement.setValue("yesterday"); - ((SOAPMessageContext)msgContext).setMessage(soapMessage); - } - catch (Exception ex) - { - throw new RuntimeException(ex); - } - return true; - } -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java (from rev 1225, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java) Modified: trunk/src/test/resources/jaxrpc/jbws1186/WEB-INF/web.xml =================================================================== --- trunk/src/test/resources/jaxrpc/jbws1186/WEB-INF/web.xml 2006-11-21 17:37:18 UTC (rev 1489) +++ trunk/src/test/resources/jaxrpc/jbws1186/WEB-INF/web.xml 2006-11-21 19:27:40 UTC (rev 1490) @@ -4,11 +4,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> - + <servlet> <servlet-name>TestEndpoint</servlet-name> <servlet-class>org.jboss.test.ws.jaxrpc.jbws1186.TestEndpointImpl</servlet-class> </servlet> + <servlet-mapping> <servlet-name>TestEndpoint</servlet-name> <url-pattern>/*</url-pattern> Modified: trunk/src/test/resources/jaxrpc/jbws1186/WEB-INF/webservices.xml =================================================================== --- trunk/src/test/resources/jaxrpc/jbws1186/WEB-INF/webservices.xml 2006-11-21 17:37:18 UTC (rev 1489) +++ trunk/src/test/resources/jaxrpc/jbws1186/WEB-INF/webservices.xml 2006-11-21 19:27:40 UTC (rev 1490) @@ -10,6 +10,10 @@ <service-impl-bean> <servlet-link>TestEndpoint</servlet-link> </service-impl-bean> + <handler> + <handler-name>ServerHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxrpc.jbws1186.ServerHandler</handler-class> + </handler> </port-component> </webservice-description> </webservices> \ No newline at end of file Copied: trunk/src/test/resources/jaxrpc/jbws1303 (from rev 1225, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303) Copied: trunk/src/test/resources/jaxrpc/jbws1303/META-INF (from rev 1225, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303/META-INF) Deleted: trunk/src/test/resources/jaxrpc/jbws1303/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303/META-INF/application-client.xml 2006-10-16 10:40:10 UTC (rev 1225) +++ trunk/src/test/resources/jaxrpc/jbws1303/META-INF/application-client.xml 2006-11-21 19:27:40 UTC (rev 1490) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" - version="1.4"> - - <display-name>JAXRPC simple tests</display-name> - - <service-ref> - <service-ref-name>service/TestService</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1303.LastMod_PortType</service-endpoint-interface> - </port-component-ref> - </service-ref> - -</application-client> - Copied: trunk/src/test/resources/jaxrpc/jbws1303/META-INF/application-client.xml (from rev 1225, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303/META-INF/application-client.xml) Deleted: trunk/src/test/resources/jaxrpc/jbws1303/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303/META-INF/jboss-client.xml 2006-10-16 10:40:10 UTC (rev 1225) +++ trunk/src/test/resources/jaxrpc/jbws1303/META-INF/jboss-client.xml 2006-11-21 19:27:40 UTC (rev 1490) @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - - <service-ref> - <service-ref-name>service/TestService</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws1303?wsdl</wsdl-override> - </service-ref> - -</jboss-client> Copied: trunk/src/test/resources/jaxrpc/jbws1303/META-INF/jboss-client.xml (from rev 1225, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303/META-INF/jboss-client.xml) Copied: trunk/src/test/resources/jaxrpc/jbws1303/WEB-INF (from rev 1225, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303/WEB-INF) Deleted: trunk/src/test/resources/jaxrpc/jbws1303/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303/WEB-INF/web.xml 2006-10-16 10:40:10 UTC (rev 1225) +++ trunk/src/test/resources/jaxrpc/jbws1303/WEB-INF/web.xml 2006-11-21 19:27:40 UTC (rev 1490) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>LastMod</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1303.LastModImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>LastMod</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - -</web-app> - Copied: trunk/src/test/resources/jaxrpc/jbws1303/WEB-INF/web.xml (from rev 1225, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303/WEB-INF/web.xml) Deleted: trunk/src/test/resources/jaxrpc/jbws1303/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303/WEB-INF/webservices.xml 2006-10-16 10:40:10 UTC (rev 1225) +++ trunk/src/test/resources/jaxrpc/jbws1303/WEB-INF/webservices.xml 2006-11-21 19:27:40 UTC (rev 1490) @@ -1,19 +0,0 @@ -<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://netid.msu.edu:8080/lastmod.pl' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> - <webservice-description> - <webservice-description-name>LastMod</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/lastmodified.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>LastModPort</port-component-name> - <wsdl-port>impl:LastModPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1303.LastMod_PortType</service-endpoint-interface> - <service-impl-bean> - <servlet-link>LastMod</servlet-link> - </service-impl-bean> - <handler> - <handler-name>ServerHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.jbws1303.ServerHandler</handler-class> - </handler> - </port-component> - </webservice-description> -</webservices> \ No newline at end of file Copied: trunk/src/test/resources/jaxrpc/jbws1303/WEB-INF/webservices.xml (from rev 1225, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303/WEB-INF/webservices.xml) Copied: trunk/src/test/resources/jaxrpc/jbws1303/WEB-INF/wsdl (from rev 1225, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303/WEB-INF/wsdl) Deleted: trunk/src/test/resources/jaxrpc/jbws1303/WEB-INF/wsdl/lastmodified.wsdl =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303/WEB-INF/wsdl/lastmodified.wsdl 2006-10-16 10:40:10 UTC (rev 1225) +++ trunk/src/test/resources/jaxrpc/jbws1303/WEB-INF/wsdl/lastmodified.wsdl 2006-11-21 19:27:40 UTC (rev 1490) @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<definitions name="LastMod" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - targetNamespace="http://netid.msu.edu:8080/lastmod.pl" xmlns:tns="http://netid.msu.edu:8080/lastmod.pl" xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsdl="http://netid.msu.edu:8080/lastmodified.wsdl"> - - <types> - - <schema targetNamespace="http://netid.msu.edu:8080/lastmod.pl" xmlns="http://www.w3.org/2001/XMLSchema"> - <element name="lastmod"> - <complexType> - <sequence> - <element name="lastmodRequest" nillable="false" type="xsd:string" form="qualified"/> - </sequence> - </complexType> - </element> - - <element name="lastmodResponse"> - <complexType> - <sequence> - <element name="TimeChanged" nillable="false" type="xsd:string" form="qualified"/> - </sequence> - </complexType> - </element> - </schema> - </types> - - <message name="lastmodInput"> - <part element="tns:lastmod" name="parameters"/> - </message> - - <message name="lastmodOutput"> - <part element="tns:lastmodResponse" name="result"/> - </message> - - <portType name="LastModPortType"> - <operation name="lastmod"> - <input message="tns:lastmodInput"/> - <output message="tns:lastmodOutput"/> - </operation> - </portType> - - <binding name="LastModBinding" type="tns:LastModPortType"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <operation name="lastmod"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/> - </input> - - <output> - <soap:body use="literal"/> - </output> - </operation> - </binding> - - <service name="LastMod"> - <documentation> Gets the last password change time when fed a netid </documentation> - <port name="LastModPort" binding="tns:LastModBinding"> - <soap:address location="http://netid.msu.edu:8080/lastmod.pl"/> - </port> - </service> - -</definitions> \ No newline at end of file Copied: trunk/src/test/resources/jaxrpc/jbws1303/WEB-INF/wsdl/lastmodified.wsdl (from rev 1225, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303/WEB-INF/wsdl/lastmodified.wsdl) Deleted: trunk/src/test/resources/jaxrpc/jbws1303/wstools-config.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303/wstools-config.xml 2006-10-16 10:40:10 UTC (rev 1225) +++ trunk/src/test/resources/jaxrpc/jbws1303/wstools-config.xml 2006-11-21 19:27:40 UTC (rev 1490) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<configuration xmlns="http://www.jboss.org/jbossws-tools" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools - http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <global> - <package-namespace package="org.jboss.test.ws.jaxrpc.jbws1303" namespace="http://netid.msu.edu:8080/lastmod.pl"/> - </global> - - <wsdl-java location="resources/jaxrpc/jbws1303/WEB-INF/wsdl/lastmodified.wsdl" parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml" /> - </wsdl-java> - -</configuration> Copied: trunk/src/test/resources/jaxrpc/jbws1303/wstools-config.xml (from rev 1225, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303/wstools-config.xml) Deleted: trunk/src/test/resources/jaxrpc/jbws718/null =================================================================== --- trunk/src/test/resources/jaxrpc/jbws718/null 2006-11-21 17:37:18 UTC (rev 1489) +++ trunk/src/test/resources/jaxrpc/jbws718/null 2006-11-21 19:27:40 UTC (rev 1490) @@ -1,51 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.jbws718</package-type> - <namespaceURI>http://jboss.org/test/ws/jbws718</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws718.PingMsg</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/jbws718'>typeNS:>PingMsg</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>message</java-variable-name> - <xml-element-name>message</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws718.PingMsgResponse</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/jbws718'>typeNS:>PingMsgResponse</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws718.TestService_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://jboss.org/test/ws/jbws718'>serviceNS:TestService</wsdl-service-name> - <port-mapping> - <port-name>TestServicePort</port-name> - <java-port-name>TestServicePort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws718.TestService_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://jboss.org/test/ws/jbws718'>portTypeNS:TestService</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://jboss.org/test/ws/jbws718'>bindingNS:TestServiceBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>ping</java-method-name> - <wsdl-operation>ping</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.jbws718.PingMsg</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/jbws718'>wsdlMsgNS:PingIn</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>INOUT</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.jbws718.PingMsgResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/jbws718'>wsdlMsgNS:PingOut</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r1489 - in trunk/src: main/java/org/jboss/ws/jaxrpc main/java/org/jboss/ws/server main/java/org/jboss/ws/tools main/java/org/jboss/ws/tools/config main/java/org/jboss/ws/tools/helpers main/java/org/jboss/ws/tools/interfaces main/java/org/jboss/ws/tools/mapping main/java/org/jboss/ws/tools/metadata main/java/org/jboss/ws/tools/schema main/resources/schema test/resources/jaxrpc/jbws718 test/resources/jaxrpc/jbws807 test/resources/jaxrpc/jbws958 test/resources/jaxrpc/samples/wsbp

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-21 12:37:18 -0500 (Tue, 21 Nov 2006) New Revision: 1489 Added: trunk/src/test/resources/jaxrpc/jbws718/null trunk/src/test/resources/jaxrpc/jbws718/webservices.xml Modified: trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java trunk/src/main/java/org/jboss/ws/server/ServiceEndpoint.java trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java trunk/src/main/java/org/jboss/ws/tools/Configuration.java trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL.java trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL11.java trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java trunk/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java trunk/src/main/java/org/jboss/ws/tools/interfaces/WSDLToJavaIntf.java trunk/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java trunk/src/main/resources/schema/jbossws-tool_1_0.xsd trunk/src/test/resources/jaxrpc/jbws718/wstools-config.xml trunk/src/test/resources/jaxrpc/jbws807/wstools-config.xml trunk/src/test/resources/jaxrpc/jbws958/wstools-config.xml trunk/src/test/resources/jaxrpc/samples/wsbpel/hello/wstools-config.xml trunk/src/test/resources/jaxws/samples/jsr181ejb/wstools-config.xml trunk/src/test/resources/jaxws/samples/jsr181pojo/docwrapped/wstools-config.xml trunk/src/test/resources/jaxws/samples/jsr181pojo/wstools-config.xml trunk/src/test/resources/jaxws/samples/wsaddressing/wstools-config.xml trunk/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/wstools-config.xml trunk/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/wstools-config.xml trunk/src/test/resources/tools/config/wsdl2java.xml trunk/src/test/resources/tools/config/wsdl2javaglobal.xml trunk/src/test/resources/tools/jbws-206/jbosswsConfig/Attachment/Attachmentwsdl2java.xml trunk/src/test/resources/tools/jbws-206/jbosswsConfig/InOutParameters/InOutParameterswsdl2java.xml trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OneWay/OneWaywsdl2java.xml trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OutParameters/OutParameterswsdl2java.xml trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserTypes/UserTypeswsdl2java.xml trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImport/WsdlImportwsdl2java.xml trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImportWithUserTypes/WsdlImportWithUserTypeswsdl2java.xml trunk/src/test/resources/tools/jbws1170/wstools-config.xml trunk/src/test/resources/tools/jbws1253/wstools-config.xml trunk/src/test/resources/tools/testsuite-configs/jbws153-config.xml trunk/src/test/resources/tools/testsuite-configs/jbws349-config.xml trunk/src/test/resources/tools/testsuite-configs/jbws381-config.xml trunk/src/test/resources/tools/testsuite-configs/jbws484-config.xml trunk/src/test/resources/tools/testsuite-configs/samples-client-config.xml trunk/src/test/resources/tools/testsuite-configs/ws4eesimple-client-config.xml Log: [JBWS-1299] Add support for wsdl-java@parameter-style [JBWS-1182] Change wsdl-java@file to wsdl-java@location Modified: trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java =================================================================== --- trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -284,7 +284,7 @@ String endpointName = endpointMetaData.getQName().getLocalPart(); String packageName = endpointMetaData.getServiceEndpointInterface().getPackage().getName(); - String wrapperName = packageName + ".__JBossWS_" + serviceName + "_" + endpointName + "_" + parameterName; + String wrapperName = packageName + "._JBossWS_" + serviceName + "_" + endpointName + "_" + parameterName; log.debug("Generating wrapper: " + wrapperName); Class wrapperType; Modified: trunk/src/main/java/org/jboss/ws/server/ServiceEndpoint.java =================================================================== --- trunk/src/main/java/org/jboss/ws/server/ServiceEndpoint.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/server/ServiceEndpoint.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -83,6 +83,11 @@ this.seMetrics = new ServiceEndpointMetrics(seInfo.getServiceEndpointID()); } + public State getState() + { + return seInfo.getState(); + } + public ServiceEndpointInfo getServiceEndpointInfo() { return seInfo; Modified: trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java =================================================================== --- trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -558,8 +558,9 @@ ServiceEndpoint wsEndpoint = (ServiceEndpoint)ctor.newInstance(new Object[] { seInfo }); wsEndpoint.create(); - // Register the port component with the MBeanServer + // Register the endpoint with the MBeanServer registry.put(sepID, wsEndpoint); + log.debug("WebService created: " + sepID); } @@ -600,6 +601,8 @@ throw new WSException("Cannot find service endpoint: " + sepID); wsEndpoint.destroy(); + + // Remove the endpoint from the MBeanServer registry.remove(sepID); ServiceEndpointInfo seInfo = wsEndpoint.getServiceEndpointInfo(); Modified: trunk/src/main/java/org/jboss/ws/tools/Configuration.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/Configuration.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/tools/Configuration.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -138,7 +138,8 @@ public class WSDLToJavaConfig { public String wsdlLocation; - public boolean unwrap; + // Parameter style {"wrapped", "bare"} + public String parameterStyle = "wrapped"; // Is a jaxrpc-mapping file needed? public boolean mappingFileNeeded; // Name of the jaxrpc-mapping file Modified: trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -40,6 +40,9 @@ import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.Configuration.OperationConfig; import org.jboss.ws.tools.metadata.ToolsUnifiedMetaDataBuilder; +import org.jboss.ws.utils.DOMUtils; +import org.jboss.ws.utils.DOMWriter; +import org.w3c.dom.Element; /** * Generates a WSDL for a service endpoint. @@ -334,9 +337,19 @@ if (wsdlDefinitions == null) throw new WSException("Cannot generate WSDL definitions"); + // Debug the generated wsdl StringWriter sw = new StringWriter(); wsdlDefinitions.write(sw, Constants.DEFAULT_XML_CHARSET); - log.debug(sw.toString()); + log.debug("Generated WSDL:\n" + sw.toString()); + + // Debug the generated mapping file + String jaxrpcMappingStr = null; + if (javaWsdlMapping != null) + { + Element root = DOMUtils.parse(javaWsdlMapping.serialize()); + jaxrpcMappingStr = DOMWriter.printNode(root, true); + } + log.debug("Generated Mapping:\n" + jaxrpcMappingStr); } catch (RuntimeException rte) { Modified: trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL11.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL11.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL11.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -25,22 +25,17 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.namespace.QName; import javax.xml.rpc.encoding.TypeMapping; import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.metadata.EndpointMetaData; -import org.jboss.ws.metadata.FaultMetaData; -import org.jboss.ws.metadata.OperationMetaData; -import org.jboss.ws.metadata.ParameterMetaData; import org.jboss.ws.metadata.ServiceMetaData; import org.jboss.ws.metadata.UnifiedMetaData; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLUtils; -import org.jboss.ws.metadata.wsdl.XSModelTypes; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.tools.helpers.JavaToWSDLHelper; Modified: trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -26,9 +26,7 @@ import java.io.IOException; import java.net.URL; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; -import java.util.List; import java.util.Map; import java.util.Set; @@ -38,7 +36,6 @@ import org.apache.xerces.xs.XSComplexTypeDefinition; import org.apache.xerces.xs.XSElementDeclaration; import org.apache.xerces.xs.XSModelGroup; -import org.apache.xerces.xs.XSObject; import org.apache.xerces.xs.XSObjectList; import org.apache.xerces.xs.XSParticle; import org.apache.xerces.xs.XSSimpleTypeDefinition; @@ -53,7 +50,6 @@ import org.jboss.ws.metadata.wsdl.WSDLException; import org.jboss.ws.metadata.wsdl.WSDLInterface; import org.jboss.ws.metadata.wsdl.WSDLInterfaceFault; -import org.jboss.ws.metadata.wsdl.WSDLInterfaceMessageReference; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperation; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationInput; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutfault; @@ -108,9 +104,8 @@ private String directoryToGenerate = ""; private String style; + private String parameterStyle; - private boolean unwrap = false; - public WSDLToJava() { } @@ -266,6 +261,11 @@ { return Constants.DOCUMENT_LITERAL.equals(style); } + + private boolean isWrapped() + { + return "wrapped".equals(parameterStyle) && Constants.DOCUMENT_LITERAL.equals(style); + } private void unwrapRequest(StringBuilder buf, XSTypeDefinition xt) throws IOException { @@ -274,6 +274,8 @@ XSComplexTypeDefinition wrapper = (XSComplexTypeDefinition)xt; XSParticle particle = wrapper.getParticle(); + if (particle == null) + throw new WSException("Attempt to unwrap a request type with no particles"); XSTerm term = particle.getTerm(); if (term instanceof XSModelGroup == false) throw new WSException("Expected model group, could not unwrap"); @@ -322,6 +324,8 @@ XSComplexTypeDefinition wrapper = (XSComplexTypeDefinition)xt; XSParticle particle = wrapper.getParticle(); + if (particle == null) + throw new WSException("Attempt to unwrap a response type with no particles"); XSTerm term = particle.getTerm(); if (term instanceof XSModelGroup == false) throw new WSException("Expected model group, could not unwrap"); @@ -485,7 +489,7 @@ JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); - if (unwrap) + if (isWrapped()) { unwrapRequest(paramBuffer, xt); } @@ -503,7 +507,7 @@ JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); - if (unwrap) + if (isWrapped()) { returnType = unwrapResponse(xt); } @@ -608,6 +612,9 @@ { JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); + if (isWrapped()) + return unwrapResponse(xt); + boolean primitive = true; WrappedArray wrappedArray = new WrappedArray(xt); String arraySuffix = ""; @@ -709,13 +716,8 @@ xtj.createJavaFile((XSComplexTypeDefinition)xt, containingElement, getLocationForJavaGeneration(), seiPkgName, xsmodel, exception); } - public boolean isUnwrap() + public void setParameterStyle(String paramStyle) { - return unwrap; + this.parameterStyle = paramStyle; } - - public void setUnwrap(boolean unwrap) - { - this.unwrap = unwrap; - } } Modified: trunk/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -84,8 +84,8 @@ private static final String STYLE_ATTRIBUTE = "style"; private static final String ENDPOINT_ATTRIBUTE = "endpoint"; private static final String NAME_ATTRIBUTE = "name"; + private static final String LOCATION_ATTRIBUTE = "location"; private static final String FILE_ATTRIBUTE = "file"; - private static final String UNWRAP_ATTRIBUTE = "unwrap"; // provide logging private static final Logger log = Logger.getLogger(ToolsSchemaConfigReader.class); @@ -175,10 +175,10 @@ else if (WSDL_JAVA_TAG.equals(localName)) { WSDLToJavaConfig wsdl2jc = config.getWSDLToJavaConfig(true); - wsdl2jc.wsdlLocation = attrs.getValue(FILE_ATTRIBUTE); - String unwrap = attrs.getValue(UNWRAP_ATTRIBUTE); - if (unwrap != null) - wsdl2jc.unwrap = "true".equals(unwrap) || "1".equals(unwrap); + wsdl2jc.wsdlLocation = attrs.getValue(LOCATION_ATTRIBUTE); + String paramStyle = attrs.getValue(PARAMETER_STYLE_ATTRIBUTE); + if (paramStyle != null) + wsdl2jc.parameterStyle = paramStyle; return wsdl2jc; } @@ -264,7 +264,7 @@ if (MAPPING_TAG.equals(localName)) { wsdl2jc.mappingFileNeeded = true; - wsdl2jc.mappingFileName = attrs.getValue(FILE_ATTRIBUTE); + wsdl2jc.mappingFileName = getOptionalAttribute(attrs, FILE_ATTRIBUTE, "jaxrpc-mapping.xml"); } else if (WEBSERVICES_TAG.equals(localName)) { Modified: trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -143,7 +143,6 @@ public void generateTypesForXSD(ParameterMetaData pmd) throws IOException { //Types always deals with TypeNamespace - SchemaCreatorIntf sc = javaToXSD.getSchemaCreator(); QName xmlType = pmd.getXmlType(); if(xmlType.getNamespaceURI().equals(Constants.NS_SCHEMA_XSD) == false) generateType(xmlType, pmd.getJavaType(), buildElementNameMap(pmd)); Modified: trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -22,13 +22,7 @@ package org.jboss.ws.tools.helpers; import java.beans.Introspector; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Set; import javax.xml.namespace.QName; @@ -97,8 +91,6 @@ private WSDLDefinitions wsdlDefinitions = null; private String serviceName = null; private String packageName = null; - private Class serviceEndpointInterface = null; - private String typeNamespace = null; private Set<String> registeredTypes = new HashSet<String>(); @@ -107,20 +99,18 @@ private WSDLUtils utils = WSDLUtils.getInstance(); - private boolean unwrap = false; + private String parameterStyle; public MappingFileGeneratorHelper(WSDLDefinitions wsdl, String sname, - String pname, Class seiClass, String tns,LiteralTypeMapping ltm, boolean unwrap) + String pname, Class seiClass, String tns,LiteralTypeMapping ltm, String parameterStyle) { this.wsdlDefinitions = wsdl; this.serviceName = sname; this.packageName = pname; - this.serviceEndpointInterface = seiClass; - this.typeNamespace = tns; this.typeMapping = ltm; this.wsdlStyle = utils.getWSDLStyle(wsdl); - this.unwrap = unwrap; + this.parameterStyle = parameterStyle; checkEssentials(); } @@ -218,7 +208,7 @@ ServiceEndpointMethodMapping semm = new ServiceEndpointMethodMapping(seim); semm.setJavaMethodName(ToolsUtils.firstLetterLowerCase(opname)); semm.setWsdlOperation(opname); - semm.setWrappedElement(shouldUnwrap()); + semm.setWrappedElement(isWrapped()); if (isDocStyle()) constructDOCParameters(semm, wiop); @@ -240,7 +230,7 @@ String partName = win.getPartName(); String wsdlMessageName = win.getMessageName().getLocalPart(); - if (shouldUnwrap()) + if (isWrapped()) { JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); XSTypeDefinition xt = schemaModel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); @@ -259,7 +249,7 @@ QName xmlType = output.getXMLType(); QName messageName = output.getMessageName(); - if (shouldUnwrap()) + if (isWrapped()) { JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); XSTypeDefinition xt = schemaModel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); @@ -780,9 +770,9 @@ return javaType; } - private boolean shouldUnwrap() + private boolean isWrapped() { - return unwrap && Constants.DOCUMENT_LITERAL.equals(wsdlStyle); + return "wrapped".equals(parameterStyle) && Constants.DOCUMENT_LITERAL.equals(wsdlStyle); } private MethodParamPartsMapping getMethodParamPartsMapping(ServiceEndpointMethodMapping semm, Modified: trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -299,7 +299,7 @@ if (glc != null) wsdlToJava.setNamespacePackageMap(glc.packageNamespaceMap); - wsdlToJava.setUnwrap(w2jc.unwrap); + wsdlToJava.setParameterStyle(w2jc.parameterStyle); wsdlToJava.generateSEI(wsdl, new File(outDir)); //Generate the Service File @@ -311,7 +311,7 @@ MappingFileGenerator mgf = new MappingFileGenerator(wsdl, new LiteralTypeMapping()); mgf.setPackageName(getPackageName(wsdl, glc)); mgf.setServiceName(wsdl.getServices()[0].getName().toString()); - mgf.setUnwrap(w2jc.unwrap); + mgf.setParameterStyle(w2jc.parameterStyle); //mgf.generate(); JavaWsdlMapping jwm = mgf.generate(); Modified: trunk/src/main/java/org/jboss/ws/tools/interfaces/WSDLToJavaIntf.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/interfaces/WSDLToJavaIntf.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/tools/interfaces/WSDLToJavaIntf.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -99,8 +99,6 @@ */ public void setTypeMapping(LiteralTypeMapping typeMapping); - public boolean isUnwrap(); + public void setParameterStyle(String paramStyle); - public void setUnwrap(boolean unwrap); - } Modified: trunk/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -93,7 +93,7 @@ */ protected LiteralTypeMapping typeMapping = null; - protected boolean unwrap = false; + protected String parameterStyle; public MappingFileGenerator(WSDLDefinitions wsdl, TypeMapping typeM) { @@ -156,16 +156,11 @@ this.typeNamespace = typeNamespace; } - public boolean isUnwrap() + public void setParameterStyle(String paramStyle) { - return unwrap; + this.parameterStyle = paramStyle; } - public void setUnwrap(boolean unwrap) - { - this.unwrap = unwrap; - } - /** * Method that generates the jaxrpc mapping metadata * <dt>Guidance:<dd> @@ -177,8 +172,8 @@ */ public JavaWsdlMapping generate() throws IOException { - MappingFileGeneratorHelper helper = new MappingFileGeneratorHelper(this.wsdlDefinitions, this.serviceName, this.packageName, this.serviceEndpointInterface, - this.typeNamespace, this.typeMapping, this.unwrap); + MappingFileGeneratorHelper helper = new MappingFileGeneratorHelper(wsdlDefinitions, serviceName, packageName, serviceEndpointInterface, + typeNamespace, typeMapping, parameterStyle); String targetNS = wsdlDefinitions.getTargetNamespace(); if (typeNamespace == null) typeNamespace = targetNS; Modified: trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -151,7 +151,6 @@ ParameterMetaData wrappedParameter = null; List<WrappedParameter> wrappedParameters = null; - if (om.isDocumentWrapped()) { QName xmlName = new QName(tmd.typeNamespace, om.getQName().getLocalPart()); Modified: trunk/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -347,6 +347,7 @@ JBossXSModelGroup group = (JBossXSModelGroup)complexType.getParticle().getTerm(); group.setParticles(particles); + log.debug("generateNewType: " + sutils.write(complexType)); return complexType; } Modified: trunk/src/main/resources/schema/jbossws-tool_1_0.xsd =================================================================== --- trunk/src/main/resources/schema/jbossws-tool_1_0.xsd 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/resources/schema/jbossws-tool_1_0.xsd 2006-11-21 17:37:18 UTC (rev 1489) @@ -231,15 +231,21 @@ </xs:annotation> </xs:element> </xs:sequence> - <xs:attribute name="file" type="xs:anyURI" use="required"> + <xs:attribute name="location" type="xs:anyURI" use="required"> <xs:annotation> <xs:documentation>Specifies the location of the WSDL file as a URL. The URL may be either absolute or relative to the current directory. Remote protocols such as http are supported.</xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="unwrap" type="xs:boolean" use="optional" default="false"> + <xs:attribute name="parameter-style" use="optional" default="wrapped"> <xs:annotation> - <xs:documentation>Whether to unwrap a document/literal webservice reques and response message. This is intended to be used on a service that follows the "wrapped" convention.</xs:documentation> + <xs:documentation>The parameter style convention to use when using document/literal. The "bare" convention requires that the Java method have a single parameter that represents the full request message body, and a single return value that represents the full response message body. The "wrapped" convention allows any Java method signature because it wraps all parameter in a single schema type.</xs:documentation> </xs:annotation> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="bare"/> + <xs:enumeration value="wrapped"/> + </xs:restriction> + </xs:simpleType> </xs:attribute> </xs:complexType> <xs:complexType name="parameterType"> Copied: trunk/src/test/resources/jaxrpc/jbws718/null (from rev 1217, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws718/null) Copied: trunk/src/test/resources/jaxrpc/jbws718/webservices.xml (from rev 1217, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws718/webservices.xml) Modified: trunk/src/test/resources/jaxrpc/jbws718/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxrpc/jbws718/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/jaxrpc/jbws718/wstools-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -12,7 +12,8 @@ <global> <package-namespace package="org.jboss.test.ws.jaxrpc.jbws718" namespace="http://jboss.org/test/ws/jbws718"/> </global> - <wsdl-java file="resources/jaxrpc/jbws718/WEB-INF/wsdl/TestService.wsdl"> + + <wsdl-java location="resources/jaxrpc/jbws718/WEB-INF/wsdl/TestService.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml" /> <webservices servlet-link="TestService" /> </wsdl-java> Modified: trunk/src/test/resources/jaxrpc/jbws807/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxrpc/jbws807/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/jaxrpc/jbws807/wstools-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -12,7 +12,7 @@ <global> <package-namespace package="org.jboss.test.ws.jaxrpc.jbws807" namespace="http://jboss.org/test/ws/jbws807"/> </global> - <wsdl-java file="WEB-INF/wsdl/TestService.wsdl"> + <wsdl-java location="WEB-INF/wsdl/TestService.wsdl"> <mapping file="jaxrpc-mapping.xml" /> </wsdl-java> Modified: trunk/src/test/resources/jaxrpc/jbws958/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxrpc/jbws958/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/jaxrpc/jbws958/wstools-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -12,7 +12,7 @@ <global> <package-namespace package="org.jboss.test.ws.jaxrpc.jbws958" namespace="http://services.iplsprovisioning.tsi.com"/> </global> - <wsdl-java file="resources/jaxrpc/jbws958/WEB-INF/wsdl/IPLSProvisioning.wsdl"> + <wsdl-java location="resources/jaxrpc/jbws958/WEB-INF/wsdl/IPLSProvisioning.wsdl"> <mapping file="jaxrpc-mapping.xml" /> </wsdl-java> Modified: trunk/src/test/resources/jaxrpc/samples/wsbpel/hello/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxrpc/samples/wsbpel/hello/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/jaxrpc/samples/wsbpel/hello/wstools-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -4,7 +4,7 @@ <package-namespace package="org.jboss.test.ws.jaxrpc.samples.wsbpel.hello" namespace="http://jbpm.org/examples/hello" /> </global> - <wsdl-java file="wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl/service.wsdl"> + <wsdl-java location="wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl/service.wsdl"> <mapping file="jaxrpc-mapping.xml" /> </wsdl-java> </configuration> \ No newline at end of file Modified: trunk/src/test/resources/jaxws/samples/jsr181ejb/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxws/samples/jsr181ejb/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/jaxws/samples/jsr181ejb/wstools-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -11,7 +11,7 @@ <global> <package-namespace package="org.jboss.test.ws.jaxws.samples.jsr181ejb" namespace="http://org.jboss.ws/samples/jsr181ejb"/> </global> - <wsdl-java file="resources/jaxws/samples/jsr181ejb/META-INF/wsdl/TestService.wsdl"> + <wsdl-java location="resources/jaxws/samples/jsr181ejb/META-INF/wsdl/TestService.wsdl"> <mapping file="jaxrpc-mapping.xml" /> </wsdl-java> Modified: trunk/src/test/resources/jaxws/samples/jsr181pojo/docwrapped/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxws/samples/jsr181pojo/docwrapped/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/jaxws/samples/jsr181pojo/docwrapped/wstools-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -11,7 +11,7 @@ <global> <package-namespace package="org.jboss.test.ws.jaxws.samples.jsr181pojo.docwrapped" namespace="http://org.jboss.ws/samples/jsr181pojo/docwrapped"/> </global> - <wsdl-java unwrap="true" file="resources/jaxws/samples/jsr181pojo/docwrapped/META-INF/wsdl/TestService.wsdl"> + <wsdl-java parameter-style="wrapped" location="resources/jaxws/samples/jsr181pojo/docwrapped/META-INF/wsdl/TestService.wsdl"> <mapping file="jaxrpc-mapping.xml" /> </wsdl-java> Modified: trunk/src/test/resources/jaxws/samples/jsr181pojo/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxws/samples/jsr181pojo/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/jaxws/samples/jsr181pojo/wstools-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -11,7 +11,7 @@ <global> <package-namespace package="org.jboss.test.ws.jaxws.samples.jsr181pojo" namespace="http://org.jboss.ws/samples/jsr181pojo"/> </global> - <wsdl-java file="resources/jaxws/samples/jsr181pojo/META-INF/wsdl/TestService.wsdl"> + <wsdl-java location="resources/jaxws/samples/jsr181pojo/META-INF/wsdl/TestService.wsdl"> <mapping file="jaxrpc-mapping.xml" /> </wsdl-java> Modified: trunk/src/test/resources/jaxws/samples/wsaddressing/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxws/samples/wsaddressing/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/jaxws/samples/wsaddressing/wstools-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -11,7 +11,7 @@ <global> <package-namespace package="org.jboss.test.ws.jaxws.samples.wsaddressing" namespace="http://org.jboss.ws/samples/wsaddressing"/> </global> - <wsdl-java file="resources/jaxws/samples/wsaddressing/META-INF/wsdl/TestService.wsdl"> + <wsdl-java location="resources/jaxws/samples/wsaddressing/META-INF/wsdl/TestService.wsdl"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> Modified: trunk/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/wstools-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -11,7 +11,7 @@ <global> <package-namespace package="org.jboss.test.ws.jaxws.wsaddressing.replyto" namespace="http://org.jboss.ws/addressing/replyto"/> </global> - <wsdl-java file="http://localhost:8080/jaxws-wsaddressing-initial/InitialService?wsdl"> + <wsdl-java location="http://localhost:8080/jaxws-wsaddressing-initial/InitialService?wsdl"> <mapping file="jaxrpc-mapping.xml" /> </wsdl-java> Modified: trunk/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/wstools-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -11,7 +11,7 @@ <global> <package-namespace package="org.jboss.test.ws.jaxws.wsaddressing.replyto" namespace="http://org.jboss.ws/addressing/replyto"/> </global> - <wsdl-java file="http://localhost:8080/jaxws-wsaddressing-replyto/ReplyToService?wsdl"> + <wsdl-java location="http://localhost:8080/jaxws-wsaddressing-replyto/ReplyToService?wsdl"> <mapping file="jaxrpc-mapping.xml" /> </wsdl-java> Modified: trunk/src/test/resources/tools/config/wsdl2java.xml =================================================================== --- trunk/src/test/resources/tools/config/wsdl2java.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/config/wsdl2java.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -3,5 +3,5 @@ <configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <wsdl-java file="dummylocation"/> + <wsdl-java location="dummylocation"/> </configuration> Modified: trunk/src/test/resources/tools/config/wsdl2javaglobal.xml =================================================================== --- trunk/src/test/resources/tools/config/wsdl2javaglobal.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/config/wsdl2javaglobal.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -5,5 +5,5 @@ <global> <package-namespace package="org.jboss.test.ws" namespace="http://org.jboss.ws"/> </global> - <wsdl-java file="resources/tools/wsdlfixture/StandardJavaTypesService_RPC_11.wsdl"/> + <wsdl-java location="resources/tools/wsdlfixture/StandardJavaTypesService_RPC_11.wsdl"/> </configuration> Modified: trunk/src/test/resources/tools/jbws-206/jbosswsConfig/Attachment/Attachmentwsdl2java.xml =================================================================== --- trunk/src/test/resources/tools/jbws-206/jbosswsConfig/Attachment/Attachmentwsdl2java.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/jbws-206/jbosswsConfig/Attachment/Attachmentwsdl2java.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -5,5 +5,5 @@ <global> <package-namespace package="org.jboss.test.webservice.attachment" namespace="http://org.jboss.ws/attachment"/> </global> - <wsdl-java file="resources/tools/jbws-206/wsdlFixture/Attachment/AttachmentService_RPC_11.wsdl"/> + <wsdl-java location="resources/tools/jbws-206/wsdlFixture/Attachment/AttachmentService_RPC_11.wsdl"/> </configuration> Modified: trunk/src/test/resources/tools/jbws-206/jbosswsConfig/InOutParameters/InOutParameterswsdl2java.xml =================================================================== --- trunk/src/test/resources/tools/jbws-206/jbosswsConfig/InOutParameters/InOutParameterswsdl2java.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/jbws-206/jbosswsConfig/InOutParameters/InOutParameterswsdl2java.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -5,5 +5,5 @@ <global> <package-namespace package="org.jboss.test.webservice.inoutparameters" namespace="http://org.jboss.ws/holder"/> </global> - <wsdl-java file="resources/tools/jbws-206/wsdlFixture/InOutParameters/InOutParametersService_RPC_11.wsdl"/> + <wsdl-java location="resources/tools/jbws-206/wsdlFixture/InOutParameters/InOutParametersService_RPC_11.wsdl"/> </configuration> Modified: trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OneWay/OneWaywsdl2java.xml =================================================================== --- trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OneWay/OneWaywsdl2java.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OneWay/OneWaywsdl2java.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -5,5 +5,5 @@ <global> <package-namespace package="org.jboss.test.webservice.oneway" namespace="http://org.jboss.ws"/> </global> - <wsdl-java file="resources/tools/jbws-206/wsdlFixture/OneWay/OneWayService_RPC_11.wsdl"/> + <wsdl-java location="resources/tools/jbws-206/wsdlFixture/OneWay/OneWayService_RPC_11.wsdl"/> </configuration> Modified: trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OutParameters/OutParameterswsdl2java.xml =================================================================== --- trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OutParameters/OutParameterswsdl2java.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OutParameters/OutParameterswsdl2java.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -5,5 +5,5 @@ <global> <package-namespace package="org.jboss.test.webservice.outparameters" namespace="http://org.jboss.ws/holder"/> </global> - <wsdl-java file="resources/tools/jbws-206/wsdlFixture/OutParameters/OutParametersService_RPC_11.wsdl"/> + <wsdl-java location="resources/tools/jbws-206/wsdlFixture/OutParameters/OutParametersService_RPC_11.wsdl"/> </configuration> Modified: trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml =================================================================== --- trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -5,5 +5,5 @@ <global> <package-namespace package="org.jboss.test.webservice.userexception" namespace="http://org.jboss.ws"/> </global> - <wsdl-java file="resources/tools/jbws-206/wsdlFixture/UserException/UserExceptionService_RPC_11.wsdl"/> + <wsdl-java location="resources/tools/jbws-206/wsdlFixture/UserException/UserExceptionService_RPC_11.wsdl"/> </configuration> Modified: trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml =================================================================== --- trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -5,5 +5,5 @@ <global> <package-namespace package="org.jboss.test.webservice.userexceptioninheritance" namespace="http://org.jboss.ws"/> </global> - <wsdl-java file="resources/tools/jbws-206/wsdlFixture/UserExceptionInheritance/UserExceptionInheritanceService_RPC_11.wsdl"/> + <wsdl-java location="resources/tools/jbws-206/wsdlFixture/UserExceptionInheritance/UserExceptionInheritanceService_RPC_11.wsdl"/> </configuration> Modified: trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserTypes/UserTypeswsdl2java.xml =================================================================== --- trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserTypes/UserTypeswsdl2java.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserTypes/UserTypeswsdl2java.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -5,5 +5,5 @@ <global> <package-namespace package="org.jboss.test.webservice.usertypes" namespace="http://org.jboss.ws"/> </global> - <wsdl-java file="resources/tools/jbws-206/wsdlFixture/UserTypes/ComplexTypesService_RPC_11.wsdl"/> + <wsdl-java location="resources/tools/jbws-206/wsdlFixture/UserTypes/ComplexTypesService_RPC_11.wsdl"/> </configuration> Modified: trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImport/WsdlImportwsdl2java.xml =================================================================== --- trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImport/WsdlImportwsdl2java.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImport/WsdlImportwsdl2java.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -5,5 +5,5 @@ <global> <package-namespace package="org.jboss.test.webservice.wsdlimport" namespace="http://jboss.org/wsdlimport"/> </global> - <wsdl-java file="resources/tools/jbws-206/wsdlFixture/WsdlImport/WsdlImportService_RPC_11.wsdl"/> + <wsdl-java location="resources/tools/jbws-206/wsdlFixture/WsdlImport/WsdlImportService_RPC_11.wsdl"/> </configuration> Modified: trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImportWithUserTypes/WsdlImportWithUserTypeswsdl2java.xml =================================================================== --- trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImportWithUserTypes/WsdlImportWithUserTypeswsdl2java.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImportWithUserTypes/WsdlImportWithUserTypeswsdl2java.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -5,5 +5,5 @@ <global> <package-namespace package="org.jboss.test.webservice.wsdlimportwithusertypes" namespace="http://org.jboss.ws"/> </global> - <wsdl-java file="resources/tools/jbws-206/wsdlFixture/WsdlImportWithUserTypes/ComplexTypesService_RPC_11.wsdl"/> + <wsdl-java location="resources/tools/jbws-206/wsdlFixture/WsdlImportWithUserTypes/ComplexTypesService_RPC_11.wsdl"/> </configuration> Modified: trunk/src/test/resources/tools/jbws1170/wstools-config.xml =================================================================== --- trunk/src/test/resources/tools/jbws1170/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/jbws1170/wstools-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -1,5 +1,5 @@ <configuration> - <wsdl-java file="resources/tools/jbws1170/HyphenatedElementName.wsdl"> + <wsdl-java location="resources/tools/jbws1170/HyphenatedElementName.wsdl" parameter-style="bare"> <mapping file="wrapper-mapping.xml"/> </wsdl-java> </configuration> Modified: trunk/src/test/resources/tools/jbws1253/wstools-config.xml =================================================================== --- trunk/src/test/resources/tools/jbws1253/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/jbws1253/wstools-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -1,5 +1,5 @@ <configuration> - <wsdl-java file="resources/tools/jbws1253/MyPortTypeService.wsdl"> + <wsdl-java location="resources/tools/jbws1253/MyPortTypeService.wsdl" parameter-style="bare"> <mapping file="myporttype-mapping.xml"/> </wsdl-java> </configuration> Modified: trunk/src/test/resources/tools/testsuite-configs/jbws153-config.xml =================================================================== --- trunk/src/test/resources/tools/testsuite-configs/jbws153-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/testsuite-configs/jbws153-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -2,7 +2,7 @@ <configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <wsdl-java file="c:/devel/jboss-head/testsuite/src/resources/webservice/jbws153/WEB-INF/wsdl/OrderSOAP.wsdl"> + <wsdl-java location="c:/devel/jboss-head/testsuite/src/resources/webservice/jbws153/WEB-INF/wsdl/OrderSOAP.wsdl"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> </configuration> Modified: trunk/src/test/resources/tools/testsuite-configs/jbws349-config.xml =================================================================== --- trunk/src/test/resources/tools/testsuite-configs/jbws349-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/testsuite-configs/jbws349-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -2,7 +2,7 @@ <configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <wsdl-java file="c:/devel/jboss-head/testsuite/src/resources/webservice/jbws349/WEB-INF/wsdl/ServiceFacade.wsdl"> + <wsdl-java location="c:/devel/jboss-head/testsuite/src/resources/webservice/jbws349/WEB-INF/wsdl/ServiceFacade.wsdl"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> </configuration> Modified: trunk/src/test/resources/tools/testsuite-configs/jbws381-config.xml =================================================================== --- trunk/src/test/resources/tools/testsuite-configs/jbws381-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/testsuite-configs/jbws381-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -2,7 +2,7 @@ <configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <wsdl-java file="c:/devel/jboss-head/testsuite/src/resources/webservice/jbws381/WEB-INF/wsdl/WeatherForecast.wsdl"> + <wsdl-java location="c:/devel/jboss-head/testsuite/src/resources/webservice/jbws381/WEB-INF/wsdl/WeatherForecast.wsdl"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> </configuration> Modified: trunk/src/test/resources/tools/testsuite-configs/jbws484-config.xml =================================================================== --- trunk/src/test/resources/tools/testsuite-configs/jbws484-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/testsuite-configs/jbws484-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -6,7 +6,7 @@ <package-namespace package="org.jboss.test.ws.jbws484" namespace="http://idm.vignette.com/"/> </global> - <wsdl-java file="c:/devel/jboss-head/testsuite/src/resources/webservice/jbws484/WEB-INF/wsdl/TestService.wsdl"> + <wsdl-java location="c:/devel/jboss-head/testsuite/src/resources/webservice/jbws484/WEB-INF/wsdl/TestService.wsdl"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> </configuration> Modified: trunk/src/test/resources/tools/testsuite-configs/samples-client-config.xml =================================================================== --- trunk/src/test/resources/tools/testsuite-configs/samples-client-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/testsuite-configs/samples-client-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -2,7 +2,7 @@ <configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <wsdl-java file="c:/devel/jboss-head/testsuite/src/resources/webservice/samples/server-ejb-sec/META-INF/wsdl/OrganizationService.wsdl"> + <wsdl-java location="c:/devel/jboss-head/testsuite/src/resources/webservice/samples/server-ejb-sec/META-INF/wsdl/OrganizationService.wsdl"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> </configuration> Modified: trunk/src/test/resources/tools/testsuite-configs/ws4eesimple-client-config.xml =================================================================== --- trunk/src/test/resources/tools/testsuite-configs/ws4eesimple-client-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/testsuite-configs/ws4eesimple-client-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -2,7 +2,7 @@ <configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <wsdl-java file="../../output-tests/resources/testsuite/ws4eesimple/WEB-INF/wsdl/HelloService.wsdl"> + <wsdl-java location="../../output-tests/resources/testsuite/ws4eesimple/WEB-INF/wsdl/HelloService.wsdl"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> </configuration>

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r1488 - in trunk: . src/main/java/org/jboss/ws/metadata src/main/java/org/jboss/ws/metadata/builder/jaxrpc src/main/java/org/jboss/ws/metadata/builder/jaxws src/main/java/org/jboss/ws/metadata/jsr109 src/main/java/org/jboss/ws/soap src/main/java/org/jboss/ws/tools src/main/java/org/jboss/ws/tools/config src/main/java/org/jboss/ws/tools/helpers src/main/java/org/jboss/ws/tools/interfaces src/main/java/org/jboss/ws/tools/metadata src/main/java/org/jboss/ws/utils src/main/resourc

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-21 07:38:04 -0500 (Tue, 21 Nov 2006) New Revision: 1488 Removed: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/PingMsg.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/PingMsgResponse.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/TestService_PortType.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/TestService_Service.java trunk/src/test/java/org/jboss/test/ws/tools/jsr181/ trunk/src/test/resources/jaxrpc/jbws718/WEB-INF/jaxrpc-mapping.xml trunk/src/test/resources/jaxrpc/jbws718/WEB-INF/webservices.xml trunk/src/test/resources/jaxrpc/jbws718/org/ trunk/src/test/resources/jaxrpc/jbws807/org/ Modified: trunk/.classpath trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesMetaData.java trunk/src/main/java/org/jboss/ws/soap/SOAPPartImpl.java trunk/src/main/java/org/jboss/ws/tools/Configuration.java trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java trunk/src/main/java/org/jboss/ws/tools/WSDotXMLCreator.java trunk/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java trunk/src/main/java/org/jboss/ws/tools/interfaces/WSDLToJavaIntf.java trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsAnnotationMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/utils/DOMWriter.java trunk/src/main/resources/schema/jbossws-tool_1_0.xsd trunk/src/test/build.xml trunk/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java trunk/src/test/java/org/jboss/test/ws/tools/assertions/Jaxrpc20AssertionsTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomArrays/CustomArrayJava2WSDLTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Inheritance/InheritanceJava2WSDLTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/PublicPrivate/PublicPrivateJava2WSDLTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/StandardArrays/StandardArraysJava2WSDLTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/StandardHolders/StandardHoldersJava2WSDLTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/UserException/UserExceptionJava2WSDLTestCase.java trunk/src/test/resources/jaxrpc/jbws718/wstools-config.xml trunk/src/test/resources/jaxrpc/jbws807/wstools-config.xml trunk/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolders/CustomHoldersConfig.xml trunk/src/test/resources/tools/jbws-211/jbosswsConfig/OneWay/OneWayConfig.xml Log: [JBWS-812] SOAPPart.setContent() does not handle non-element nodes [JBWS-762] DOMUtils.parse skips peer comments on Document node [JBWS-779] Add webservices.xml support to wsdlTojava [JBWS-353] Adapt Tools to use the new Schema configuration(JBWS-322) [JBWS-509] WSDL 2.0 support in tools is broken, fix or remove it [JBWS-550] Use AnnotationMetaDataBuilder in tools Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/.classpath 2006-11-21 12:38:04 UTC (rev 1488) @@ -16,7 +16,6 @@ <classpathentry kind="lib" path="thirdparty/junit.jar"/> <classpathentry kind="lib" path="thirdparty/concurrent.jar"/> <classpathentry kind="lib" path="thirdparty/javassist.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry kind="lib" path="thirdparty/jboss-xml-binding.jar"/> <classpathentry kind="lib" path="thirdparty/policy-1.0.jar"/> <classpathentry kind="lib" path="thirdparty/stax-api-1.0.jar"/> @@ -32,5 +31,6 @@ <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-dependency.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -264,9 +264,9 @@ return oneWay; } - public void setOneWayOperation(boolean oneWayOperation) + public void setOneWay(boolean oneWay) { - this.oneWay = oneWayOperation; + this.oneWay = oneWay; assertOneWayOperation(); } Modified: trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -193,7 +193,7 @@ // Set the operation MEP if (Constants.WSDL20_PATTERN_IN_ONLY.equals(wsdlOperation.getPattern())) - opMetaData.setOneWayOperation(true); + opMetaData.setOneWay(true); // Set the operation SOAPAction WSDLBinding wsdlBinding = wsdlDefinitions.getBindingByInterfaceName(wsdlInterface.getQName()); Modified: trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -161,7 +161,7 @@ // Set the operation MEP if (Constants.WSDL20_PATTERN_IN_ONLY.equals(wsdlOperation.getPattern())) - opMetaData.setOneWayOperation(true); + opMetaData.setOneWay(true); // Set the operation SOAPAction WSDLBinding wsdlBinding = wsdlDefinitions.getBindingByInterfaceName(wsdlInterface.getQName()); Modified: trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -466,7 +466,7 @@ } OperationMetaData opMetaData = new OperationMetaData(epMetaData, new QName(targetNS, operationName), javaName); - opMetaData.setOneWayOperation(method.isAnnotationPresent(Oneway.class)); + opMetaData.setOneWay(method.isAnnotationPresent(Oneway.class)); opMetaData.setSOAPAction(soapAction); epMetaData.addOperation(opMetaData); Modified: trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesMetaData.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesMetaData.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -47,9 +47,10 @@ // The URL to the webservices.xml descriptor private URL descriptorURL; - /** - * Construct webservices meta data, with a given resource class loader. - */ + public WebservicesMetaData() + { + } + public WebservicesMetaData(URL descriptorURL) { this.descriptorURL = descriptorURL; Modified: trunk/src/main/java/org/jboss/ws/soap/SOAPPartImpl.java =================================================================== --- trunk/src/main/java/org/jboss/ws/soap/SOAPPartImpl.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/soap/SOAPPartImpl.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -157,7 +157,13 @@ if (source instanceof DOMSource) { DOMSource domSource = (DOMSource)source; - domElement = (Element)domSource.getNode(); + Node node = domSource.getNode(); + if (node instanceof Document) + domElement = ((Document)node).getDocumentElement(); + else if (node instanceof Element) + domElement = (Element)node; + else + throw new SOAPException("Unsupported DOMSource node: " + node); } else if (source instanceof StreamSource) { Modified: trunk/src/main/java/org/jboss/ws/tools/Configuration.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/Configuration.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/tools/Configuration.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -35,9 +35,9 @@ */ public class Configuration { - private JavaToWSDLConfig j2wc = null; - private WSDLToJavaConfig w2jc = null; - private GlobalConfig globalConfig = null; + private JavaToWSDLConfig j2wc; + private WSDLToJavaConfig w2jc; + private GlobalConfig globalConfig; public Configuration() { @@ -87,56 +87,33 @@ */ public class JavaToWSDLConfig { - /** - * Is a jax-rpc mapping file needed? - */ - public boolean mappingFileNeeded = false; - /** - * Name of the jax-rpc mapping file - */ - public String mappingFileName = null; - /** - * Need webservices.xml file? - */ - public boolean wsxmlFileNeeded = false; - /** - * Target Namespace - */ - public String targetNamespace = null; - /** - * Type Namespace - */ - public String typeNamespace = null; - /** - * Service Name - */ - public String serviceName = null; - /** - * Endpoint Name - */ - public String endpointName = null; - - /** - * Style of WSDL. {"rpc","doc"} - */ + // Is a jaxrpc-mapping file needed? + public boolean mappingFileNeeded; + // Name of the jaxrpc-mapping file + public String mappingFileName; + // Need webservices.xml file? + public boolean wsxmlFileNeeded; + // Target Namespace + public String targetNamespace; + // Type Namespace + public String typeNamespace; + // Service Name + public String serviceName; + // Endpoint Name + public String endpointName; + // Style of WSDL. {"rpc","doc"} public String wsdlStyle = "document"; - + // Parameter style {"wrapped", "bare"} public String parameterStyle = "wrapped"; - /** - * WSDL Version {"1.1","2.0"} - */ + // WSDL Version {"1.1","2.0"} public String wsdlVersion = "1.1"; - /** - * Should Schema be included in the wsdl - */ + // Should Schema be included in the wsdl public boolean includeSchemaInWSDL = true; - public boolean restrictSchemaToTargetNS = false; + public boolean restrictSchemaToTargetNS; + public String servletLink; + public String ejbLink; + public boolean wsxmlFileAppend; - public String servletLink = null; - public String ejbLink = null; - - public boolean wsxmlFileAppend = false; - public Map<String, List<OperationConfig>> operations = new HashMap<String, List<OperationConfig>>(); public OperationConfig createOperationConfig() @@ -145,7 +122,7 @@ } /**Configuration at the operation level*/ - /*public OperationConfig opConfig = null; + /*public OperationConfig opConfig; public OperationConfig getOperationConfig(boolean createNew) { @@ -160,10 +137,16 @@ */ public class WSDLToJavaConfig { - public String wsdlLocation = null; - public boolean unwrap = false; - public boolean mappingFileNeeded = false; - public String mappingFileName = null; + public String wsdlLocation; + public boolean unwrap; + // Is a jaxrpc-mapping file needed? + public boolean mappingFileNeeded; + // Name of the jaxrpc-mapping file + public String mappingFileName; + // Need webservices.xml file? + public boolean wsxmlFileNeeded; + public String servletLink; + public String ejbLink; } /** @@ -183,7 +166,7 @@ public String name; public boolean isOneWay = false; public List<ParameterConfig> params = new ArrayList<ParameterConfig>(); - public QName returnXmlName = null; + public QName returnXmlName; public ParameterConfig createParameterConfig() { Modified: trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -194,10 +194,15 @@ } + public Map<String, String> getNamespacePackageMap() + { + return namespacePackageMap; + } + /* (non-Javadoc) * @see org.jboss.ws.tools.WSDLToJavaIntf#setPackageNamespaceMap(java.util.Map) */ - public void setPackageNamespaceMap(Map<String, String> map) + public void setNamespacePackageMap(Map<String, String> map) { //Lets convert the package->namespace map to namespace->package map Set keys = map.keySet(); @@ -552,26 +557,33 @@ private void createSEIFile(WSDLInterface intf, File loc) throws IOException { - String fname = utils.chopPortType(intf.getName().toString()); - //Check if the portType name conflicts with a service name - if(wsdl.getService(new NCName(fname)) != null ) - fname += "_PortType"; + String seiName = getServiceEndpointInterfaceName(intf); StringBuilder buf = new StringBuilder(); utils.writeJbossHeader(buf); buf.append("package " + seiPkgName + ";" + newline); - buf.append("public interface " + fname + " extends java.rmi.Remote" + newline + "{" + newline); + buf.append("public interface " + seiName + " extends java.rmi.Remote" + newline + "{" + newline); appendMethods(intf, buf); buf.append("}" + newline); - File sei = utils.createPhysicalFile(loc, fname); + File sei = utils.createPhysicalFile(loc, seiName); FileWriter writer = new FileWriter(sei); writer.write(buf.toString()); writer.flush(); writer.close(); } + public String getServiceEndpointInterfaceName(WSDLInterface wsdlInterface) + { + String seiName = utils.chopPortType(wsdlInterface.getName().toString()); + //Check if the portType name conflicts with a service name + if (wsdl.getService(new NCName(seiName)) != null) + seiName += "_PortType"; + + return seiName; + } + private void createSEI(File loc, WSDLDefinitions wsdl) { WSDLInterface[] intarr = wsdl.getInterfaces(); Modified: trunk/src/main/java/org/jboss/ws/tools/WSDotXMLCreator.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/WSDotXMLCreator.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/tools/WSDotXMLCreator.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -180,7 +180,7 @@ private WebservicesMetaData constructWSMetaData() { - WebservicesMetaData wm = new WebservicesMetaData(null); + WebservicesMetaData wm = new WebservicesMetaData(); WebserviceDescriptionMetaData wsdm = new WebserviceDescriptionMetaData(wm); populateWebserviceDescriptionMetaData(wsdm); wm.addWebserviceDescription(wsdm); Modified: trunk/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -266,7 +266,14 @@ wsdl2jc.mappingFileNeeded = true; wsdl2jc.mappingFileName = attrs.getValue(FILE_ATTRIBUTE); } - + else if (WEBSERVICES_TAG.equals(localName)) + { + wsdl2jc.wsxmlFileNeeded = true; + wsdl2jc.servletLink = getOptionalAttribute(attrs, SERVLET_LINK_ATTRIBUTE, null); + wsdl2jc.ejbLink = getOptionalAttribute(attrs, EJB_LINK_ATTRIBUTE, null); + if (wsdl2jc.ejbLink == null && wsdl2jc.servletLink == null) + throw new WSException("Either servletLink or ejbLink should be specified"); + } return wsdl2jc; } Modified: trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -36,8 +36,6 @@ import javax.xml.namespace.QName; import org.jboss.logging.Logger; -import org.jboss.ws.utils.DOMUtils; -import org.jboss.ws.utils.DOMWriter; import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.jaxrpc.LiteralTypeMapping; @@ -52,7 +50,6 @@ import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping; import org.jboss.ws.metadata.wsdl.NCName; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLException; import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.tools.Configuration; import org.jboss.ws.tools.JavaToWSDL; @@ -67,6 +64,8 @@ import org.jboss.ws.tools.client.ServiceCreator; import org.jboss.ws.tools.interfaces.WSDotXMLCreatorIntf; import org.jboss.ws.tools.mapping.MappingFileGenerator; +import org.jboss.ws.utils.DOMUtils; +import org.jboss.ws.utils.DOMWriter; import org.jboss.ws.utils.IOUtils; import org.jboss.ws.utils.JavaUtils; @@ -142,27 +141,6 @@ writer.close(); } - // MappingFileGenerator mgf = new MappingFileGenerator(wsdl,jwsdl.getTypeMapping() ); - // mgf.setPackageName(endpointClass.getPackage().getName()); - // mgf.setServiceEndpointInterface(endpointClass); - // mgf.setServiceName(j2wc.serviceName); - // mgf.setTypeNamespace(j2wc.typeNamespace); - // //mgf.generate(); - // JavaWsdlMapping jwm = mgf.generate(); - // fw = new FileWriter(outDir + "/" + j2wc.mappingFileName); - // fw.write(DOMWriter.printNode(DOMUtils.parse(jwm.serialize()), true)); - // fw.close(); - // - // //Generate the Request/Response structures also - // if(j2wc.wsdlStyle.equals("document")) - // { - // String seiName = endpointClass.getName(); - // mgf.generateJavaSourceFileForRequestResponseStruct(new File(outDir), - // jwm.getServiceEndpointInterfaceMapping(seiName), - // WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()),j2wc.typeNamespace ); - // } - // } - //Generate the webservices.xml file if (j2wc.wsxmlFileNeeded) { @@ -194,8 +172,7 @@ } } - private void createWrapperTypes(JavaToWSDLConfig j2wc, String outDir, UnifiedMetaData wsMetaData, JavaWsdlMapping mapping, Class endpointClass) - throws IOException + private void createWrapperTypes(JavaToWSDLConfig j2wc, String outDir, UnifiedMetaData wsMetaData, JavaWsdlMapping mapping, Class endpointClass) throws IOException { Map<QName, JavaXmlTypeMapping> index = indexMappingTypes(mapping); @@ -320,13 +297,14 @@ wsdl = wsdlToJava.convertWSDL2Java(wsdlURL); if (glc != null) - wsdlToJava.setPackageNamespaceMap(glc.packageNamespaceMap); + wsdlToJava.setNamespacePackageMap(glc.packageNamespaceMap); wsdlToJava.setUnwrap(w2jc.unwrap); wsdlToJava.generateSEI(wsdl, new File(outDir)); //Generate the Service File this.generateServiceFile(getPackageName(wsdl, glc), wsdl, outDir); + //Generate the Mapping File if (w2jc.mappingFileNeeded) { @@ -342,19 +320,56 @@ writer.write(DOMWriter.printNode(DOMUtils.parse(jwm.serialize()), true)); writer.close(); } + + //Generate the webservices.xml file + if (w2jc.wsxmlFileNeeded) + { + String seiName = "mypackage.MyServiceEndpointInterface"; + String serviceName = "MyServiceName"; + + if (wsdl.getServices().length == 1) + serviceName = wsdl.getServices()[0].getName().toString(); + + if (wsdl.getInterfaces().length == 1) + { + String seiPackage = wsdlToJava.getNamespacePackageMap().get(wsdl.getTargetNamespace()); + seiName = seiPackage + "." + wsdlToJava.getServiceEndpointInterfaceName(wsdl.getInterfaces()[0]); + } + + WSDotXMLCreatorIntf wscr = new WSDotXMLCreator(); + wscr.setTargetNamespace(wsdl.getTargetNamespace()); + wscr.setSeiName(seiName); + wscr.setServiceName(serviceName); + WSDLService wsdlService = wsdl.getService(new NCName(serviceName)); + String portName = wsdlService.getEndpoints()[0].getName().toString(); + wscr.setPortName(portName); + + String wsdlShortName = wsdlURL.getPath(); + wsdlShortName = wsdlShortName.substring(wsdlShortName.lastIndexOf("/")); + + if (w2jc.servletLink != null) + { + wscr.setMappingFile("WEB-INF/" + w2jc.mappingFileName); + wscr.setWsdlFile("WEB-INF/wsdl" + wsdlShortName); + wscr.setServletLink(w2jc.servletLink); + } + else + { + wscr.setMappingFile("META-INF/" + w2jc.mappingFileName); + wscr.setWsdlFile("META-INF/wsdl" + wsdlShortName); + wscr.setEjbLink(w2jc.ejbLink); + } + wscr.generateWSXMLDescriptor(new File(outDir + "/webservices.xml")); + } } - catch (MalformedURLException e) + catch (RuntimeException rte) { - throw new WSException(e); + throw rte; } - catch (WSDLException e) + catch (Exception ex) { - throw new WSException(e); + throw new WSException(ex); } - catch (IOException e) - { - throw new WSException(e); - } } //PRIVATE METHODS Modified: trunk/src/main/java/org/jboss/ws/tools/interfaces/WSDLToJavaIntf.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/interfaces/WSDLToJavaIntf.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/tools/interfaces/WSDLToJavaIntf.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -91,7 +91,7 @@ * * @param map */ - public void setPackageNamespaceMap(Map<String,String> map); + public void setNamespacePackageMap(Map<String,String> map); /** * The client can provide a type mapping Modified: trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -146,7 +146,7 @@ OperationMetaData om = getOperationMetaData(m); OperationConfig opc = getOperationConfig(methodname, m.getParameterTypes()); if (opc != null) - om.setOneWayOperation(opc.isOneWay); + om.setOneWay(opc.isOneWay); ParameterMetaData wrappedParameter = null; List<WrappedParameter> wrappedParameters = null; Modified: trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsAnnotationMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsAnnotationMetaDataBuilder.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsAnnotationMetaDataBuilder.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -135,7 +135,7 @@ //Oneway annotation Oneway ow = m.getAnnotation(Oneway.class); if(ow != null) - om.setOneWayOperation(true); + om.setOneWay(true); Class ret = m.getReturnType(); ParameterMetaData retPmd = getParameterMetaDataForReturnType(ret, om, 1); Modified: trunk/src/main/java/org/jboss/ws/utils/DOMWriter.java =================================================================== --- trunk/src/main/java/org/jboss/ws/utils/DOMWriter.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/utils/DOMWriter.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -106,6 +106,13 @@ this.out = new PrintWriter(w); } + public DOMWriter(Writer w, String charsetName) + { + this.out = new PrintWriter(w); + this.charsetName = charsetName; + this.writeXMLDeclaration = true; + } + public DOMWriter(OutputStream stream) { try @@ -194,9 +201,9 @@ * Set wheter the XML declaration should be written. * The default is false. */ - public DOMWriter setWriteXMLDeclaration(boolean writeXMLDeclaration) + public DOMWriter setWriteXMLDeclaration(boolean flag) { - this.writeXMLDeclaration = writeXMLDeclaration; + this.writeXMLDeclaration = flag; return this; } @@ -223,7 +230,10 @@ if (charsetName != null) out.print(" encoding='" + charsetName + "'"); - out.println("?>"); + out.print("?>"); + if (prettyprint) + out.println(); + wroteXMLDeclaration = true; } Modified: trunk/src/main/resources/schema/jbossws-tool_1_0.xsd =================================================================== --- trunk/src/main/resources/schema/jbossws-tool_1_0.xsd 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/resources/schema/jbossws-tool_1_0.xsd 2006-11-21 12:38:04 UTC (rev 1488) @@ -225,6 +225,11 @@ <xs:documentation>Specifies the JSR-109 mapping file to generate.</xs:documentation> </xs:annotation> </xs:element> + <xs:element name="webservices" type="ns1:wsxmlType" minOccurs="0"> + <xs:annotation> + <xs:documentation>Used to generate the JSR-109 webservices.xml file</xs:documentation> + </xs:annotation> + </xs:element> </xs:sequence> <xs:attribute name="file" type="xs:anyURI" use="required"> <xs:annotation> Modified: trunk/src/test/build.xml =================================================================== --- trunk/src/test/build.xml 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/build.xml 2006-11-21 12:38:04 UTC (rev 1488) @@ -305,6 +305,7 @@ <classpath location="${build.test.dir}"/> </taskdef> <mkdir dir="${build.test.dir}/wstools/java"/> + <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/jbws718/WEB-INF" config="${test.resources.dir}/jaxrpc/jbws718/wstools-config.xml"/> <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/> <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/> <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/> @@ -326,6 +327,7 @@ <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181pojo/docwrapped/wstools-config.xml"/> <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/wsaddressing/META-INF" config="${test.resources.dir}/jaxws/samples/wsaddressing/wstools-config.xml"/> <move todir="${build.test.dir}/wstools/java"> + <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/jbws718/WEB-INF" includes="org/**"/> <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> </move> </target> Modified: trunk/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -23,6 +23,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.StringWriter; import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPMessage; @@ -30,6 +31,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.utils.DOMUtils; import org.jboss.ws.utils.DOMWriter; +import org.w3c.dom.Document; import org.w3c.dom.Element; /** @@ -191,4 +193,24 @@ assertEquals(expStr, wasStr); } + + // [JBWS-762] DOMUtils.parse skips peer comments on Document node + public void testDocumentComments() throws Exception + { + String expStr = + "<?xml version='1.0' encoding='UTF-8'?>" + + "" + + "<root>" + + "" + + "<element>some value</element>" + + "</root>"; + + + Document doc = DOMUtils.parse(expStr).getOwnerDocument(); + StringWriter strwr = new StringWriter(); + new DOMWriter(strwr, "UTF-8").print(doc); + String wasStr = strwr.toString(); + + assertEquals(expStr, wasStr); + } } Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/PingMsg.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/PingMsg.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/PingMsg.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -1,24 +0,0 @@ -/* - * JBoss, the OpenSource EJB server - * Distributable under LGPL license. See terms of license at gnu.org. - */ -//Auto Generated by jbossws - Please do not edit!!! - - -package org.jboss.test.ws.jaxrpc.jbws718; - - -public class PingMsg -{ - - protected java.lang.String message; - public PingMsg(){} - - public PingMsg(java.lang.String message){ - this.message=message; - } - public java.lang.String getMessage() { return message ;} - - public void setMessage(java.lang.String message){ this.message=message; } - -} Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/PingMsgResponse.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/PingMsgResponse.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/PingMsgResponse.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -1,15 +0,0 @@ -/* - * JBoss, the OpenSource EJB server - * Distributable under LGPL license. See terms of license at gnu.org. - */ -//Auto Generated by jbossws - Please do not edit!!! - - -package org.jboss.test.ws.jaxrpc.jbws718; - - -public class PingMsgResponse -{ - public PingMsgResponse(){ - } -} Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/TestService_PortType.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/TestService_PortType.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/TestService_PortType.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -1,12 +0,0 @@ -/* - * JBoss, the OpenSource EJB server - * Distributable under LGPL license. See terms of license at gnu.org. - */ -//Auto Generated by jbossws - Please do not edit!!! - -package org.jboss.test.ws.jaxrpc.jbws718; -public interface TestService_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jaxrpc.jbws718.PingMsgResponse ping(org.jboss.test.ws.jaxrpc.jbws718.PingMsg pingMsg) throws java.rmi.RemoteException; -} Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/TestService_Service.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/TestService_Service.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/TestService_Service.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -1,19 +0,0 @@ -/* -* JBoss, the OpenSource EJB server -* Distributable under LGPL license. See terms of license at gnu.org. -*/ - -//Auto Generated by jbossws - Please do not edit!!! - -package org.jboss.test.ws.jaxrpc.jbws718; - - -import javax.xml.rpc.ServiceException; - - -public interface TestService_Service extends javax.xml.rpc.Service -{ - - public org.jboss.test.ws.jaxrpc.jbws718.TestService_PortType getTestServicePort() throws ServiceException; - -} Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -93,8 +93,7 @@ public void testMSFTElementScan() throws Exception { System.out.println("FIXME: [JBWS-1313] Fix XOP tests in trunk"); - if (true) - return; + if (true) return; SchemaUtils utils = SchemaUtils.getInstance(); File f = new File("resources/jaxrpc/xop/schema.xsd"); Modified: trunk/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -231,7 +231,7 @@ File wsdlfix = new File(expPath); Element exp = DOMUtils.parse(wsdlfix.toURL().openStream()); File wsdlFile = new File(genpath); - assertNotNull("Generated WSDL File exists?", wsdlFile); + assertTrue("Generated WSDL File exists", wsdlFile.exists()); Element was = DOMUtils.parse(wsdlFile.toURL().openStream()); //assertEquals(exp,was); //Now that we have figured out that the wsdl files are well formed, Modified: trunk/src/test/java/org/jboss/test/ws/tools/assertions/Jaxrpc20AssertionsTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/assertions/Jaxrpc20AssertionsTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/tools/assertions/Jaxrpc20AssertionsTestCase.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -29,7 +29,6 @@ import org.jboss.test.ws.tools.sei.assertions.AssertReturnTypeExtendRemote; import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.JavaToWSDL; @@ -80,7 +79,7 @@ jwsdl.setServiceName(WSDLUtils.getInstance().getJustClassName(seiClass) + "Service"); try { - WSDLDefinitions wsdl = jwsdl.generate(loadClass(seiName)); + jwsdl.generate(loadClass(seiName)); fail("Test should have failed"); } catch (WSException is) @@ -108,7 +107,7 @@ jwsdl.setServiceName(WSDLUtils.getInstance().getJustClassName(seiClass) + "Service"); try { - WSDLDefinitions wsdl = jwsdl.generate(loadClass(seiName)); + jwsdl.generate(loadClass(seiName)); fail("Test should have failed"); } catch (IllegalArgumentException iae) Modified: trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -190,6 +190,7 @@ JaxrpcMappingValidator mv = new JaxrpcMappingValidator(); //assertTrue(mv.validate(fix,gen)); + System.out.println("FIXME: [JBWS-1291] Fix JaxrpcMappingValidator"); } /** Modified: trunk/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -58,8 +58,7 @@ checkWSDLToJava(config); } - // JBWS-719 - // Enable schema validation on wstools config + // [JBWS-719] Enable schema validation on wstools config public void testInvalidConfig() throws IOException, ClassNotFoundException { String[] args = new String[] { "-dest", "tools/globalconfig", "-config", "resources/tools/config/invalidConfig.xml" }; Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomArrays/CustomArrayJava2WSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomArrays/CustomArrayJava2WSDLTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomArrays/CustomArrayJava2WSDLTestCase.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -37,11 +37,6 @@ return base; } - public String getFixMe() - { - return null; - } - public String getWSDLName() { return base + "Service.wsdl"; Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Inheritance/InheritanceJava2WSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Inheritance/InheritanceJava2WSDLTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Inheritance/InheritanceJava2WSDLTestCase.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -38,11 +38,6 @@ return base; } - public String getFixMe() - { - return null; - } - public String getWSDLName() { return base + "Service.wsdl"; Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -64,7 +64,6 @@ String[] args = new String[] { "-dest", out_dir, "-config", configloc }; WSTools tools = new WSTools(); tools.generate(args); - semanticallyValidateWSDL(wsdlFix, out_dir + "/wsdl/" + getWSDLName()); } } Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -37,13 +37,12 @@ { return base; } - - @Override + protected String getFixMe() { - return null; + return "FIXME: [JBWS-1394] Fix OneWayJava2WSDLTestCase in trunk"; } - + public String getWSDLName() { return base + "Service.wsdl"; Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/PublicPrivate/PublicPrivateJava2WSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/PublicPrivate/PublicPrivateJava2WSDLTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/PublicPrivate/PublicPrivateJava2WSDLTestCase.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -39,11 +39,6 @@ return base; } - public String getFixMe() - { - return null; - } - public String getWSDLName() { return base + "Service.wsdl"; Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/StandardArrays/StandardArraysJava2WSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/StandardArrays/StandardArraysJava2WSDLTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/StandardArrays/StandardArraysJava2WSDLTestCase.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -38,11 +38,6 @@ return base; } - public String getFixMe() - { - return null; - } - public String getWSDLName() { return base + "Service.wsdl"; Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/StandardHolders/StandardHoldersJava2WSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/StandardHolders/StandardHoldersJava2WSDLTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/StandardHolders/StandardHoldersJava2WSDLTestCase.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -38,11 +38,6 @@ return base; } - public String getFixMe() - { - return null; - } - public String getWSDLName() { return base + "Service.wsdl"; Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/UserException/UserExceptionJava2WSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/UserException/UserExceptionJava2WSDLTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/UserException/UserExceptionJava2WSDLTestCase.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -38,11 +38,6 @@ return base; } - public String getFixMe() - { - return null; - } - public String getWSDLName() { return base + "Service.wsdl"; Deleted: trunk/src/test/resources/jaxrpc/jbws718/WEB-INF/jaxrpc-mapping.xml =================================================================== --- trunk/src/test/resources/jaxrpc/jbws718/WEB-INF/jaxrpc-mapping.xml 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/resources/jaxrpc/jbws718/WEB-INF/jaxrpc-mapping.xml 2006-11-21 12:38:04 UTC (rev 1488) @@ -1,51 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.jbws718</package-type> - <namespaceURI>http://jboss.org/test/ws/jbws718</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws718.PingMsg</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/jbws718'>typeNS:>PingMsg</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>message</java-variable-name> - <xml-element-name>message</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws718.PingMsgResponse</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/jbws718'>typeNS:>PingMsgResponse</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws718.TestService_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://jboss.org/test/ws/jbws718'>serviceNS:TestService</wsdl-service-name> - <port-mapping> - <port-name>TestServicePort</port-name> - <java-port-name>TestServicePort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws718.TestService_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://jboss.org/test/ws/jbws718'>portTypeNS:TestService</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://jboss.org/test/ws/jbws718'>bindingNS:TestServiceBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>ping</java-method-name> - <wsdl-operation>ping</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.jbws718.PingMsg</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/jbws718'>wsdlMsgNS:PingIn</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.jbws718.PingMsgResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/jbws718'>wsdlMsgNS:PingOut</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Deleted: trunk/src/test/resources/jaxrpc/jbws718/WEB-INF/webservices.xml =================================================================== --- trunk/src/test/resources/jaxrpc/jbws718/WEB-INF/webservices.xml 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/resources/jaxrpc/jbws718/WEB-INF/webservices.xml 2006-11-21 12:38:04 UTC (rev 1488) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<webservices xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:impl="http://jboss.org/test/ws/jbws718" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" - version="1.1"> - - <webservice-description> - <webservice-description-name>TestService</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestServicePort</port-component-name> - <wsdl-port>impl:TestServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws718.TestService_PortType</service-endpoint-interface> - <service-impl-bean> - <servlet-link>TestService</servlet-link> - </service-impl-bean> - </port-component> - </webservice-description> -</webservices> Modified: trunk/src/test/resources/jaxrpc/jbws718/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxrpc/jbws718/wstools-config.xml 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/resources/jaxrpc/jbws718/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) @@ -9,8 +9,12 @@ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <wsdl-java file="WEB-INF/wsdl/TestService.wsdl"> + <global> + <package-namespace package="org.jboss.test.ws.jaxrpc.jbws718" namespace="http://jboss.org/test/ws/jbws718"/> + </global> + <wsdl-java file="resources/jaxrpc/jbws718/WEB-INF/wsdl/TestService.wsdl"> <mapping file="jaxrpc-mapping.xml" /> + <webservices servlet-link="TestService" /> </wsdl-java> </configuration> Modified: trunk/src/test/resources/jaxrpc/jbws807/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxrpc/jbws807/wstools-config.xml 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/resources/jaxrpc/jbws807/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) @@ -9,6 +9,9 @@ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + <global> + <package-namespace package="org.jboss.test.ws.jaxrpc.jbws807" namespace="http://jboss.org/test/ws/jbws807"/> + </global> <wsdl-java file="WEB-INF/wsdl/TestService.wsdl"> <mapping file="jaxrpc-mapping.xml" /> </wsdl-java> Modified: trunk/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolders/CustomHoldersConfig.xml =================================================================== --- trunk/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolders/CustomHoldersConfig.xml 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolders/CustomHoldersConfig.xml 2006-11-21 12:38:04 UTC (rev 1488) @@ -1,12 +1,7 @@ -<configuration xmlns="http://www.jboss.org/jbossws-tools" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <java-wsdl> - <service name="CustomHoldersService" - endpoint="org.jboss.test.ws.tools.jbws_211.sei.CustomHolders.CustomHoldersSEI" - style="rpc" - /> - <namespaces target-namespace="http://org.jboss.ws" - type-namespace="http://org.jboss.ws/types"/> - </java-wsdl> +<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + <java-wsdl> + <service name="CustomHoldersService" endpoint="org.jboss.test.ws.tools.jbws_211.sei.CustomHolders.CustomHoldersSEI" style="rpc"/> + <namespaces target-namespace="http://org.jboss.ws" type-namespace="http://org.jboss.ws/types"/> + </java-wsdl> </configuration> Modified: trunk/src/test/resources/tools/jbws-211/jbosswsConfig/OneWay/OneWayConfig.xml =================================================================== --- trunk/src/test/resources/tools/jbws-211/jbosswsConfig/OneWay/OneWayConfig.xml 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/resources/tools/jbws-211/jbosswsConfig/OneWay/OneWayConfig.xml 2006-11-21 12:38:04 UTC (rev 1488) @@ -1,15 +1,9 @@ -<configuration xmlns="http://www.jboss.org/jbossws-tools" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <java-wsdl> - <service name="OneWayService" - endpoint="org.jboss.test.ws.tools.jbws_211.sei.OneWay.TestOneWaySEI" - style="rpc"> - <operation name="oneWayOperation" one-way="true"> - <parameter type="java.lang.String"/> - </operation> - </service> - <namespaces target-namespace="http://org.jboss.ws" - type-namespace="http://org.jboss.ws/types"/> - </java-wsdl> +<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + <java-wsdl> + <service name="OneWayService" endpoint="org.jboss.test.ws.tools.jbws_211.sei.OneWay.TestOneWaySEI" style="rpc"> + <operation name="oneWayOperation" one-way="true"/> + </service> + <namespaces target-namespace="http://org.jboss.ws" type-namespace="http://org.jboss.ws/types"/> + </java-wsdl> </configuration>

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r1487 - in trunk/src: main/java/org/jboss/ws/metadata/wsdl/xmlschema main/java/org/jboss/ws/utils test/java/org/jboss/test/ws/common/utils test/java/org/jboss/test/ws/jaxrpc test/java/org/jboss/test/ws/jaxrpc/jbws958 test/resources/jaxrpc test/resources/jaxrpc/jbws958 test/resources/jaxrpc/jbws958/WEB-INF test/resources/jaxrpc/jbws958/WEB-INF/wsdl

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-11-21 06:34:09 -0500 (Tue, 21 Nov 2006) New Revision: 1487 Added: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws958/ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws958/JBWS958TestCase.java trunk/src/test/resources/jaxrpc/jbws958/ trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/ trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/ trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/Abstract.wsdl trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/IPLSProvisioning.wsdl trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/componenttypes.xsd trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/core.xsd trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/damona.xsd trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/provisioningtypes.xsd trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/sapR3.xsd trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/servicedefinitions.xsd trunk/src/test/resources/jaxrpc/jbws958/wstools-config.xml Removed: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws958/JBWS958TestCase.java trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/ trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/ trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/Abstract.wsdl trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/IPLSProvisioning.wsdl trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/componenttypes.xsd trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/core.xsd trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/damona.xsd trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/provisioningtypes.xsd trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/sapR3.xsd trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/servicedefinitions.xsd trunk/src/test/resources/jaxrpc/jbws958/wstools-config.xml Modified: trunk/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java trunk/src/main/java/org/jboss/ws/utils/DOMWriter.java trunk/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java Log: [JBWS-958] XML entity usage in wsdl contained schema Modified: trunk/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java 2006-11-21 11:25:49 UTC (rev 1486) +++ trunk/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java 2006-11-21 11:34:09 UTC (rev 1487) @@ -48,6 +48,7 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; +import org.jboss.ws.utils.DOMWriter; import org.jboss.xb.binding.NamespaceRegistry; /** @@ -569,7 +570,10 @@ buf.append("<restriction base='" + baseType + "'>"); StringList list = ((XSSimpleTypeDefinition)xstype).getLexicalEnumeration(); for (int i = 0; i < list.getLength(); i++) - buf.append("<enumeration value='" + list.item(i) +"'/>"); + { + String listItem = DOMWriter.normalize(list.item(i), false); + buf.append("<enumeration value='" + listItem +"'/>"); + } buf.append("</restriction>"); } buf.append("</simpleType>"); Modified: trunk/src/main/java/org/jboss/ws/utils/DOMWriter.java =================================================================== --- trunk/src/main/java/org/jboss/ws/utils/DOMWriter.java 2006-11-21 11:25:49 UTC (rev 1486) +++ trunk/src/main/java/org/jboss/ws/utils/DOMWriter.java 2006-11-21 11:34:09 UTC (rev 1487) @@ -275,7 +275,7 @@ Attr attr = attrs[i]; String atPrefix = attr.getPrefix(); String atName = attr.getNodeName(); - String atValue = normalize(attr.getNodeValue()); + String atValue = normalize(attr.getNodeValue(), canonical); if (atPrefix != null && !atPrefix.equals("xmlns") && !atPrefix.equals("xml")) { @@ -362,7 +362,7 @@ { if (canonical) { - out.print(normalize(node.getNodeValue())); + out.print(normalize(node.getNodeValue(), canonical)); } else { @@ -376,7 +376,7 @@ // print text case Node.TEXT_NODE: { - String text = normalize(node.getNodeValue()); + String text = normalize(node.getNodeValue(), canonical); if (prettyprint == false || text.trim().length() > 0) out.print(text); break; @@ -516,7 +516,7 @@ } /** Normalizes the given string. */ - private String normalize(String s) + public static String normalize(String s, boolean canonical) { StringBuffer str = new StringBuffer(); Modified: trunk/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2006-11-21 11:25:49 UTC (rev 1486) +++ trunk/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) @@ -174,4 +174,21 @@ assertEquals(DOMUtils.parse(expEnv), DOMUtils.parse(wasEnv)); } + + public void testEntity() throws Exception + { + String expStr = + "<xsd:simpleType name='MailRelayConfiguration' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>" + + "<xsd:restriction base='xsd:string'>" + + "<xsd:enumeration value='Incoming & Outgoing'/>" + + "<xsd:enumeration value='None'/>" + + "</xsd:restriction>" + + "</xsd:simpleType>"; + + + Element domEl = DOMUtils.parse(expStr); + String wasStr = DOMWriter.printNode(domEl, false); + + assertEquals(expStr, wasStr); + } } Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws958 (from rev 1189, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws958) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws958/JBWS958TestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws958/JBWS958TestCase.java 2006-10-10 15:53:21 UTC (rev 1189) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws958/JBWS958TestCase.java 2006-11-21 11:34:09 UTC (rev 1487) @@ -1,48 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.jbws958; - -import java.io.File; -import java.net.URL; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory; - -/** - * XML entity usage in wsdl contained schema - * - * http://jira.jboss.org/jira/browse/JBWS-958 - * - * @author Thomas.Diesler(a)jboss.org - * @since 10-Oct-2006 - */ -public class JBWS958TestCase extends JBossWSTest -{ - public void testWSDLReader() throws Exception - { - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - URL wsdlURL = new File("resources/jaxrpc/jbws958/WEB-INF/wsdl/IPLSProvisioning.wsdl").toURL(); - WSDLDefinitions wsdlDefs = factory.parse(wsdlURL); - assertNotNull(wsdlDefs); - } -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws958/JBWS958TestCase.java (from rev 1189, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws958/JBWS958TestCase.java) Copied: trunk/src/test/resources/jaxrpc/jbws958 (from rev 1189, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws958) Copied: trunk/src/test/resources/jaxrpc/jbws958/WEB-INF (from rev 1189, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws958/WEB-INF) Copied: trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl (from rev 1189, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl) Deleted: trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/Abstract.wsdl =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/Abstract.wsdl 2006-10-10 15:53:21 UTC (rev 1189) +++ trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/Abstract.wsdl 2006-11-21 11:34:09 UTC (rev 1487) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - -<definitions - xmlns:rotns="http://www.t-systems.com/damona" - xmlns:tns="http://services.iplsprovisioning.tsi.com" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - targetNamespace="http://services.iplsprovisioning.tsi.com"> - - <types> - <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.t-systems.com/damona"> - <import schemaLocation="damona.xsd" namespace="http://www.t-systems.com/damona"/> - </schema> - </types> - - <message name="Message"> - <part name="message" element="rotns:DAMONA_INFO"/> - </message> - - <message name="ReturnMessage"> - <part name="result" element="rotns:DAMONA_INFO"/> - </message> - - <portType name="IServiceActivationRemote"> - <operation name="processMessage"> - <input message="tns:Message"/> - <output message="tns:ReturnMessage"/> - </operation> - </portType> -</definitions> Copied: trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/Abstract.wsdl (from rev 1189, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/Abstract.wsdl) Deleted: trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/IPLSProvisioning.wsdl =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/IPLSProvisioning.wsdl 2006-10-10 15:53:21 UTC (rev 1189) +++ trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/IPLSProvisioning.wsdl 2006-11-21 11:34:09 UTC (rev 1487) @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - -<definitions - xmlns:tns="http://services.iplsprovisioning.tsi.com" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - targetNamespace="http://services.iplsprovisioning.tsi.com"> - - <import namespace="http://services.iplsprovisioning.tsi.com" location="Abstract.wsdl"/> - - <binding name="ServiceActivationBinding" type="tns:IServiceActivationRemote"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <operation name="processMessage"> - <soap:operation soapAction=""/> - <input><soap:body use="literal"/></input> - <output><soap:body use="literal"/></output> - </operation> - </binding> - - <service name="IPLSProvisioning"> - <port name="ServiceActivationPort" binding="tns:ServiceActivationBinding"> - <soap:address location="http://localhost:8080/IPLSProvisioningEJB/sa"/> - </port> - </service> -</definitions> Copied: trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/IPLSProvisioning.wsdl (from rev 1189, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/IPLSProvisioning.wsdl) Deleted: trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/componenttypes.xsd =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/componenttypes.xsd 2006-10-10 15:53:21 UTC (rev 1189) +++ trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/componenttypes.xsd 2006-11-21 11:34:09 UTC (rev 1487) @@ -1,341 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<xsd:schema xmlns="http://www.t-systems.com/damona" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified" attributeFormDefault="unqualified" version="2.8.0"> - <xsd:simpleType name="ModemEquipmentType"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Rack"/> - <xsd:enumeration value="Table"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="AccessSpeedBU"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="BRA"/> - <xsd:enumeration value="PRA"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="AccessSpeedDsl"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="608kbps/160kbps"/> - <xsd:enumeration value="640kbps/256kbps"/> - <xsd:enumeration value="768kbps/128kbps"/> - <xsd:enumeration value="1024kbps/192kbps"/> - <xsd:enumeration value="1024kbps/512kbps"/> - <xsd:enumeration value="1200kbps/320kbps"/> - <xsd:enumeration value="1280kbps/512kbps"/> - <xsd:enumeration value="1536kbps/192kbps"/> - <xsd:enumeration value="2048kbps/320kbps"/> - <xsd:enumeration value="2048kbps/512kbps"/> - <xsd:enumeration value="3072kbps/320kbps"/> - <xsd:enumeration value="4096kbps/508kbps"/> - <xsd:enumeration value="128 kbps"/> - <xsd:enumeration value="256 kbps"/> - <xsd:enumeration value="384 kbps"/> - <xsd:enumeration value="512 kbps"/> - <xsd:enumeration value="565 kbps"/> - <xsd:enumeration value="1024 kbps"/> - <xsd:enumeration value="1130 kbps"/> - <xsd:enumeration value="1536 kbps"/> - <xsd:enumeration value="1582 kbps"/> - <xsd:enumeration value="2033 kbps"/> - <xsd:enumeration value="2048 kbps"/> - <xsd:enumeration value="4096 kbps"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="AccessTypeBU"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="ISDN"/> - <xsd:enumeration value="DSL"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="AddInhouseWiring"> - <xsd:annotation> - <xsd:documentation>only DSL France</xsd:documentation> - </xsd:annotation> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="No"/> - <xsd:enumeration value="Flat"/> - <xsd:enumeration value="Individual"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="AtmConnectionType"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Point to Point Symmetrical"/> - <xsd:enumeration value="Point to Point Asymmetrical"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="AtmVirtualConnection"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Virtuell Path Connection"/> - <xsd:enumeration value="Virtuell Channel Connection"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="BackupKind"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="DIC"/> - <xsd:enumeration value="DAC"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="CeName"> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="([a-z]{2}-[a-z0-9]{3}-[a-z0-9]{1,5}-(ce|mr|vg)-(0[1-9]|[1-9][0-9]))|(fwc-[1|2][a-z0-9]{3}|(s|i|v)gw-[a-z]{2}-[a-z]{3}-[0-9]{2}[a-z0-9]{3})"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="CpeType"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Primary"/> - <xsd:enumeration value="Secondary"/> - <xsd:enumeration value="RdiRouter"/> - <xsd:enumeration value="Primary VG"/> - <xsd:enumeration value="Secondary VG"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SwUri"> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="(cpc|cma)-[1|2][a-z0-9]{3}"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="CircuitAccessType"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Kupfer / elektrisch"/> - <xsd:enumeration value="Glasfaser / optisch"/> - <xsd:enumeration value="DSL"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="CircuitAccessSpeed"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="64 Kbit/s"/> - <xsd:enumeration value="128 Kbit/s"/> - <xsd:enumeration value="192 Kbit/s"/> - <xsd:enumeration value="256 Kbit/s"/> - <xsd:enumeration value="384 Kbit/s"/> - <xsd:enumeration value="512 Kbit/s"/> - <xsd:enumeration value="768 Kbit/s"/> - <xsd:enumeration value="1024 Kbit/s"/> - <xsd:enumeration value="1920 Kbit/s"/> - <xsd:enumeration value="1984 Kbit/s"/> - <xsd:enumeration value="E1 = 2 Mbit/s"/> - <xsd:enumeration value="T1 = 1,5 Mbit/s"/> - <xsd:enumeration value="E3 = 34 Mbit/s"/> - <xsd:enumeration value="DS3 = 45 Mbit/s"/> - <xsd:enumeration value="STM-1 = 155 Mbit/s"/> - <xsd:enumeration value="OC-3 = 155 Mbit/s"/> - <xsd:enumeration value="STM-4 = 622 Mbit/s"/> - <xsd:enumeration value="STM-16 = 2,5 Gbit/s"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="CircuitInterface_OF_15"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="X.21"/> - <xsd:enumeration value="JTG703-a"/> - <xsd:enumeration value="V.35"/> - <xsd:enumeration value="V.36"/> - <xsd:enumeration value="G.703/704 elekt.120 Ohm balanc"/> - <xsd:enumeration value="G.703 elektr.75 Ohm unbalanced"/> - <xsd:enumeration value="G.703 elektr.120 Ohm balanced"/> - <xsd:enumeration value="G.703 elekt.75 Ohm unbalanced"/> - <xsd:enumeration value="G.957/707 single-mode optikal"/> - <xsd:enumeration value="G.957/707 1300nm sm optisch"/> - <xsd:enumeration value="G.957/G.707 optisch"/> - <xsd:enumeration value="electrikal 75 Ohm unbalanced"/> - <xsd:enumeration value="elekt. 75 Ohm unbal.(4x STM-1)"/> - <xsd:enumeration value="Optikal, (1x STM-4c)"/> - <xsd:enumeration value="I.430"/> - <xsd:enumeration value="G.703/G.704"/> - <xsd:enumeration value="G.703/G.704, unstructured"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="CircuitInterface"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="X.21"/> - <xsd:enumeration value="JTG703-a"/> - <xsd:enumeration value="V.35"/> - <xsd:enumeration value="V.36"/> - <xsd:enumeration value="G.703/704 elekt.120 Ohm balanc"/> - <xsd:enumeration value="G.703 elektr.75 Ohm unbalanced"/> - <xsd:enumeration value="G.703 elektr.120 Ohm balanced"/> - <xsd:enumeration value="G.703 elekt.75 Ohm unbalanced"/> - <xsd:enumeration value="G.957/707 single-mode optikal"/> - <xsd:enumeration value="G.957/707 1300nm sm optisch"/> - <xsd:enumeration value="G.957/G.707 optisch"/> - <xsd:enumeration value="electrikal 75 Ohm unbalanced"/> - <xsd:enumeration value="elekt. 75 Ohm unbal.(4x STM-1)"/> - <xsd:enumeration value="Optikal, (1x STM-4c)"/> - <xsd:enumeration value="I.430"/> - <xsd:enumeration value="G.703/G.704"/> - <xsd:enumeration value="G.703/G.704, unstructured"/> - <xsd:enumeration value="G.703/704 elect.120 Ohm balanc"/> - <xsd:enumeration value="G.703 electr.75 Ohm unbalanced"/> - <xsd:enumeration value="G.703 electr.120 Ohm balanced"/> - <xsd:enumeration value="G.703 elect.75 Ohm unbalanced"/> - <xsd:enumeration value="G.957/707 single-mode optical"/> - <xsd:enumeration value="G.957/707 1300nm sm optical"/> - <xsd:enumeration value="G.957/G.707 optical"/> - <xsd:enumeration value="electrical 75 Ohm unbalanced"/> - <xsd:enumeration value="elect. 75 Ohm unbal.(4x STM-1)"/> - <xsd:enumeration value="Optical, (1x STM-4c)"/> - <xsd:enumeration value="UR2"/> - <xsd:enumeration value="G.SHDSL"/> - <xsd:enumeration value="10BaseT"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="CircuitPlugtype_OF_15"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="RJ 48C oder RJ-45F"/> - <xsd:enumeration value="RJ-45"/> - <xsd:enumeration value="DB 9"/> - <xsd:enumeration value="DB15"/> - <xsd:enumeration value="34 pin Winch. (ISO2593)"/> - <xsd:enumeration value="WRAP"/> - <xsd:enumeration value="LSA"/> - <xsd:enumeration value="BNC 1,6/5,6 coax (female)"/> - <xsd:enumeration value="BNC 1,6/5,6 coax (male)"/> - <xsd:enumeration value="BNC Micro-Coax ST212"/> - <xsd:enumeration value="BNC UK-standard (female)"/> - <xsd:enumeration value="SC/PC"/> - <xsd:enumeration value="FC/PC"/> - <xsd:enumeration value="F04 fiber connector"/> - <xsd:enumeration value="Verschiedene opt. Stecker"/> - <xsd:enumeration value="DB15 (ISO 4903 15-pin female)"/> - <xsd:enumeration value="JIS X5102 (15 pin)"/> - <xsd:enumeration value="34 pin Winch. female (ISO2593)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="CircuitPlugtype"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="RJ 48C oder RJ-45F"/> - <xsd:enumeration value="RJ-45"/> - <xsd:enumeration value="DB 9"/> - <xsd:enumeration value="DB15"/> - <xsd:enumeration value="34 pin Winch. (ISO2593)"/> - <xsd:enumeration value="WRAP"/> - <xsd:enumeration value="LSA"/> - <xsd:enumeration value="BNC 1,6/5,6 coax (female)"/> - <xsd:enumeration value="BNC 1,6/5,6 coax (male)"/> - <xsd:enumeration value="BNC Micro-Coax ST212"/> - <xsd:enumeration value="BNC UK-standard (female)"/> - <xsd:enumeration value="SC/PC"/> - <xsd:enumeration value="FC/PC"/> - <xsd:enumeration value="F04 fiber connector"/> - <xsd:enumeration value="Verschiedene opt. Stecker"/> - <xsd:enumeration value="DB15 (ISO 4903 15-pin female)"/> - <xsd:enumeration value="JIS X5102 (15 pin)"/> - <xsd:enumeration value="34 pin Winch. female (ISO2593)"/> - <xsd:enumeration value="RJ 45"/> - <xsd:enumeration value="BNC 1,6/ 5,6 Male"/> - <xsd:enumeration value="BNC, 1,6/ 5,6 Female"/> - <xsd:enumeration value="Varous opt. Connectors"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="PvcTrafficClass"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="UBR"/> - <xsd:enumeration value="rt-VBR"/> - <xsd:enumeration value="nrt-VBR"/> - <xsd:enumeration value="VBR.1"/> - <xsd:enumeration value="VBR-Plus"/> - <xsd:enumeration value="CBR"/> - <xsd:enumeration value="L2TP"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="ItuOssNo"> - <xsd:restriction base="xsd:string"/> - </xsd:simpleType> - <xsd:simpleType name="LanEthernet"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="auto"/> - <xsd:enumeration value="GE-fdx"/> - <xsd:enumeration value="GE-hdx"/> - <xsd:enumeration value="1000-fdx"/> - <xsd:enumeration value="1000-hdx"/> - <xsd:enumeration value="100-fdx"/> - <xsd:enumeration value="100-hdx"/> - <xsd:enumeration value="10-fdx"/> - <xsd:enumeration value="10-hdx"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="LinkType"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="LLMC"/> - <xsd:enumeration value="DDV"/> - <xsd:enumeration value="SFV"/> - <xsd:enumeration value="CFV"/> - <xsd:enumeration value="ATM-PVC"/> - <xsd:enumeration value="DSL-ASL"/> - <xsd:enumeration value="ACCESS-MODUL"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="Lsz"> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="[A-Za-z0-9:]{3,5}"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="MepType"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Nein"/> - <xsd:enumeration value="MEP (Alternative End B)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="PeName"> - <xsd:annotation> - <xsd:documentation> -Type: String -Format: aaa-bbxx-yyyyy-zzzz -Values / Range: aaa: IATA 3-letter abbreviation code for the location - bb: 1 or 2-letter Devicecode: - E - Edge or Edge/Switch, ISDN Backup,Internet Gateway etc. - MR - Out-of-Band Management Router - MS - Local Switch - RR - Route-Reflector - SA - Label Switch Router Side A in a Class 1 PoP - SB - Label Switch Router Side B in a Class 1 PoP - xx: 2-digit running suffix to uniquely identify each device, starting with 20 -Example: NYC-E20 -</xsd:documentation> - </xsd:annotation> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="[a-zA-Z]{3}-(E|MA|MR|MS|RR|SA|SB|SC|SD)[2-9][0-9]"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="PowerCord"> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="CAB-[1-9A-Z]{2,15}"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SlaInfo"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Comfort"/> - <xsd:enumeration value="Compact"/> - <xsd:enumeration value="Complete"/> - <xsd:enumeration value="Standard"/> - <xsd:enumeration value="Entry"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SubInterface"> - <xsd:restriction base="xsd:integer"/> - </xsd:simpleType> - <xsd:simpleType name="Timeslot"> - <xsd:annotation> - <xsd:documentation>options: - 1: "unframed" - 2: contiguous slots: "x-y" - 3: none-contignous slots: "o,p,u-w" </xsd:documentation> - </xsd:annotation> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="unframed|[0-9\-,]{1,20}"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="WanInterfaceType"> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="[0-9]/[0-9]"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="XDslType"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="ADSL"/> - <xsd:enumeration value="HDSL"/> - <xsd:enumeration value="SDSL"/> - <xsd:enumeration value="G HDSL"/> - </xsd:restriction> - </xsd:simpleType> -</xsd:schema> Copied: trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/componenttypes.xsd (from rev 1189, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/componenttypes.xsd) Deleted: trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/core.xsd =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/core.xsd 2006-10-10 15:53:21 UTC (rev 1189) +++ trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/core.xsd 2006-11-21 11:34:09 UTC (rev 1487) @@ -1,221 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<xsd:schema targetNamespace="http://www.t-systems.com/core" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.t-systems.com/core" elementFormDefault="unqualified" attributeFormDefault="unqualified" version="2.8.0"> - <xsd:complexType name="Address"> - <xsd:sequence> - <xsd:element name="COUNTRY_CODE" type="CountryCode"/> - <xsd:element name="REGION_CODE" type="RegionCode"/> - <xsd:element name="POST_CODE" type="PostCode"/> - <xsd:element name="CITY" type="xsd:string"/> - <xsd:element name="STREET" type="xsd:string"/> - <xsd:element name="STREET_NO" type="xsd:string"/> - <xsd:element name="TIME_ZONE" type="TimeZone" default="UTC+1"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="AlienOnkzBsz"> - <xsd:sequence> - <xsd:element name="BSZ" type="xsd:string"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="CommunicationData"> - <xsd:sequence> - <xsd:element name="PHONE" type="xsd:string"/> - <xsd:element name="MOBILE" type="xsd:string"/> - <xsd:element name="FAX" type="xsd:string"/> - <xsd:element name="EMAIL" type="xsd:string"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="Customer"> - <xsd:complexContent> - <xsd:extension base="Organisation"> - <xsd:sequence> - <xsd:element name="URI" type="xsd:string"/> - </xsd:sequence> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - <xsd:complexType name="DateAndTime"> - <xsd:sequence> - <xsd:element name="DATE" type="xsd:date" nillable="true"/> - <xsd:element name="TIME" type="xsd:time" nillable="true"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="Error"> - <xsd:sequence> - <xsd:element name="ERROR_ID" type="ErrorId"/> - <xsd:element name="ERROR_MESSAGE" type="xsd:string"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="ExtendedLocation"> - <xsd:complexContent> - <xsd:extension base="Location"> - <xsd:sequence> - <xsd:element name="BUILDING" type="xsd:string"/> - <xsd:element name="FLOOR" type="xsd:string"/> - <xsd:element name="ROOM" type="xsd:string"/> - </xsd:sequence> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - <xsd:complexType name="File"> - <xsd:sequence> - <xsd:element name="FILE_NAME" type="NonEmptyString"/> - <xsd:element name="FILE_CONTENT" type="xsd:string"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="IpAddressRange2"> - <xsd:sequence> - <xsd:element name="IP_ADDRESS_START" type="IpAddress"/> - <xsd:element name="IP_ADDRESS_END" type="IpAddress"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="Location"> - <xsd:sequence> - <xsd:element name="NAME" type="xsd:string"/> - <xsd:element name="ADDRESS" type="Address"/> - <xsd:element name="SITE_ID" type="SiteID" nillable="true"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="Organisation"> - <xsd:sequence> - <xsd:element name="NAME1" type="NonEmptyString"/> - <xsd:element name="NAME2" type="xsd:string"/> - <xsd:element name="ADDRESS" type="Address"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="Person"> - <xsd:sequence> - <xsd:element name="LASTNAME" type="NonEmptyString"/> - <xsd:element name="FIRSTNAME" type="xsd:string"/> - <xsd:element name="SALUTATION" type="xsd:string"/> - <xsd:element name="TITLE" type="xsd:string"/> - <xsd:element name="GENDER" type="Gender" nillable="true"/> - <xsd:element name="ADDRESS" type="Address" nillable="true"/> - <xsd:element name="COMMUNICATION_DATA" type="CommunicationData" nillable="true"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="OnkzBsz"> - <xsd:all> - <xsd:element name="DOMESTIC" type="OwnOnkzBsz" minOccurs="0"/> - <xsd:element name="ABROAD" type="AlienOnkzBsz" minOccurs="0"/> - </xsd:all> - </xsd:complexType> - <xsd:complexType name="OwnOnkzBsz"> - <xsd:sequence> - <xsd:element name="ONKZ" type="xsd:string"/> - <xsd:element name="ASB" type="xsd:string"/> - </xsd:sequence> - </xsd:complexType> - <xsd:simpleType name="CountryCode"> - <xsd:restriction base="xsd:string"> - <xsd:minLength value="2"/> - <xsd:maxLength value="3"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="Datum"> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="20[0-9]{2}-[0-1][0-9]-[0-3][0-9]"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="EMailAddress"> - <xsd:restriction base="xsd:string"> - <xsd:minLength value="1"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="ErrorId"> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="[0-9]{1,4}"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="Gender"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="female"/> - <xsd:enumeration value="male"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="IpAddress"> - <xsd:annotation> - <xsd:documentation> - IP-Address can be of IPv4 or IPv6. - Three types of typing are allowed. - 1. d.d.d.d (IPv4) - 2. x:x:x:x:x:x:x:x (IPv6) - 3. x:x:x:x:x:x:d.d.d.d (Combination of IPv4 and IPv6) - Where - x 0...FFFF - d 0...255 - </xsd:documentation> - </xsd:annotation> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="[0-9A-F\.:]{7,45}"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="IpAddressRange"> - <xsd:annotation> - <xsd:documentation>IP-Address Range can be of IPv4, IPv6</xsd:documentation> - </xsd:annotation> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="[0-9A-F\.:\-,/]{7,100}"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="NonEmptyString"> - <xsd:restriction base="xsd:string"> - <xsd:minLength value="1"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="PostCode"> - <xsd:restriction base="xsd:string"> - <xsd:minLength value="1"/> - <xsd:maxLength value="10"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="RegionCode"> - <xsd:restriction base="xsd:string"> - <xsd:minLength value="0"/> - <xsd:maxLength value="3"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SiteID"> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="[0-9A-Z]{6}"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="TimeZone"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="UTC-12"/> - <xsd:enumeration value="UTC-11"/> - <xsd:enumeration value="UTC-10"/> - <xsd:enumeration value="UTC-9"/> - <xsd:enumeration value="UTC-8"/> - <xsd:enumeration value="UTC-7"/> - <xsd:enumeration value="UTC-6"/> - <xsd:enumeration value="UTC-5"/> - <xsd:enumeration value="UTC-4"/> - <xsd:enumeration value="UTC-3"/> - <xsd:enumeration value="UTC-2"/> - <xsd:enumeration value="UTC-1"/> - <xsd:enumeration value="UTC"/> - <xsd:enumeration value="UTC+1"/> - <xsd:enumeration value="UTC+2"/> - <xsd:enumeration value="UTC+3"/> - <xsd:enumeration value="UTC+4"/> - <xsd:enumeration value="UTC+5"/> - <xsd:enumeration value="UTC+6"/> - <xsd:enumeration value="UTC+7"/> - <xsd:enumeration value="UTC+8"/> - <xsd:enumeration value="UTC+9"/> - <xsd:enumeration value="UTC+10"/> - <xsd:enumeration value="UTC+11"/> - <xsd:enumeration value="UTC+12"/> - <xsd:enumeration value="UTC+13"/> - <xsd:enumeration value="UTC+14"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="YesNo"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="yes"/> - <xsd:enumeration value="no"/> - </xsd:restriction> - </xsd:simpleType> -</xsd:schema> Copied: trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/core.xsd (from rev 1189, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/core.xsd) Deleted: trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/damona.xsd =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/damona.xsd 2006-10-10 15:53:21 UTC (rev 1189) +++ trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/damona.xsd 2006-11-21 11:34:09 UTC (rev 1487) @@ -1,403 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<xsd:schema targetNamespace="http://www.t-systems.com/damona" xmlns="http://www.t-systems.com/damona" xmlns:core="http://www.t-systems.com/core" xmlns:sapR3="http://www.t-systems.com/sapR3" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified" attributeFormDefault="unqualified" version="2.9.12"> - <xsd:import namespace="http://www.t-systems.com/core" schemaLocation="core.xsd"/> - <xsd:import namespace="http://www.t-systems.com/sapR3" schemaLocation="sapR3.xsd"/> - <xsd:include schemaLocation="servicedefinitions.xsd"/> - <xsd:include schemaLocation="provisioningtypes.xsd"/> - <xsd:include schemaLocation="componenttypes.xsd"/> - <xsd:element name="DAMONA_INFO"> - <xsd:complexType> - <xsd:all> - <xsd:element name="CONFIGURATION_MESSAGE" type="ConfigurationMessage" minOccurs="0"/> - <xsd:element name="CONFIG_USER_MESSAGE" type="ConfigUserMessage" minOccurs="0"/> - <xsd:element name="RETURN_CONFIGURATION_MESSAGE" type="ReturnConfigurationMessage" minOccurs="0"/> - <xsd:element name="RETURN_CONFIG_USER_MESSAGE" type="ReturnConfigUserMessage" minOccurs="0"/> - <xsd:element name="SAP_CANCELLATION_MESSAGE" type="SapCancellationMessage" minOccurs="0"/> - <xsd:element name="RETURN_SAP_CANCELLATION_MESSAGE" type="ReturnSapCancellationMsg" minOccurs="0"/> - <xsd:element name="BU_CANCELLATION_MESSAGE" type="BackupCancellationMessage" minOccurs="0"/> - <xsd:element name="RETURN_BU_CANCELLATION_MESSAGE" type="ReturnBackupCancellationMsg" minOccurs="0"/> - <xsd:element name="GET_DSL_ACCOUNT_MESSAGE" type="GetDslAccountMessage" minOccurs="0"/> - <xsd:element name="PUT_DSL_ACCOUNT_MESSAGE" type="PutDslAccountMessage" minOccurs="0"/> - <xsd:element name="RETURN_ESA_EVENT_MESSAGE" type="ReturnEsaEventMessage" minOccurs="0"/> - <xsd:element name="SET_ACCOUNT_VALID_TO_MESSAGE" type="SetAccountValidToMessage" minOccurs="0"/> - <xsd:element name="RETURN_SET_VALID_TO_MESSAGE" type="ReturnSetValidToMessage" minOccurs="0"/> - <xsd:element name="GET_LIST_DSL_ACCOUNT_MESSAGE" type="GetListDslAccountMessage" minOccurs="0"/> - <xsd:element name="PUT_LIST_DSL_ACCOUNT_MESSAGE" type="PutListDslAccountMessage" minOccurs="0"/> - <xsd:element name="NEW_DSL_PROVIDER_REALM_MESSAGE" type="NewDslProviderRealmMessage" minOccurs="0"/> - <xsd:element name="RETURN_NEW_PROVIDER_REALM_MESSAGE" type="ReturnNewProviderRealmMessage" minOccurs="0"/> - <xsd:element name="SET_DISABLE_ACCOUNT_MESSAGE" type="SetDisableAccountMessage" minOccurs="0"/> - <xsd:element name="RETURN_SET_DISABLE_MESSAGE" type="ReturnSetDisableMessage" minOccurs="0"/> - </xsd:all> - </xsd:complexType> - </xsd:element> - <xsd:complexType name="Project"> - <xsd:sequence> - <xsd:element name="CUSTOMER" type="sapR3:Organisation"/> - <xsd:element name="CUSTOMER_CONTACT" type="core:Person" nillable="true"/> - <xsd:element name="TECHNICAL_NET_NAME" type="TechnicalNetName"/> - <xsd:element name="TDN_NO" type="TdnNo"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="ConfigUserMessage"> - <xsd:sequence> - <xsd:element name="STATUS" type="Status"/> - <xsd:element name="PROJECT" type="Project"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="ConfigurationMessage"> - <xsd:sequence> - <xsd:element name="SAP_INFO" type="SapInfo" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="SapInfo"> - <xsd:sequence> - <xsd:element name="SAP_ID" type="SapId"/> - <xsd:element name="CUSTOMER_IDENT" type="sapR3:Ident"/> - <xsd:element name="TECHNICAL_NET_NAME" type="TechnicalNetName"/> - - <xsd:element name="INTERNET_ACCESS_ATTRIBUTES" type="InternetAccessAttributes" minOccurs="0"/> - <xsd:element name="REMOTE_DIALIN_ROUTER_ATTRIBUTES" type="RemoteDialInRouterAttributes" minOccurs="0"/> - <xsd:element name="REMOTE_DIALIN_ATTRIBUTES" type="RemoteDialInAttributes" minOccurs="0"/> - <xsd:element name="ADDITIONAL_REALM_RDI" type="AdditionalRealmRdi" minOccurs="0"/> - <xsd:element name="VPN_CORE_ATTRIBUTES" type="VpnCoreAttributes" minOccurs="0"/> - <xsd:element name="CLIENT_ENCRYPTION_ATTRIBUTES" type="ClientEncryptionAttributes" minOccurs="0"/> - <xsd:element name="REMOTE_INTERNET_GW_ATTRIBUTES" type="RemoteInternetGWAttributes" minOccurs="0"/> - <xsd:element name="DEDICATED_FIREWALL_ATTRIBUTES" type="DedicatedFirewallAttributes" minOccurs="0"/> - <xsd:element name="VPN_CORE_DSL_L2TP_ATTRIBUTES" type="VpnCoreDslL2tpAttributes" minOccurs="0"/> - - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="VpnCoreAttributes"> - <xsd:sequence> - <xsd:element name="VRF_NO" type="VrfNo"/> - <xsd:element name="USER_NAME" type="xsd:string"/> - <xsd:element name="REALM_NAME" type="xsd:string"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="VpnCoreDslL2tpAttributes"> - <xsd:sequence> - <xsd:element name="VRF_NO" type="VrfNo"/> - <xsd:element name="ROUTER_NAME" type="CeName"/> - <xsd:element name="REALM_NAME" type="core:NonEmptyString"/> - <xsd:element name="LAN_INTERFACE" type="LanInterface" maxOccurs="unbounded"/> - <xsd:element name="CPE_LOOPBACK_IP" type="core:IpAddress"/> - <xsd:element name="WAN_IP_ADDRESS" type="core:IpAddress"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="LanInterface"> - <xsd:sequence> - <xsd:element name="CPE_LAN_IP_ADDRESS" type="core:IpAddress"/> - <xsd:element name="CPE_LAN_NETMASK" type="core:IpAddress"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="InternetAccessAttributes"> - <xsd:sequence> - <xsd:element name="VRF_NO" type="VrfNo"/> - <xsd:element name="IP_ADDRESS_RANGE" type="core:IpAddressRange" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element name="DNS_PRIMARY" type="core:IpAddress" nillable="true"/> - <xsd:element name="DNS_SECONDARY" type="core:IpAddress" nillable="true"/> - <xsd:element name="MAIL_SERVER_PRIMARY" type="core:IpAddress" nillable="true"/> - <xsd:element name="MAIL_SERVER_SECONDARY" type="core:IpAddress" nillable="true"/> - <xsd:element name="MAIL_RELAY_CONFIGURATION" type="MailRelayConfiguration"/> - <xsd:element name="MAIL_RELAY_TYPE" type="MailRelayType"/> - <xsd:element name="MAIL_DOMAIN" type="xsd:string"/> - <xsd:element name="DNS_TYPE" type="Dns"/> - <xsd:element name="NUMBER_OF_USERS" type="NumberOfUsersIAS" nillable="true"/> - <xsd:element name="CACHE_PROXY" type="CacheProxy"/> - <xsd:element name="CSA" type="core:YesNo"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="RemoteLinkAttributes"> - <xsd:sequence> - <xsd:element name="VRF_NO" type="VrfNo"/> - <xsd:element name="TSI_HOSTED_RADIUS_SERVER" type="core:YesNo"/> - <xsd:element name="RADIUS_SERVER_1" type="core:IpAddress" nillable="true"/> - <xsd:element name="RADIUS_SERVER_2" type="core:IpAddress" nillable="true"/> - <xsd:element name="RADIUS_REDUNDANCY" type="RadiusRedundancy" nillable="true"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="RemoteDialInRouterAttributes"> - <xsd:sequence> - <xsd:element name="VRF_NO" type="VrfNo"/> - <xsd:element name="REALM_NAME" type="core:NonEmptyString"/> - <xsd:element name="USER_NAME" type="xsd:string"/> - <xsd:element name="VPN_CONFIGURATION" type="VpnConfigurationRDR" nillable="true"/> - <xsd:element name="DIAL_OUT" type="core:YesNo"/> - <xsd:element name="IP_PRIMARY_LNS" type="core:IpAddress" nillable="true"/> - <xsd:element name="IP_SECONDARY_LNS" type="core:IpAddress" nillable="true"/> - <xsd:element name="ISDN_NUMBER" type="core:NonEmptyString" nillable="true"/> - <xsd:element name="LAN_IP_RANGE" type="core:IpAddressRange" nillable="true"/> - <xsd:element name="ROUTING_PROTOCOL" type="RipRDR" nillable="true"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="RemoteDialInAttributes"> - <xsd:complexContent> - <xsd:extension base="RemoteLinkAttributes"> - <xsd:sequence> - <xsd:element name="NO_OF_USERS" type="NumberOfUsersRDI"/> - <xsd:element name="REALM" type="RealmRDI" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - <xsd:complexType name="AdditionalRealmRdi"> - <xsd:sequence> - <xsd:element name="VRF_NO" type="VrfNo"/> - <xsd:element name="REALM" type="RealmRDI" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="RemoteInternetGWAttributes"> - <xsd:complexContent> - <xsd:extension base="RemoteLinkAttributes"> - <xsd:sequence> - <xsd:element name="POOL_IP_RANGE_EUROPE" type="core:IpAddressRange" nillable="true"/> - <xsd:element name="POOL_IP_RANGE_USA" type="core:IpAddressRange" nillable="true"/> - <xsd:element name="POOL_IP_RANGE_ASIA" type="core:IpAddressRange" nillable="true"/> - </xsd:sequence> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - <xsd:complexType name="ClientEncryptionAttributes"> - <xsd:sequence> - <xsd:element name="VRF_NO" type="VrfNo"/> - <xsd:element name="NO_OF_USERS" type="xsd:integer"/> - <xsd:element name="RADIUS_RIGW" type="RemoteLinkAttributes"/> - <xsd:element name="REALM" type="RealmCE" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="DedicatedFirewallAttributes"> - <xsd:sequence> - <xsd:element name="VRF_NO" type="VrfNo"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="RadiusParameters"> - <xsd:sequence> - <xsd:element name="FRAMED_PROTOCOL" type="xsd:string"/> - <xsd:element name="SERVICE_TYPE" type="xsd:string"/> - <xsd:element name="TUNNEL_CLIENT_AUTH_ID_1" type="xsd:string"/> - <xsd:element name="TUNNEL_CLIENT_AUTH_ID_1" type="xsd:string"/> - <xsd:element name="TUNNEL_PASSWORD_1" type="xsd:string"/> - <xsd:element name="TUNNEL_PASSWORD_2" type="xsd:string"/> - <xsd:element name="TUNNEL_SRV_ENDPOINT_1" type="xsd:string"/> - <xsd:element name="TUNNEL_SRV_ENDPOINT_2" type="xsd:string"/> - <xsd:element name="VRF_NAME" type="xsd:string"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="Realm"> - <xsd:sequence> - <xsd:element name="REALM_NAME" type="xsd:string"/> - <xsd:element name="IP_ADDRESS_ASSIGNING" type="IpAddressAssigning" nillable="true"/> - <xsd:element name="DNS_PRIMARY" type="core:IpAddress" nillable="true"/> - <xsd:element name="DNS_SECONDARY" type="core:IpAddress" nillable="true"/> - <xsd:element name="WINS_PRIMARY" type="core:IpAddress" nillable="true"/> - <xsd:element name="WINS_SECONDARY" type="core:IpAddress" nillable="true"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="RealmRDI"> - <xsd:complexContent> - <xsd:extension base="Realm"> - <xsd:sequence> - <xsd:element name="STRONG_AUTHENTICATION" type="StrongAuthenticationRDI"/> - <xsd:element name="TOLL_FREE_NUMBERS_ALLOWED" type="core:YesNo"/> - <xsd:element name="GPRS_UMTS_ALLOWED" type="core:YesNo"/> - <xsd:element name="WIFI_ALLOWED" type="core:YesNo"/> - <xsd:element name="IP_SEC" type="core:YesNo"/> - <xsd:element name="DIAL_ROUTER" type="core:YesNo"/> - <xsd:element name="POOL_IP_RANGE_EUROPE" type="core:IpAddressRange" nillable="true"/> - <xsd:element name="POOL_IP_RANGE_USA" type="core:IpAddressRange" nillable="true"/> - <xsd:element name="POOL_IP_RANGE_ASIA" type="core:IpAddressRange" nillable="true"/> - </xsd:sequence> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - <xsd:complexType name="RealmCE"> - <xsd:complexContent> - <xsd:extension base="Realm"> - <xsd:sequence> - <xsd:element name="GLOBAL_INTERNET_ACCESS_CONFIG" type="core:YesNo" nillable="true"/> - <xsd:element name="STRONG_AUTHENTICATION_CONFIG" type="StrongAuthenticationCE" nillable="true"/> - </xsd:sequence> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - <xsd:complexType name="ReturnProjectInfo"> - <xsd:sequence> - <xsd:element name="PROJECT" type="Project"/> - <xsd:element name="ERROR" type="core:Error"/> - <xsd:element name="ESA_PREFIX" type="core:NonEmptyString"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="ReturnConfigUserMessage"> - <xsd:sequence> - <xsd:element name="RETURN_PROJECT_INFO" type="ReturnProjectInfo" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="ReturnConfigurationMessage"> - <xsd:sequence> - <xsd:element name="RETURN_CONFIGURATION_INFO" type="ReturnConfigurationInfo" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="ReturnConfigurationInfo"> - <xsd:sequence> - <xsd:element name="SAP_ID" type="SapId"/> - <xsd:element name="ERROR" type="core:Error"/> - <xsd:element name="USER_NAME_RDIR" type="xsd:string" minOccurs="0"/> - <xsd:element name="PASSWORD_RDIR" type="xsd:string" minOccurs="0"/> - <xsd:element name="ACCESS_LIST_NAME_RDIR" type="xsd:string" minOccurs="0"/> - <xsd:element name="REALM_RDI" type="ReturnRealmRdi" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="ReturnRealmRdi"> - <xsd:sequence> - <xsd:element name="REALM_NAME" type="core:NonEmptyString"/> - <xsd:element name="IP_ADDRESS_POOL_NAME" type="core:NonEmptyString" nillable="true"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="SapCancellationMessage"> - <xsd:sequence> - <xsd:element name="SAP_CANCELLATION_INFO" type="SapCancellationInfo" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="ServiceCancellationMessage"> - <xsd:sequence> - <xsd:element name="PROJECT" type="Project"/> - <xsd:element name="SERVICE" type="Service"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="SapCancellationInfo"> - <xsd:sequence> - <xsd:element name="SAP_ID" type="SapId"/> - <xsd:element name="CUSTOMER_IDENT" type="sapR3:Ident"/> - <xsd:element name="TECHNICAL_NET_NAME" type="TechnicalNetName"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="ReturnSapCancellationMsg"> - <xsd:sequence> - <xsd:element name="RETURN_SAP_CANCELLATION_INFO" type="ReturnSapCancellationInfo" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="ReturnSapCancellationInfo"> - <xsd:sequence> - <xsd:element name="SAP_ID" type="SapId"/> - <xsd:element name="ERROR" type="core:Error"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="ReturnServiceCancellationMsg"> - <xsd:sequence> - <xsd:element name="PROJECT" type="Project"/> - <xsd:element name="SERVICE" type="Service"/> - <xsd:element name="ERROR" type="core:Error"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="BackupCancellationMessage"> - <xsd:sequence> - <xsd:element name="BACKUP_CANCELLATION_INFO" type="BackupCancellationInfo" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="BackupCancellationInfo"> - <xsd:sequence> - <xsd:element name="SAP_ID" type="SapId"/> - <xsd:element name="BACKUP_CANCELLATION" type="core:YesNo" fixed="yes"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="ReturnBackupCancellationMsg"> - <xsd:sequence> - <xsd:element name="RETURN_BACKUP_CANCELLATION_INFO" type="ReturnBackupCancellationInfo" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="ReturnBackupCancellationInfo"> - <xsd:sequence> - <xsd:element name="SAP_ID" type="SapId"/> - <xsd:element name="ERROR" type="core:Error"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="GetDslAccountMessage"> - <xsd:sequence> - <xsd:element name="SAP_ID" type="SapId"/> - <xsd:element name="ROUTER_NAME" type="CeName"/> - <xsd:element name="REALM_NAME" type="core:NonEmptyString"/> - <xsd:element name="VALID_TO" type="xsd:dateTime" nillable="true"/> - <xsd:element name="INITIAL_ACCOUNT" type="core:YesNo"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="PutDslAccountMessage"> - <xsd:sequence> - <xsd:element name="SAP_ID" type="SapId"/> - <xsd:element name="ROUTER_NAME" type="CeName"/> - <xsd:element name="ERROR" type="core:Error" minOccurs="0"> - <xsd:annotation> - <xsd:documentation>only IF this is the anser by GetDslAccountMessage</xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:element name="DSL_ACCOUNT" type="DslAccount" nillable="true"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="ReturnEsaEventMessage"> - <xsd:sequence> - <xsd:element name="SAP_ID" type="SapId"/> - <xsd:element name="ROUTER_NAME" type="CeName"/> - <xsd:element name="USER_NAME" type="core:NonEmptyString"/> - <xsd:element name="ERROR" type="core:Error"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="DslAccount"> - <xsd:sequence> - <xsd:element name="USER_NAME" type="core:NonEmptyString"/> - <xsd:element name="PASSWORD" type="core:NonEmptyString"/> - <xsd:element name="VALID_FROM" type="xsd:dateTime" nillable="true"/> - <xsd:element name="VALID_TO" type="xsd:dateTime" nillable="true"/> - <xsd:element name="DISABLED" type="core:YesNo"/> - <xsd:element name="INITIAL_ACCOUNT" type="core:YesNo"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="NewDslProviderRealmMessage"> - <xsd:sequence> - <xsd:element name="REALM_NAME" type="core:NonEmptyString"/> - <xsd:element name="DSL_PROVIDER" type="core:NonEmptyString"/> - <xsd:element name="COUNTRY_CODE" type="core:CountryCode"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="ReturnNewProviderRealmMessage"> - <xsd:sequence> - <xsd:element name="REALM_NAME" type="core:NonEmptyString"/> - <xsd:element name="ERROR" type="core:Error"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="SetAccountValidToMessage"> - <xsd:sequence> - <xsd:element name="USER_NAME" type="core:NonEmptyString"/> - <xsd:element name="VALID_TO" type="xsd:dateTime"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="ReturnSetValidToMessage"> - <xsd:sequence> - <xsd:element name="USER_NAME" type="core:NonEmptyString"/> - <xsd:element name="ERROR" type="core:Error"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="SetDisableAccountMessage"> - <xsd:sequence> - <xsd:element name="USER_NAME" type="core:NonEmptyString"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="ReturnSetDisableMessage"> - <xsd:sequence> - <xsd:element name="USER_NAME" type="core:NonEmptyString"/> - <xsd:element name="ERROR" type="core:Error"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="GetListDslAccountMessage"> - <xsd:sequence> - <xsd:element name="ROUTER_NAME" type="CeName"/> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="PutListDslAccountMessage"> - <xsd:sequence> - <xsd:element name="ROUTER_NAME" type="CeName"/> - <xsd:element name="ERROR" type="core:Error"/> - <xsd:element name="DSL_ACCOUNT" type="DslAccount" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:complexType> -</xsd:schema> Copied: trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/damona.xsd (from rev 1189, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/damona.xsd) Deleted: trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/provisioningtypes.xsd =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/provisioningtypes.xsd 2006-10-10 15:53:21 UTC (rev 1189) +++ trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/provisioningtypes.xsd 2006-11-21 11:34:09 UTC (rev 1487) @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<xsd:schema xmlns="http://www.t-systems.com/damona" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified" attributeFormDefault="unqualified" version="2.8.0"> - <xsd:complexType name="SapId"> - <xsd:sequence> - <xsd:element name="VPN_ID" type="VpnId"/> - <xsd:element name="SAP_NO" type="SapNo"/> - </xsd:sequence> - </xsd:complexType> - <xsd:simpleType name="PopType"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="IPLS-PoP"/> - <xsd:enumeration value="TGN-PoP"/> - <xsd:enumeration value="ATM-PoP"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SapNo"> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="[0-9]{6}"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="Service"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="VpnCore"/> - <xsd:enumeration value="InternetAccess"/> - <xsd:enumeration value="RemoteDialIn"/> - <xsd:enumeration value="RemoteDialInRouter"/> - <xsd:enumeration value="RemoteInternetGateway"/> - <xsd:enumeration value="DedicatedFirewall"/> - <xsd:enumeration value="ClientEncryption"/> - <xsd:enumeration value="SiteEncryption"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="ChangeParameter"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="SNMP_READ_ACCESS"/> - <xsd:enumeration value="CAR"/> - <xsd:enumeration value="ROUTING_PROTOCOL"/> - <xsd:enumeration value="COS_PROFILE"/> - <xsd:enumeration value="ACTIVATE_IP_ACCOUNTING"/> - <xsd:enumeration value="CUSTOMER_IP_ADDRESSING"/> - <xsd:enumeration value="CONFIGURE_NAT"/> - <xsd:enumeration value="NON_STANDARD"/> - <xsd:enumeration value="LOCATION_MOVE"/> - <xsd:enumeration value="EXTENDED_LOCATION_MOVE"/> - <xsd:enumeration value="SITE_TERMINATION_VCS"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="Priority"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="major"/> - <xsd:enumeration value="minor"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="Status"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="new"/> - <xsd:enumeration value="change"/> - <xsd:enumeration value="cancel"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="TdnNo"> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="[0-9]{4}/[0-9]{4}"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="TechnicalNetName"> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="[A-Z][A-Z0-9\-_]{1,14}"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="TechnicalNetNameNew"> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="[A-Z][A-Z0-9\-]{1,9}-IPLS"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="VpnId"> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="[0-9]{10}"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="VrfNo"> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="[a-zA-Z0-9]{3}-[0-9]{6}"/> - </xsd:restriction> - </xsd:simpleType> -</xsd:schema> Copied: trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/provisioningtypes.xsd (from rev 1189, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/provisioningtypes.xsd) Deleted: trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/sapR3.xsd =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/sapR3.xsd 2006-10-10 15:53:21 UTC (rev 1189) +++ trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/sapR3.xsd 2006-11-21 11:34:09 UTC (rev 1487) @@ -1,106 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<xsd:schema targetNamespace="http://www.t-systems.com/sapR3" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.t-systems.com/core" xmlns="http://www.t-systems.com/sapR3" elementFormDefault="unqualified" attributeFormDefault="unqualified" version="2.8.0"> - <xsd:import namespace="http://www.t-systems.com/core" schemaLocation="core.xsd"/> - <xsd:complexType name="Person"> - <xsd:complexContent> - <xsd:extension base="core:Person"> - <xsd:sequence> - <xsd:element name="IDENT" type="Ident"/> - </xsd:sequence> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - <xsd:complexType name="Location"> - <xsd:complexContent> - <xsd:extension base="core:Location"> - <xsd:sequence> - <xsd:element name="IDENT" type="Ident" nillable="true"/> - </xsd:sequence> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - <xsd:complexType name="ExtendedLocation"> - <xsd:complexContent> - <xsd:extension base="core:ExtendedLocation"> - <xsd:sequence> - <xsd:element name="IDENT" type="Ident" nillable="true"/> - </xsd:sequence> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - <xsd:complexType name="Organisation"> - <xsd:complexContent> - <xsd:extension base="core:Organisation"> - <xsd:sequence> - <xsd:element name="IDENT" type="Ident"/> - </xsd:sequence> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - <xsd:simpleType name="Ident"> - <xsd:annotation> - <xsd:documentation>[0-9]{8}</xsd:documentation> - </xsd:annotation> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="[0-9]{8}"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SapR3MaterialNo"> - <xsd:annotation> - <xsd:documentation>[0-9]{8}</xsd:documentation> - </xsd:annotation> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="[0-9]{8}"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SapR3MaterialText"> - <xsd:annotation> - <xsd:documentation>minLength value=1</xsd:documentation> - </xsd:annotation> - <xsd:restriction base="xsd:string"> - <xsd:minLength value="1"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SapR3OrderNo"> - <xsd:annotation> - <xsd:documentation>[0-9]{10}</xsd:documentation> - </xsd:annotation> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="[0-9]{10}"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SapR3PositionNo"> - <xsd:annotation> - <xsd:documentation>[0-9]{5}</xsd:documentation> - </xsd:annotation> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="[0-9]{5}"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SapR3ProjectId"> - <xsd:annotation> - <xsd:documentation>[0-9]{6}</xsd:documentation> - </xsd:annotation> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="[0-9]{6}"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SapR3ContractId"> - <xsd:annotation> - <xsd:documentation>[0-9]{10}</xsd:documentation> - </xsd:annotation> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="[0-9]{10}"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SapR3ContractPosId"> - <xsd:annotation> - <xsd:documentation>[0-9]{6}</xsd:documentation> - </xsd:annotation> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="[0-9]{6}"/> - </xsd:restriction> - </xsd:simpleType> -</xsd:schema> Copied: trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/sapR3.xsd (from rev 1189, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/sapR3.xsd) Deleted: trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/servicedefinitions.xsd =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/servicedefinitions.xsd 2006-10-10 15:53:21 UTC (rev 1189) +++ trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/servicedefinitions.xsd 2006-11-21 11:34:09 UTC (rev 1487) @@ -1,1052 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<xsd:schema xmlns="http://www.t-systems.com/damona" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified" attributeFormDefault="unqualified" version="2.8.0"> - <xsd:simpleType name="AccessSpeed"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="1024 kbps"/> - <xsd:enumeration value="1024kbps/192kbps"/> - <xsd:enumeration value="1024kbps/256kbps "/> - <xsd:enumeration value="1024kbps/512kbps"/> - <xsd:enumeration value="1130 kbps"/> - <xsd:enumeration value="128 kbps"/> - <xsd:enumeration value="128kbps/64kbps"/> - <xsd:enumeration value="1200kbps/320kbps"/> - <xsd:enumeration value="1280kbps/256kbps"/> - <xsd:enumeration value="1280kbps/512kbps"/> - <xsd:enumeration value="1536 kbps"/> - <xsd:enumeration value="1536kbps/192kbps"/> - <xsd:enumeration value="1536kbps/384kbps"/> - <xsd:enumeration value="1544 kbps (T1)"/> - <xsd:enumeration value="155 Mbps (STM-1/OC3)"/> - <xsd:enumeration value="1582 kbps"/> - <xsd:enumeration value="1Mbps/250kbps"/> - <xsd:enumeration value="2 Mbps (E1)"/> - <xsd:enumeration value="2,5 Gbps (STM-16) (non-std)"/> - <xsd:enumeration value="2033 kbps"/> - <xsd:enumeration value="2048 kbps"/> - <xsd:enumeration value="2048kbps/512kbps"/> - <xsd:enumeration value="2048kbps/320kbps"/> - <xsd:enumeration value="2048kbps/1024kbps "/> - <xsd:enumeration value="256 kbps"/> - <xsd:enumeration value="256kbps/64kbps"/> - <xsd:enumeration value="256kbps/128kbps"/> - <xsd:enumeration value="2Mbps/250kbps"/> - <xsd:enumeration value="3 Mbps (2xT1)"/> - <xsd:enumeration value="3072kbps/320kbps"/> - <xsd:enumeration value="34 Mbps"/> - <xsd:enumeration value="384kbps"/> - <xsd:enumeration value="384kbps/64kbps"/> - <xsd:enumeration value="4 Mbps (2xE1)"/> - <xsd:enumeration value="4,5 Mbps (3xT1)"/> - <xsd:enumeration value="4096 kbps"/> - <xsd:enumeration value="4096kbps/508kbps"/> - <xsd:enumeration value="45 Mbps"/> - <xsd:enumeration value="500kbps/250kbps"/> - <xsd:enumeration value="512 kbps"/> - <xsd:enumeration value="512kbps/128kbps"/> - <xsd:enumeration value="512kbps/256kbps"/> - <xsd:enumeration value="56 kbps"/> - <xsd:enumeration value="565 kbps"/> - <xsd:enumeration value="6 Mbps (3xE1)"/> - <xsd:enumeration value="6 Mbps (4xT1)"/> - <xsd:enumeration value="608kbps/160kbps"/> - <xsd:enumeration value="622 Mbps (STM-4) (non-std)"/> - <xsd:enumeration value="64 kbps"/> - <xsd:enumeration value="640kbps/256kbps"/> - <xsd:enumeration value="768 kbps"/> - <xsd:enumeration value="768kbps/128kbps"/> - <xsd:enumeration value="8 Mbps (4xE1)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="AccessSpeedIsdn"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="64k"/> - <xsd:enumeration value="56k"/> - <xsd:enumeration value="128k"/> - <xsd:enumeration value="112k"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="AccessType"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="DSL"/> - <xsd:enumeration value="Copper"/> - <xsd:enumeration value="Fiber"/> - <xsd:enumeration value="Inhouse Cabling"/> - <xsd:enumeration value="Satellite Connect"/> - <xsd:enumeration value="Ethernet"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="AccessTypeToCe"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="10 Mbps Ethernet"/> - <xsd:enumeration value="10/100 Mbps FE"/> - <xsd:enumeration value="1000Base-Tx (Copper)"/> - <xsd:enumeration value="1000Base-Sx (Fiber)"/> - <xsd:enumeration value="Special Bid (non-std)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="BackUp"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="No"/> - <xsd:enumeration value="ISDN 1024 kbps (non-standard)"/> - <xsd:enumeration value="ISDN 128 kbps"/> - <xsd:enumeration value="ISDN 192 kbps"/> - <xsd:enumeration value="ISDN 2048 kbps (non-standard)"/> - <xsd:enumeration value="ISDN 256 kbps"/> - <xsd:enumeration value="ISDN 384 kbps"/> - <xsd:enumeration value="ISDN 512 kbps"/> - <xsd:enumeration value="ISDN 64 kbps"/> - <xsd:enumeration value="ISDN integrated 1024 kbps (ns)"/> - <xsd:enumeration value="ISDN separated 1024 kbps (ns)"/> - <xsd:enumeration value="ISDN integrated 1024 kbps (non-standard)"/> - <xsd:enumeration value="ISDN separated 1024 kbps (non-standard)"/> - <xsd:enumeration value="ISDN integrated 1024 kbps (non-std)"/> - <xsd:enumeration value="ISDN separated 1024 kbps (non-std)"/> - <xsd:enumeration value="ISDN integrated 128 kbps"/> - <xsd:enumeration value="ISDN separated 128 kbps"/> - <xsd:enumeration value="ISDN integrated 192 kbps"/> - <xsd:enumeration value="ISDN separated 192 kbps"/> - <xsd:enumeration value="ISDN integrated 2048 kbps (ns)"/> - <xsd:enumeration value="ISDN separated 2048 kbps (ns)"/> - <xsd:enumeration value="ISDN integrated 2048 kbps (non-standard)"/> - <xsd:enumeration value="ISDN separated 2048 kbps (non-standard)"/> - <xsd:enumeration value="ISDN integrated 2048 kbps (non-std)"/> - <xsd:enumeration value="ISDN separated 2048 kbps (non-std)"/> - <xsd:enumeration value="ISDN integrated 256 kbps"/> - <xsd:enumeration value="ISDN separated 256 kbps"/> - <xsd:enumeration value="ISDN integrated 384 kbps"/> - <xsd:enumeration value="ISDN separated 384 kbps"/> - <xsd:enumeration value="ISDN integrated 512 kbps"/> - <xsd:enumeration value="ISDN separated 512 kbps"/> - <xsd:enumeration value="ISDN integrated 64 kbps"/> - <xsd:enumeration value="ISDN separated 64 kbps"/> - <xsd:enumeration value="ADSL sep. 1024kbps/512kbps"/> - <xsd:enumeration value="ADSL sep. 2048kbps/512kbps"/> - <xsd:enumeration value="SDSL sep. 1536kbps-384kbps"/> - <xsd:enumeration value="SDSL sep. 2048kbps-512kbps"/> - <xsd:enumeration value="ADSL sep. 1280kbps/512kbps"/> - <xsd:enumeration value="SDSL sep. 1024kbps-256kbps"/> - <xsd:enumeration value="SDSL sep. 2048kbps-512 kbps"/> - <xsd:enumeration value="SDSL sep. 2048kbps-1024 kbps"/> - <xsd:enumeration value="ADSL sep. 1536kbps/192 kbps"/> - <xsd:enumeration value="ADSL sep. 3072kbps/320kbps"/> - <xsd:enumeration value="SDSL sep. 1582 kbps-768kbps"/> - <xsd:enumeration value="SDSL sep. 2033 kbps-1024kbps"/> - <xsd:enumeration value="ADSL sep. 608kbps/160kbps"/> - <xsd:enumeration value="ADSL sep. 1200kbps/320kbps"/> - <xsd:enumeration value="ADSL sep. 2048kbps/320kbps"/> - <xsd:enumeration value="SDSL sep. 2048kbps-384kbps"/> - <xsd:enumeration value="SDSL sep. 2048kbps-1664kbps"/> - <xsd:enumeration value="SDSL sep. 4096kbps-3328kbps"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="BackUpVE"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="No"/> - <xsd:enumeration value="HA-Light"/> - <xsd:enumeration value="HA Active-Passive"/> - <xsd:enumeration value="Special Bid (non-std)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="BandwidthDF"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="1 Mbps"/> - <xsd:enumeration value="10 Mbps"/> - <xsd:enumeration value="100 Mbps"/> - <xsd:enumeration value="1024 kbps"/> - <xsd:enumeration value="11 Mbps"/> - <xsd:enumeration value="110 Mbps"/> - <xsd:enumeration value="12 Mbps"/> - <xsd:enumeration value="120 Mbps"/> - <xsd:enumeration value="128 kbps"/> - <xsd:enumeration value="13 Mbps"/> - <xsd:enumeration value="130 Mbps"/> - <xsd:enumeration value="14 Mbps"/> - <xsd:enumeration value="140 Mbps"/> - <xsd:enumeration value="15 Mbps"/> - <xsd:enumeration value="1536 kbps"/> - <xsd:enumeration value="155 Mbps"/> - <xsd:enumeration value="16 Mbps"/> - <xsd:enumeration value="17 Mbps"/> - <xsd:enumeration value="18 Mbps"/> - <xsd:enumeration value="19 Mbps"/> - <xsd:enumeration value="2 Mbps"/> - <xsd:enumeration value="20 Mbps"/> - <xsd:enumeration value="21 Mbps"/> - <xsd:enumeration value="22 Mbps"/> - <xsd:enumeration value="23 Mbps"/> - <xsd:enumeration value="24 Mbps"/> - <xsd:enumeration value="25 Mbps"/> - <xsd:enumeration value="256 kbps"/> - <xsd:enumeration value="26 Mbps"/> - <xsd:enumeration value="27 Mbps"/> - <xsd:enumeration value="28 Mbps"/> - <xsd:enumeration value="29 Mbps"/> - <xsd:enumeration value="3 Mbps"/> - <xsd:enumeration value="30 Mbps"/> - <xsd:enumeration value="34 Mbps"/> - <xsd:enumeration value="352 kbps"/> - <xsd:enumeration value="4 Mbps"/> - <xsd:enumeration value="40 Mbps"/> - <xsd:enumeration value="5 Mbps"/> - <xsd:enumeration value="50 Mbps"/> - <xsd:enumeration value="512 kbps"/> - <xsd:enumeration value="6 Mbps"/> - <xsd:enumeration value="60 Mbps"/> - <xsd:enumeration value="64 kbps"/> - <xsd:enumeration value="7 Mbps"/> - <xsd:enumeration value="70 Mbps"/> - <xsd:enumeration value="768 kbps"/> - <xsd:enumeration value="8 Mbps"/> - <xsd:enumeration value="80 Mbps"/> - <xsd:enumeration value="9 Mbps"/> - <xsd:enumeration value="90 Mbps"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="BandwidthIAS"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="56 kbps"/> - <xsd:enumeration value="64 kbps"/> - <xsd:enumeration value="128 kbps"/> - <xsd:enumeration value="256 kbps"/> - <xsd:enumeration value="352 kbps"/> - <xsd:enumeration value="512 kbps"/> - <xsd:enumeration value="768 kbps"/> - <xsd:enumeration value="1024 kbps"/> - <xsd:enumeration value="1536 kbps"/> - <xsd:enumeration value="2 Mbps"/> - <xsd:enumeration value="3 Mbps"/> - <xsd:enumeration value="4 Mbps"/> - <xsd:enumeration value="5 Mbps"/> - <xsd:enumeration value="6 Mbps"/> - <xsd:enumeration value="7 Mbps"/> - <xsd:enumeration value="8 Mbps"/> - <xsd:enumeration value="9 Mbps"/> - <xsd:enumeration value="10 Mbps"/> - <xsd:enumeration value="11 Mbps"/> - <xsd:enumeration value="12 Mbps"/> - <xsd:enumeration value="13 Mbps"/> - <xsd:enumeration value="14 Mbps"/> - <xsd:enumeration value="15 Mbps"/> - <xsd:enumeration value="16 Mbps"/> - <xsd:enumeration value="17 Mbps"/> - <xsd:enumeration value="18 Mbps"/> - <xsd:enumeration value="19 Mbps"/> - <xsd:enumeration value="20 Mbps"/> - <xsd:enumeration value="21 Mbps"/> - <xsd:enumeration value="22 Mbps"/> - <xsd:enumeration value="23 Mbps"/> - <xsd:enumeration value="24 Mbps"/> - <xsd:enumeration value="25 Mbps"/> - <xsd:enumeration value="26 Mbps"/> - <xsd:enumeration value="27 Mbps"/> - <xsd:enumeration value="28 Mbps"/> - <xsd:enumeration value="29 Mbps"/> - <xsd:enumeration value="30 Mbps"/> - <xsd:enumeration value="32 Mbps"/> - <xsd:enumeration value="34 Mbps"/> - <xsd:enumeration value="40 Mbps"/> - <xsd:enumeration value="45 Mpbs"/> - <xsd:enumeration value="50 Mbps"/> - <xsd:enumeration value="60 Mbps"/> - <xsd:enumeration value="70 Mbps"/> - <xsd:enumeration value="80 Mbps"/> - <xsd:enumeration value="90 Mbps"/> - <xsd:enumeration value="100 Mbps"/> - <xsd:enumeration value="110 Mbps"/> - <xsd:enumeration value="120 Mbps"/> - <xsd:enumeration value="130 Mbps"/> - <xsd:enumeration value="140 Mbps"/> - <xsd:enumeration value="155 Mbps"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="BandwidthRIGW"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="10 Mbps"/> - <xsd:enumeration value="1024 kbps"/> - <xsd:enumeration value="12 Mbps"/> - <xsd:enumeration value="14 Mbps"/> - <xsd:enumeration value="1536 kbps"/> - <xsd:enumeration value="16 Mbps"/> - <xsd:enumeration value="18 Mbps"/> - <xsd:enumeration value="2 Mbps"/> - <xsd:enumeration value="20 Mbpsps"/> - <xsd:enumeration value="22 Mbps"/> - <xsd:enumeration value="24 Mbps"/> - <xsd:enumeration value="256 kbps"/> - <xsd:enumeration value="26 Mbps"/> - <xsd:enumeration value="28 Mbps"/> - <xsd:enumeration value="30 Mbps"/> - <xsd:enumeration value="32 Mbps"/> - <xsd:enumeration value="34 Mbps"/> - <xsd:enumeration value="4 Mbps"/> - <xsd:enumeration value="512 kbps"/> - <xsd:enumeration value="6 Mbps"/> - <xsd:enumeration value="768 kbps"/> - <xsd:enumeration value="8 Mbps"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="CacheProxy"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="None"/> - <xsd:enumeration value="Proxy IP-Addr. Authentication"/> - <xsd:enumeration value="Proxy user authentication"/> - <xsd:enumeration value="Proxy Secure IP-Addr. authent."/> - <xsd:enumeration value="Proxy Secure user authent."/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="Car"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="1 Mbps"/> - <xsd:enumeration value="10 Mbps"/> - <xsd:enumeration value="100 Mbps"/> - <xsd:enumeration value="1024 kbps"/> - <xsd:enumeration value="1024kbps/192kbps"/> - <xsd:enumeration value="1024kbps/256kbps"/> - <xsd:enumeration value="1024kbps/512kbps"/> - <xsd:enumeration value="11 Mbps"/> - <xsd:enumeration value="110 Mbps"/> - <xsd:enumeration value="1130 kbps"/> - <xsd:enumeration value="12 Mbps"/> - <xsd:enumeration value="120 Mbps"/> - <xsd:enumeration value="128 kbps"/> - <xsd:enumeration value="1280kbps/256kbps"/> - <xsd:enumeration value="13 Mbps"/> - <xsd:enumeration value="130 Mbps"/> - <xsd:enumeration value="14 Mbps"/> - <xsd:enumeration value="140 Mbps"/> - <xsd:enumeration value="1460 kbps"/> - <xsd:enumeration value="1,5 Mbps"/> - <xsd:enumeration value="1536 kbps"/> - <xsd:enumeration value="1536kbps/192kbps"/> - <xsd:enumeration value="1536kbps/384kbps"/> - <xsd:enumeration value="155 Mbps"/> - <xsd:enumeration value="1582 kbps"/> - <xsd:enumeration value="16 Mbps"/> - <xsd:enumeration value="1664 kbps"/> - <xsd:enumeration value="17 Mbps"/> - <xsd:enumeration value="18 Mbps"/> - <xsd:enumeration value="19 Mbps"/> - <xsd:enumeration value="1Mbps/250kbps"/> - <xsd:enumeration value="192 kbps"/> - <xsd:enumeration value="1946 kbps"/> - <xsd:enumeration value="2 Mbps"/> - <xsd:enumeration value="20 Mbps"/> - <xsd:enumeration value="2033 kbps"/> - <xsd:enumeration value="2048kbps/512kbps"/> - <xsd:enumeration value="21 Mbps"/> - <xsd:enumeration value="22 Mbps"/> - <xsd:enumeration value="23 Mbps"/> - <xsd:enumeration value="24 Mbps"/> - <xsd:enumeration value="25 Mbps"/> - <xsd:enumeration value="256 kbps"/> - <xsd:enumeration value="26 Mbps"/> - <xsd:enumeration value="27 Mbps"/> - <xsd:enumeration value="28 Mbps"/> - <xsd:enumeration value="29 Mbps"/> - <xsd:enumeration value="2918 kbps"/> - <xsd:enumeration value="2Mbps/250kbps"/> - <xsd:enumeration value="3 Mbps"/> - <xsd:enumeration value="30 Mbps"/> - <xsd:enumeration value="3072kbps/320kbps"/> - <xsd:enumeration value="32 Mbps"/> - <xsd:enumeration value="34 Mbps"/> - <xsd:enumeration value="320 kbps"/> - <xsd:enumeration value="3328 kbps"/> - <xsd:enumeration value="352 kbps"/> - <xsd:enumeration value="384 kbps"/> - <xsd:enumeration value="384kbps/64kbps"/> - <xsd:enumeration value="3891 kbps"/> - <xsd:enumeration value="4096kbps/508kbps"/> - <xsd:enumeration value="4378 kbps"/> - <xsd:enumeration value="4 Mbps"/> - <xsd:enumeration value="4,5 Mbps"/> - <xsd:enumeration value="40 Mbps"/> - <xsd:enumeration value="45 Mbps"/> - <xsd:enumeration value="5 Mbps"/> - <xsd:enumeration value="50 Mbps"/> - <xsd:enumeration value="500kbps/250kbps"/> - <xsd:enumeration value="512 kbps"/> - <xsd:enumeration value="512kbps/256kbps"/> - <xsd:enumeration value="56 kbps"/> - <xsd:enumeration value="565 kbps"/> - <xsd:enumeration value="5837 kbps"/> - <xsd:enumeration value="6 Mbps"/> - <xsd:enumeration value="60 Mbps"/> - <xsd:enumeration value="64 kbps"/> - <xsd:enumeration value="640 kbps"/> - <xsd:enumeration value="640kbps/128kbps"/> - <xsd:enumeration value="7 Mbps"/> - <xsd:enumeration value="70 Mbps"/> - <xsd:enumeration value="768 kbps"/> - <xsd:enumeration value="768kbps/128kbps"/> - <xsd:enumeration value="7782 kbps"/> - <xsd:enumeration value="8 Mbps"/> - <xsd:enumeration value="80 Mbps"/> - <xsd:enumeration value="9 Mbps"/> - <xsd:enumeration value="90 Mbps"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="CarVE"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="1 Mbps"/> - <xsd:enumeration value="10 Mbps"/> - <xsd:enumeration value="100 Mbps"/> - <xsd:enumeration value="110 Mbps"/> - <xsd:enumeration value="1130 kbps"/> - <xsd:enumeration value="12 Mbps"/> - <xsd:enumeration value="120 Mbps"/> - <xsd:enumeration value="128 kbps"/> - <xsd:enumeration value="130 Mbps"/> - <xsd:enumeration value="14 Mbps"/> - <xsd:enumeration value="140 Mbps"/> - <xsd:enumeration value="1,5 Mbps"/> - <xsd:enumeration value="155 Mbps"/> - <xsd:enumeration value="16 Mbps"/> - <xsd:enumeration value="1664 kbps"/> - <xsd:enumeration value="18 Mbps"/> - <xsd:enumeration value="192 kbps"/> - <xsd:enumeration value="2 Mbps"/> - <xsd:enumeration value="20 Mbps"/> - <xsd:enumeration value="22 Mbps"/> - <xsd:enumeration value="24 Mbps"/> - <xsd:enumeration value="256 kbps"/> - <xsd:enumeration value="26 Mbps"/> - <xsd:enumeration value="28 Mbps"/> - <xsd:enumeration value="3 Mbps"/> - <xsd:enumeration value="30 Mbps"/> - <xsd:enumeration value="32 Mbps"/> - <xsd:enumeration value="320 kbps"/> - <xsd:enumeration value="3328 kbps"/> - <xsd:enumeration value="34 Mbps"/> - <xsd:enumeration value="384 kbps"/> - <xsd:enumeration value="4 Mbps"/> - <xsd:enumeration value="4,5 Mbps"/> - <xsd:enumeration value="40 Mbps"/> - <xsd:enumeration value="45 Mbps"/> - <xsd:enumeration value="50 Mbps"/> - <xsd:enumeration value="512 kbps"/> - <xsd:enumeration value="56 kbps"/> - <xsd:enumeration value="6 Mbps"/> - <xsd:enumeration value="60 Mbps"/> - <xsd:enumeration value="64 kbps"/> - <xsd:enumeration value="640 kbps"/> - <xsd:enumeration value="70 Mbps"/> - <xsd:enumeration value="768 kbps"/> - <xsd:enumeration value="8 Mbps"/> - <xsd:enumeration value="80 Mbps"/> - <xsd:enumeration value="90 Mbps"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:complexType name="Cos"> - <xsd:sequence> - <xsd:element name="BUSINESS" type="YesNo"/> - <xsd:element name="ECONOMY" type="YesNo"/> - <xsd:element name="STREAM" type="YesNo"/> - <xsd:element name="VOICE" type="YesNo"/> - </xsd:sequence> - </xsd:complexType> - <xsd:simpleType name="__CosClasses"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Business"/> - <xsd:enumeration value="Economy"/> - <xsd:enumeration value="Stream"/> - <xsd:enumeration value="Voice"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="CosPackage"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Standard"/> - <xsd:enumeration value="Convergence"/> - <xsd:enumeration value="Enterprise"/> - <xsd:enumeration value="Interactive"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="CosProfile"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Standard"/> - <xsd:enumeration value="Customized"/> - <xsd:enumeration value="Customized no Eco"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="CpeManagement"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="No"/> - <xsd:enumeration value="Reactive"/> - <xsd:enumeration value="Proactive"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="CryptoKeys"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="IKE-PKI-Netpass CA TeleSec"/> - <xsd:enumeration value="IKE-Pre-Shared"/> - <xsd:enumeration value="Manual Key only if Key Escrow"/> - <xsd:enumeration value="Special Bid (non-std)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="CustomerLan"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Ethernet"/> - <xsd:enumeration value="Tokenring"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="CustomerLanVE"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="10 Mbps Ethernet"/> - <xsd:enumeration value="100 Mbps FE"/> - <xsd:enumeration value="1000Base-Tx (Copper)"/> - <xsd:enumeration value="1000Base-Sx (Fiber)"/> - <xsd:enumeration value="Special Bid (non-std)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="CustomerPrefix"> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="[a-zA-Z0-9]{3}"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="DialPlan"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Private Numbering Plan"/> - <xsd:enumeration value="Special Bid (non-standard)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="Dns"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Covered by Customer"/> - <xsd:enumeration value="T-Systems Secondary"/> - <xsd:enumeration value="T-Systems Primary + Secondary"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="DigitalCertificate"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Internal CA"/> - <xsd:enumeration value="Trust Centre DT"/> - <xsd:enumeration value="Customer CA (SBR)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="EncryptionProtocol"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="AES"/> - <xsd:enumeration value="DES"/> - <xsd:enumeration value="3DES"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="EncryptionControl"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="All Clear Text"/> - <xsd:enumeration value="All Crypted"/> - <xsd:enumeration value="Only Economy Crypted"/> - <xsd:enumeration value="Only Business Crypted"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="ExtensionNoLength"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="1 Digit"/> - <xsd:enumeration value="2 Digits"/> - <xsd:enumeration value="3 Digits"/> - <xsd:enumeration value="4 Digits"/> - <xsd:enumeration value="5 Digits"/> - <xsd:enumeration value="more than 5 or mixed"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="IadType"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Integrated Access Device"/> - <xsd:enumeration value="Separated Voice Gateway"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="Installation"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Standard"/> - <xsd:enumeration value="Temporary"/> - <xsd:enumeration value="Express"/> - <xsd:enumeration value="Temp/Express"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="InstallationVE"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Standard"/> - <xsd:enumeration value="Std. co-incident with VCS CE"/> - <xsd:enumeration value="Special Bid (non-std)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="InstallationMaintenanceSE"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Customer"/> - <xsd:enumeration value="T-Systems"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="IpAddressType"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="PI, Customer owned Addresses"/> - <xsd:enumeration value="other"/> - <xsd:enumeration value="PA, only T-Systems Addresses"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="IpAddressAssigning"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Fix"/> - <xsd:enumeration value="Pool"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="IspAccess"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Direct LAN Connection"/> - <xsd:enumeration value="Cable Modem"/> - <xsd:enumeration value="DSL PPTP"/> - <xsd:enumeration value="DSL PPPoE Dialer"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="KeyManagement"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="IKE PKI Netpass T-Systems"/> - <xsd:enumeration value="IKE PKI Netpass Customer"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="LocationDMZ"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Customer Premises"/> - <xsd:enumeration value="Hosted (Location : Frankfurt)"/> - <xsd:enumeration value="Hosted (Location : New York)"/> - <xsd:enumeration value="Hosted (Location : Singapore)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="LocationFW"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Customer Premises"/> - <xsd:enumeration value="Hosted (Location : Frankfurt)"/> - <xsd:enumeration value="Hosted (Location : New York)"/> - <xsd:enumeration value="Hosted (Location : Singapore)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="LocationRIGW"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Customer Premises"/> - <xsd:enumeration value="Hosted (Location : Frankfurt)"/> - <xsd:enumeration value="Hosted (Location : New York)"/> - <xsd:enumeration value="Hosted (Location : Singapore)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="MailRelayConfiguration"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Incoming & Outgoing"/> - <xsd:enumeration value="None"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="MailRelayType"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="None"/> - <xsd:enumeration value="Mail Relay"/> - <xsd:enumeration value="Mail Relay Secure"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="MultiVpnVariant"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Default"/> - <xsd:enumeration value="Separate Accesses"/> - <xsd:enumeration value="Indistinguished Access"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="NumberOfRoutes"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Standard 1000"/> - <xsd:enumeration value="Option 2000"/> - <xsd:enumeration value="Option 5000"/> - <xsd:enumeration value="Option 10000"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="NumberOfUsersIAS"> - <xsd:annotation> - <xsd:documentation>NumberOfUsersNL=100*n; n=(0..20)</xsd:documentation> - </xsd:annotation> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="(1?[1-9]|[1-3,5]0)00"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="NumberOfUsersRDI"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="up to 50"/> - <xsd:enumeration value="up to 100"/> - <xsd:enumeration value="up to 150"/> - <xsd:enumeration value="up to 250"/> - <xsd:enumeration value="up to 500"/> - <xsd:enumeration value="up to 750"/> - <xsd:enumeration value="up to 1000"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="NumberOfUsersSE"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Site Encryption 16"/> - <xsd:enumeration value="Site Encryption 32"/> - <xsd:enumeration value="Site Encryption Unlimited"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="PaIpAddresses"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="128"/> - <xsd:enumeration value="16"/> - <xsd:enumeration value="1x 256"/> - <xsd:enumeration value="2x 256"/> - <xsd:enumeration value="32"/> - <xsd:enumeration value="3x 256"/> - <xsd:enumeration value="4"/> - <xsd:enumeration value="4x 256"/> - <xsd:enumeration value="64"/> - <xsd:enumeration value="8"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="RadiusRedundancy"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Redundant"/> - <xsd:enumeration value="Single"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="RipLan"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="EIGRP (non-std)"/> - <xsd:enumeration value="OSPF"/> - <xsd:enumeration value="RIP2"/> - <xsd:enumeration value="Static"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="RipLanVE"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="BGP-4"/> - <xsd:enumeration value="OSPF"/> - <xsd:enumeration value="RIP2"/> - <xsd:enumeration value="Static"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="RipWan"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="eBGP"/> - <xsd:enumeration value="Static"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="RipRDR"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="RIP2"/> - <xsd:enumeration value="Static"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SecurityLevelKey"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Medium Key Strength"/> - <xsd:enumeration value="Low Key Strength"/> - <xsd:enumeration value="High Key Strength"/> - <xsd:enumeration value="Mixed"/> - <xsd:enumeration value="Special Bid (non-std)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SecurityPolicies"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Route based dynamic"/> - <xsd:enumeration value="Route based"/> - <xsd:enumeration value="Application based"/> - <xsd:enumeration value="Mixed"/> - <xsd:enumeration value="Special Bid (non-std)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="ServiceLevelCE"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Entry (best effort)"/> - <xsd:enumeration value="Entry"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="ServiceLevelDF"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Complete (1 hour)"/> - <xsd:enumeration value="Compact (6 hours)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="ServiceLevelIAS"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Complete (1 hour)"/> - <xsd:enumeration value="Compact (6 hours)"/> - <xsd:enumeration value="Entry (best effort)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="ServiceLevelLL"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Comfort (4 hours)"/> - <xsd:enumeration value="Comfort (8 hours)"/> - <xsd:enumeration value="Comfort (24 hours)"/> - <xsd:enumeration value="Compact (8 hours)"/> - <xsd:enumeration value="Compact (18 hours)"/> - <xsd:enumeration value="Compact (24 hours)"/> - <xsd:enumeration value="Complete (1 hour)"/> - <xsd:enumeration value="Complete (2 hours)"/> - <xsd:enumeration value="Complete (8 hours)"/> - <xsd:enumeration value="Entry (best effort)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="ServiceLevelRDI"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Complete (1 hour)"/> - <xsd:enumeration value="Compact (6 hours)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="ServiceLevelRDR"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Compact (8 hours)"/> - <xsd:enumeration value="Compact (18 hours)"/> - <xsd:enumeration value="Compact (24 hours)"/> - <xsd:enumeration value="Entry (best effort)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="ServiceLevelRIGW"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Complete (1 hour)"/> - <xsd:enumeration value="Compact (6 hours)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="ServiceLevelSE"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Entry (best effort)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="ServiceLevelVE"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Comfort (4 hours)"/> - <xsd:enumeration value="Comfort (24 hours)"/> - <xsd:enumeration value="Compact (8 hours)"/> - <xsd:enumeration value="Compact (24 hours)"/> - <xsd:enumeration value="Complete (8 hours)"/> - <xsd:enumeration value="Entry (best effort)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="ServiceLevelVIAD"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Compact (8 hours)"/> - <xsd:enumeration value="Compact (18 hours)"/> - <xsd:enumeration value="Compact (24 hours)"/> - <xsd:enumeration value="Complete (1 hour)"/> - <xsd:enumeration value="Complete (2 hours)"/> - <xsd:enumeration value="Complete (8 hours)"/> - <xsd:enumeration value="Entry (best effort)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="ServiceLevelVPORT"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Complete (1 hour)"/> - <xsd:enumeration value="Compact (6 hours)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="ServicePerformanceReportingVE"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="No"/> - <xsd:enumeration value="Package (to be defined)"/> - <xsd:enumeration value="Special Bid (non-std)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SignallingIsdn"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="DSS1"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SignallingSupport"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="DSS1"/> - <xsd:enumeration value="Q.SIG"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SnmpReadAccess"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="No"/> - <xsd:enumeration value="Special Bid (non-std)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SupportLevelCE"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="7x24"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SupportLevelDF"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="7x24"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SupportLevelIAS"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="7x24"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SupportLevelLL"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="7x24"/> - <xsd:enumeration value="Standard (8-17)"/> - <xsd:enumeration value="Standard (8-18)"/> - <xsd:enumeration value="Extended (7-20)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SupportLevelRDI"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="7x24"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SupportLevelRDR"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="7x24"/> - <xsd:enumeration value="Standard (8-17)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SupportLevelRIGW"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="7x24"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SupportLevelSE"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="7x24"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SupportLevelVE"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="7x24"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SupportLevelVIAD"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="7x24"/> - <xsd:enumeration value="Standard (8-17)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="SupportLevelVPORT"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="7x24"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="StrongAuthenticationRDI"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="No"/> - <xsd:enumeration value="Secure ID by Customer"/> - <xsd:enumeration value="OTP"/> - <xsd:enumeration value="OTP by Customer"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="StrongAuthenticationCE"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="No"/> - <xsd:enumeration value="OTP"/> - <xsd:enumeration value="Customer Radius (TSI Proxy)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="Tunneling"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Split-tunnelling"/> - <xsd:enumeration value="Block-tunnelling"/> - <xsd:enumeration value="Central tunnelling"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="TypeDFW"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Main VPN standalone"/> - <xsd:enumeration value="Main VPN combined RIGS"/> - <xsd:enumeration value="Optional VPN"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="TypeSE"> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="Site Encryption (16|32|UL)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="TypeOTP"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="None"/> - <xsd:enumeration value="Classic"/> - <xsd:enumeration value="Exclusive"/> - <xsd:enumeration value="Premium"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="TypeRIGW"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Standalone"/> - <xsd:enumeration value="Combined FW"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="VlanNo"> - <xsd:restriction base="xsd:string"/> - </xsd:simpleType> - <xsd:simpleType name="VoiceCodec"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="G.711"/> - <xsd:enumeration value="G.723.1"/> - <xsd:enumeration value="G.726"/> - <xsd:enumeration value="G.728"/> - <xsd:enumeration value="G.729a"/> - <xsd:enumeration value="G.729b"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="VoiceInterface"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Ethernet (10/100 BaseTx)"/> - <xsd:enumeration value="ISDN (1xPRI) based on E1"/> - <xsd:enumeration value="ISDN (2xPRI) based on E1"/> - <xsd:enumeration value="ISDN (3xPRI) based on E1"/> - <xsd:enumeration value="ISDN (4xPRI) based on E1"/> - <xsd:enumeration value="ISDN (1xPRI) based on T1"/> - <xsd:enumeration value="ISDN (2xPRI) based on T1"/> - <xsd:enumeration value="ISDN (3xPRI) based on T1"/> - <xsd:enumeration value="ISDN (4xPRI) based on T1"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="VHomeGwLocation"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Europe"/> - <xsd:enumeration value="USA"/> - <xsd:enumeration value="Asia"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="VpnConfiguration"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Any to any"/> - <xsd:enumeration value="Hub"/> - <xsd:enumeration value="Spoke"/> - <xsd:enumeration value="Spoke - CoI 1"/> - <xsd:enumeration value="Spoke - CoI 2"/> - <xsd:enumeration value="Spoke - CoI 3"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="VpnConfigurationRDR"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Any to any"/> - <xsd:enumeration value="Spoke"/> - <xsd:enumeration value="Spoke - CoI 1"/> - <xsd:enumeration value="Spoke - CoI 2"/> - <xsd:enumeration value="Spoke - CoI 3"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="VpnConfigurationVE"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Any to any"/> - <xsd:enumeration value="Hub"/> - <xsd:enumeration value="Spoke"/> - <xsd:enumeration value="Special Bid (non-std)"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="WanIpAddressAssigning"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Dynamic"/> - <xsd:enumeration value="Static"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:simpleType name="YesNo"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="yes"/> - <xsd:enumeration value="no"/> - </xsd:restriction> - </xsd:simpleType> -</xsd:schema> Copied: trunk/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/servicedefinitions.xsd (from rev 1189, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws958/WEB-INF/wsdl/servicedefinitions.xsd) Deleted: trunk/src/test/resources/jaxrpc/jbws958/wstools-config.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws958/wstools-config.xml 2006-10-10 15:53:21 UTC (rev 1189) +++ trunk/src/test/resources/jaxrpc/jbws958/wstools-config.xml 2006-11-21 11:34:09 UTC (rev 1487) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<configuration xmlns="http://www.jboss.org/jbossws-tools" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools - http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <global> - <package-namespace package="org.jboss.test.ws.jaxrpc.jbws958" namespace="http://services.iplsprovisioning.tsi.com"/> - </global> - <wsdl-java file="resources/jaxrpc/jbws958/WEB-INF/wsdl/IPLSProvisioning.wsdl"> - <mapping file="jaxrpc-mapping.xml" /> - </wsdl-java> - -</configuration> Copied: trunk/src/test/resources/jaxrpc/jbws958/wstools-config.xml (from rev 1189, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws958/wstools-config.xml)

17 years, 5 months

1
0
0 / 0

← Newer
1
2
3
4
5
6
7
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits November 2006