[jboss-svn-commits] JBossWS SVN: r755 - in branches/jbossws-1.0/src: main/java/javax/jws main/java/javax/jws/soap main/java/org/jboss/ws/binding main/java/org/jboss/ws/deployment main/java/org/jboss/ws/jaxrpc main/java/org/jboss/ws/metadata main/java/org/jboss/ws/soap main/java/org/jboss/ws/tools main/java/org/jboss/ws/tools/helpers main/java/org/jboss/ws/tools/metadata test/ant test/java/org/jboss/test/ws test/java/org/jboss/test/ws/jbws1125 test/java/org/jboss/test/ws/jsr181/soapbinding test/resources test/resources/jbws1125 test/resources/jbws1125/META-INF test/resources/jbws1125/WEB-INF test/resources/jbws1125/WEB-INF/wsdl
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 16 09:53:59 EDT 2006
Author: thomas.diesler at jboss.com
Date: 2006-08-16 09:53:20 -0400 (Wed, 16 Aug 2006)
New Revision: 755
Added:
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/JBWS1125TestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpointImpl.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_RequestStruct.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_ResponseStruct.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_RequestStruct.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_ResponseStruct.java
branches/jbossws-1.0/src/test/resources/jbws1125/
branches/jbossws-1.0/src/test/resources/jbws1125/META-INF/
branches/jbossws-1.0/src/test/resources/jbws1125/META-INF/application-client.xml
branches/jbossws-1.0/src/test/resources/jbws1125/META-INF/jboss-client.xml
branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/
branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/jaxrpc-mapping.xml
branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/web.xml
branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/webservices.xml
branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/wsdl/
branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/wsdl/TestService.wsdl
branches/jbossws-1.0/src/test/resources/jbws1125/wstools-config.xml
Removed:
branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/ParameterStyle.java
Modified:
branches/jbossws-1.0/src/main/java/javax/jws/HandlerChain.java
branches/jbossws-1.0/src/main/java/javax/jws/WebParam.java
branches/jbossws-1.0/src/main/java/javax/jws/WebResult.java
branches/jbossws-1.0/src/main/java/javax/jws/WebService.java
branches/jbossws-1.0/src/main/java/javax/jws/soap/SOAPBinding.java
branches/jbossws-1.0/src/main/java/javax/jws/soap/SOAPMessageHandler.java
branches/jbossws-1.0/src/main/java/javax/jws/soap/SOAPMessageHandlers.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/binding/EndpointInvocation.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/OperationMetaData.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPMessageDispatcher.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/JavaToWSDL.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/JavaToWSDL11.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java
branches/jbossws-1.0/src/test/ant/build-jars.xml
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java
Log:
[JBWS-1125] Support doc/lit with empty soap body elements
Modified: branches/jbossws-1.0/src/main/java/javax/jws/HandlerChain.java
===================================================================
--- branches/jbossws-1.0/src/main/java/javax/jws/HandlerChain.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/main/java/javax/jws/HandlerChain.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -1,24 +1,24 @@
/*
-* 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.
-*/
+ * 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 javax.jws;
// $Id$
@@ -40,8 +40,8 @@
* @since 26-Apr-2005
*/
@Retention(value = RetentionPolicy.RUNTIME)
- @Target(value = {ElementType.TYPE})
- public @interface HandlerChain
+ at Target(value = { ElementType.TYPE })
+public @interface HandlerChain
{
/**
@@ -54,6 +54,4 @@
* Name of the handler chain in the configuration file
*/
String name();
-}
-
-;
+};
Modified: branches/jbossws-1.0/src/main/java/javax/jws/WebParam.java
===================================================================
--- branches/jbossws-1.0/src/main/java/javax/jws/WebParam.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/main/java/javax/jws/WebParam.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -1,24 +1,24 @@
/*
-* 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.
-*/
+ * 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 javax.jws;
// $Id$
@@ -35,32 +35,46 @@
* @since 26-Apr-2005
*/
@Retention(value = RetentionPolicy.RUNTIME)
- @Target(value = {ElementType.PARAMETER})
- public @interface WebParam
+ at Target(value = { ElementType.PARAMETER })
+public @interface WebParam
{
-
/**
* The direction in which the parameter flows
*/
public enum Mode
{
- IN,
- OUT,
- INOUT
+ IN, OUT, INOUT
};
/**
- * Name of the parameter as it appears in the WSDL. For RPC bindings, this is name of the wsdl:part representing
- * the parameter. For document bindings, this is the local name of the XML element representing the parameter.
- *
- * Defaults to the name of the parameter as it appears in the argument list.
+ * Name of the parameter.
+ *
+ * If the operation is rpc style and @WebParam.partName has not been specified, this is name of the wsdl:part representing the parameter.
+ * If the operation is document style or the parameter maps to a header, this is the local name of the XML element representing the parameter.
+ *
+ * A name MUST be specified if the operation is document style, the parameter style is BARE, and the mode is OUT or INOUT.
+ *
+ * Specification Default:
+ * If the operation is document style and the parameter style is BARE, @WebMethod.operationName.
+ * Otherwise, argN, where N represents the index of the parameter in the method signature (starting at arg0).
*/
String name() default "";
/**
- * The XML namespace for the parameter. Only used with document bindings, where the parameter maps to an XML
- * element. Defaults to the targetNamespace for the Web Service.
+ * The name of the wsdl:part representing this return value.
+ * This is only used if the operation is rpc style, or if the operation is document style and the parameter style is BARE.
*/
+ String partName() default "";
+
+ /**
+ * The XML namespace for the parameter.
+ *
+ * Only used if the operation is document style or the paramater maps to a header. If the target namespace is set to “”, this represents the empty namespace.
+ *
+ * Specification Default:
+ * If the operation is document style, the parameter style is WRAPPED, and the parameter does not map to a header, the empty namespace.
+ * Otherwise, the targetNamespace for the Web Service.
+ */
String targetNamespace() default "";
/**
@@ -74,6 +88,4 @@
* If true, the parameter is pulled from a message header rather then the message body.
*/
boolean header() default false;
-}
-
-;
+};
Modified: branches/jbossws-1.0/src/main/java/javax/jws/WebResult.java
===================================================================
--- branches/jbossws-1.0/src/main/java/javax/jws/WebResult.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/main/java/javax/jws/WebResult.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -1,24 +1,24 @@
/*
-* 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.
-*/
+ * 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 javax.jws;
// $Id$
@@ -35,22 +35,38 @@
* @since 26-Apr-2005
*/
@Retention(value = RetentionPolicy.RUNTIME)
- @Target(value = {ElementType.METHOD})
- public @interface WebResult
+ at Target(value = { ElementType.METHOD })
+public @interface WebResult
{
+ /**
+ * If true, the result is pulled from a message header rather then the message body.
+ */
+ boolean header() default false;
+
+ /**
+ * If the operation is rpc style and @WebResult.partName has not been specified, this is the name of the wsdl:part representing the return value.
+ * If the operation is document style or the return value maps to a header, this is the local name of the XML element representing the return value.
+ *
+ * Specification Default:
+ * If the operation is document style and the parameter style is BARE, @WebParam.operationName+”Response”.
+ * Otherwise, “return.”
+ */
+ String name() default "";
/**
- * Name of return value as it appears in the WSDL and messages on the wire. For RPC bindings, this is the name of
- * the wsdl:part representing the return value. For document bindings, this is the local name of the XML element
- * representing the return value.
+ * The name of the wsdl:part representing this return value.
+ * This is only used if the operation is rpc style, or if the operation is document style and the parameter style is BARE.
*/
- String name() default "return";
+ String partName() default "";
/**
- * The XML namespace for the return value. Only used with document bindings, where the return value maps to an
- * XML element. Defaults to the targetNamespace of the Web Service.
+ * The XML namespace for the return value.
+ *
+ * Only used if the operation is document style or the return value maps to a header. If the target namespace is set to “”, this represents the empty namespace.
+ *
+ * Specification Default:
+ * If the operation is document style, the parameter style is WRAPPED, and the return value does not map to a header, the empty namespace.
+ * Otherwise, the targetNamespace for the Web Service.
*/
String targetNamespace() default "";
-}
-
-;
+};
Modified: branches/jbossws-1.0/src/main/java/javax/jws/WebService.java
===================================================================
--- branches/jbossws-1.0/src/main/java/javax/jws/WebService.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/main/java/javax/jws/WebService.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -40,45 +40,73 @@
{
/**
- * The name of the Web Service. Used as the name of the wsdl:portType when mapped to WSDL 1.1.
- * Defaults to the simple name of the Java class or interface
+ * The name of the Web Service.
+ * Used as the name of the wsdl:portType when mapped to WSDL 1.1.
+ * Specification Default:
+ * The simple name of the Java class or interface.
*/
String name() default "";
/**
- * The XML namespace used for the WSDL and XML elements generated from this Web Service.
+ * The port name of the Web Service.
+ * Used as the name of the wsdl:port when mapped to WSDL 1.1.
+ * This member-value is not allowed on endpoint interfaces.
+ * Specification Default:
+ * @WebService.name + ”Port”.
*/
+ String portName() default "";
+
+ /**
+ * If the @WebService.targetNamespace annotation is on a service endpoint interface, the targetNamespace is used for the
+ * namespace for the wsdl:portType (and associated XML elements).
+ *
+ * If the @WebService.targetNamespace annotation is on a service implementation bean that does NOT reference a service
+ * endpoint interface (through the endpointInterface attribute), the targetNamespace is used for both the wsdl:portType
+ * and the wsdl:service (and associated XML elements).
+ *
+ * If the @WebService.targetNamespace annotation is on a service implementation bean that does reference a service
+ * endpoint interface (through the endpointInterface attribute), the targetNamespace is used for only the wsdl:service
+ * (and associated XML elements).
+ */
String targetNamespace() default "";
/**
- * The service name of the Web Service. Used as the name of the wsdl:service when mapped to WSDL 1.1.
- * Not allowed on interfaces. Defaults to the simple name of the Java class + Service.
+ * The service name of the Web Service.
+ *
+ * Used as the name of the wsdl:service when mapped to WSDL 1.1.
+ *
+ * This member-value is not allowed on endpoint interfaces.
+ *
+ * Specification Default:
+ * The simple name of the Java class + “Service".
*/
String serviceName() default "";
/**
- * The location of a pre-defined WSDL describing the service. The wsdlLocation is a URL (relative or absolute)
- * that refers to a pre-existing WSDL file. The presence of a wsdlLocation value indicates that the service
- * implementation bean is implementing a pre-defined WSDL contract. The JSR-181 tool should instead feedback
- * if the service implementation bean is inconsistent with the portType and bindings declared in this WSDL. Note
- * that a single WSDL file might contain multiple portTypes and multiple bindings. The annotations on the service
- * implementation bean determine the specific portType and bindings that correspond to the Web Service.
+ * The location of a pre-defined WSDL describing the service.
+ *
+ * The wsdlLocation is a URL (relative or absolute) that refers to a pre-existing WSDL file.
+ * The presence of a wsdlLocation value indicates that the service implementation bean is implementing a
+ * pre-defined WSDL contract. The JSR-181 tool MUST provide feedback if the service implementation bean is
+ * inconsistent with the portType and bindings declared in this WSDL. Note that a single WSDL file might
+ * contain multiple portTypes and multiple bindings. The annotations on the service implementation bean
+ * determine the specific portType and bindings that correspond to the Web Service.
*/
String wsdlLocation() default "";
/**
- * The complete name of the service endpoint interface defining the service abstract Web Service contract. This
- * annotation allows the developer to separate the interface contract from the implementation. If this annotation
- * is present, the service endpoint interface is used to determine the abstract WSDL contract (portType and
- * bindings). The service endpoint interface may include JSR-181 annotations to customize the mapping from Java to
- * WSDL. The service implementation bean may implement the service endpoint interface, but is not required to do
- * so.
- *
- * If this annotation is not present, the Web Service contract will be generated from annotations on the service
- * implementation bean itself. If a service endpoint interface is required by the target environment, it will be
- * generated into an implementation-defined package with an implementation defined name.
+ * The complete name of the service endpoint interface defining the service’s abstract Web Service contract.
+ *
+ * This annotation allows the developer to separate the interface contract from the implementation.
+ * If this annotation is present, the service endpoint interface is used to determine the abstract
+ * WSDL contract (portType and bindings). The service endpoint interface MAY include JSR-181 annotations
+ * to customize the mapping from Java to WSDL.
+ *
+ * The service implementation bean MAY implement the service endpoint interface, but is not REQUIRED to do so.
+ * If this member-value is not present, the Web Service contract is generated from annotations on the service
+ * implementation bean. If a service endpoint interface is required by the target environment, it will be generated into an implementation-defined package with an implementation- defined name
+ *
+ * This member-value is not allowed on endpoint interfaces.
*/
String endpointInterface() default "";
-}
-
-;
+};
Modified: branches/jbossws-1.0/src/main/java/javax/jws/soap/SOAPBinding.java
===================================================================
--- branches/jbossws-1.0/src/main/java/javax/jws/soap/SOAPBinding.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/main/java/javax/jws/soap/SOAPBinding.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -1,24 +1,24 @@
/*
-* 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.
-*/
+ * 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 javax.jws.soap;
// $Id$
@@ -35,17 +35,15 @@
* @since 26-Apr-2005
*/
@Retention(value = RetentionPolicy.RUNTIME)
- @Target(value = {ElementType.TYPE})
- public @interface SOAPBinding
-{
+ at Target(value = { ElementType.TYPE })
+public @interface SOAPBinding {
/**
* The SOAP binding style
*/
public enum Style
{
- DOCUMENT,
- RPC
+ DOCUMENT, RPC
};
/**
@@ -53,8 +51,7 @@
*/
public enum Use
{
- LITERAL,
- ENCODED
+ LITERAL, ENCODED
};
/**
@@ -62,8 +59,7 @@
*/
public enum ParameterStyle
{
- BARE,
- WRAPPED
+ BARE, WRAPPED
}
/**
Modified: branches/jbossws-1.0/src/main/java/javax/jws/soap/SOAPMessageHandler.java
===================================================================
--- branches/jbossws-1.0/src/main/java/javax/jws/soap/SOAPMessageHandler.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/main/java/javax/jws/soap/SOAPMessageHandler.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -28,7 +28,8 @@
*
* @author thomas.diesler at jboss.org
* @since 26-Apr-2005
- ` */
+ * @deprecated
+ */
public @interface SOAPMessageHandler
{
Modified: branches/jbossws-1.0/src/main/java/javax/jws/soap/SOAPMessageHandlers.java
===================================================================
--- branches/jbossws-1.0/src/main/java/javax/jws/soap/SOAPMessageHandlers.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/main/java/javax/jws/soap/SOAPMessageHandlers.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -29,14 +29,14 @@
import java.lang.annotation.Target;
/**
- * Specifies a list of SOAP protocol handlers that run before and after business methods on the Web Service. These
- * handlers are called in response to SOAP messages targeting the service.
- *
- * The @SOAPMessageHandlers annotation is an array of SOAPMessageHandler types. The handlers are run in the order in
- * which they appear in the annotation, starting with the first handler in the array.
- *
+ * This annotation was originally used to create a JAX-RPC handler chain. In this version,
+ * the annotation is ALWAYS ignored.
+ *
+ * This annotation will be permanently removed in a future version of JSR-181.
+
* @author thomas.diesler at jboss.org
* @since 26-Apr-2005
+ * @deprecated
*/
@Retention(value = RetentionPolicy.RUNTIME)
@Target(value = {ElementType.TYPE})
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/binding/EndpointInvocation.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/binding/EndpointInvocation.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/binding/EndpointInvocation.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -244,7 +244,7 @@
public void initInputParams(Object[] inputParams)
{
List<ParameterMetaData> paramMetaDataList = opMetaData.getParameters();
- if (opMetaData.isDocumentWrapped())
+ if (opMetaData.isDocumentWrapped() && paramMetaDataList.size() != 0)
{
Object value = ParameterWrapping.wrapRequestParameters(opMetaData, inputParams);
ParameterMetaData paramMetaData = paramMetaDataList.get(0);
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.List;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.wsdl.Message;
import javax.wsdl.Part;
import javax.xml.namespace.QName;
@@ -33,22 +34,16 @@
import javax.xml.rpc.encoding.TypeMappingRegistry;
import javax.xml.ws.addressing.AddressingConstants;
-import org.apache.xerces.xs.XSComplexTypeDefinition;
import org.apache.xerces.xs.XSTypeDefinition;
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.soap.SOAPMessageImpl;
-import org.jboss.ws.soap.SOAPEnvelopeImpl;
-import org.jboss.ws.soap.MessageContextAssociation;
-import org.jboss.ws.xop.XOPScanner;
import org.jboss.ws.addressing.AddressingConstantsImpl;
import org.jboss.ws.addressing.metadata.AddressingOpMetaExt;
import org.jboss.ws.eventing.EventingConstants;
import org.jboss.ws.eventing.deployment.EventingEndpoint;
import org.jboss.ws.eventing.metadata.EventingEpMetaExt;
import org.jboss.ws.jaxrpc.LiteralTypeMapping;
-import org.jboss.ws.jaxrpc.ParameterStyle;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.jaxrpc.TypeMappingImpl;
import org.jboss.ws.jaxrpc.TypeMappingRegistryImpl;
@@ -86,10 +81,9 @@
import org.jboss.ws.metadata.wsdl.WSDLProperty;
import org.jboss.ws.metadata.wsdl.WSDLService;
import org.jboss.ws.metadata.wsdl.WSDLTypes;
-import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.utils.JavaUtils;
-import org.jboss.ws.utils.MimeUtils;
+import org.jboss.ws.xop.XOPScanner;
/**
* A meta data builder that is based on webservices.xml.
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -23,15 +23,57 @@
// $Id: JSR181MetaDataBuilder.java 387 2006-05-20 14:45:47Z thomas.diesler at jboss.com $
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Writer;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.rmi.RemoteException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.jws.HandlerChain;
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.InitParam;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPMessageHandler;
+import javax.jws.soap.SOAPMessageHandlers;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
+import javax.management.ObjectName;
+import javax.xml.namespace.QName;
+import javax.xml.rpc.ParameterMode;
+import javax.xml.rpc.encoding.TypeMappingRegistry;
+import javax.xml.rpc.holders.Holder;
+import javax.xml.ws.addressing.AddressingProperties;
+
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.addressing.AddressingPropertiesImpl;
import org.jboss.ws.addressing.metadata.AddressingOpMetaExt;
import org.jboss.ws.annotation.PortComponent;
-import org.jboss.ws.jaxrpc.*;
-import org.jboss.ws.metadata.*;
-import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
+import org.jboss.ws.jaxrpc.ParameterWrapping;
+import org.jboss.ws.jaxrpc.Style;
+import org.jboss.ws.jaxrpc.TypeMappingImpl;
+import org.jboss.ws.jaxrpc.TypeMappingRegistryImpl;
+import org.jboss.ws.jaxrpc.Use;
+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.ServerEndpointMetaData;
+import org.jboss.ws.metadata.ServiceMetaData;
+import org.jboss.ws.metadata.TypeMappingMetaData;
+import org.jboss.ws.metadata.TypesMetaData;
+import org.jboss.ws.metadata.UnifiedMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedInitParamMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData;
@@ -42,6 +84,7 @@
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
+import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
import org.jboss.ws.server.ServerConfig;
import org.jboss.ws.server.ServerConfigFactory;
import org.jboss.ws.tools.JavaToWSDL;
@@ -52,30 +95,6 @@
import org.jboss.xb.binding.Unmarshaller;
import org.jboss.xb.binding.UnmarshallerFactory;
-import javax.jws.*;
-import javax.jws.soap.InitParam;
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPMessageHandler;
-import javax.jws.soap.SOAPMessageHandlers;
-import javax.management.ObjectName;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.ParameterMode;
-import javax.xml.rpc.encoding.TypeMappingRegistry;
-import javax.xml.rpc.holders.Holder;
-import javax.xml.ws.addressing.AddressingProperties;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Writer;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.rmi.RemoteException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
/** An abstract annotation meta data builder.
*
* @author Thomas.Diesler at jboss.org
@@ -113,17 +132,24 @@
WSDLUtils wsdlUtils = WSDLUtils.getInstance();
+ String name = anWebService.name();
+ if (name.length() == 0)
+ name = wsdlUtils.getJustClassName(wsClass);
+
String serviceName = anWebService.serviceName();
if (serviceName.length() == 0)
- serviceName = wsdlUtils.getJustClassName(wsClass.getName()) + "Service";
+ serviceName = name + "Service";
String targetNS = anWebService.targetNamespace();
if (targetNS.length() == 0)
targetNS = wsdlUtils.getTypeNamespace(wsClass);
- String portTypeName = anWebService.name();
- if (portTypeName.length() == 0)
- portTypeName = wsdlUtils.getJustClassName(wsClass.getName());
+ /* JSR181-2.0
+ String portName = anWebService.portName();
+ if (portName.length() == 0)
+ portName = name + "Port";
+ */
+ String portName = name + "Port";
ServiceMetaData serviceMetaData = new ServiceMetaData(wsMetaData, new QName(targetNS, serviceName));
wsMetaData.addService(serviceMetaData);
@@ -140,8 +166,8 @@
}
// Setup the ServerEndpointMetaData
- QName portName = new QName(targetNS, portTypeName + "Port");
- ServerEndpointMetaData sepMetaData = new ServerEndpointMetaData(serviceMetaData, portName);
+ QName portQName = new QName(targetNS, portName);
+ ServerEndpointMetaData sepMetaData = new ServerEndpointMetaData(serviceMetaData, portQName);
sepMetaData.setLinkName(linkName);
sepMetaData.setAnnotated(true);
Deleted: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/ParameterStyle.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/ParameterStyle.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/ParameterStyle.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -1,62 +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.jaxrpc;
-
-// $Id$
-
-/** A type-safe enumeration for parameter style.
- *
- * @author Thomas.Diesler at jboss.org
- * @since 17-Oct-2005
- */
-public class ParameterStyle
-{
- private String style;
-
- public static final ParameterStyle BARE = new ParameterStyle("bare");
- public static final ParameterStyle WRAPPED = new ParameterStyle("wrapped");
-
- private ParameterStyle(String style)
- {
- this.style = style;
- }
-
- public static ParameterStyle getDefaultStyle()
- {
- return WRAPPED;
- }
-
- public static ParameterStyle valueOf(String style)
- {
- if (BARE.style.equals(style))
- return BARE;
- if (WRAPPED.style.equals(style))
- return WRAPPED;
-
- throw new IllegalArgumentException("Unsupported parameter style: " + style);
- }
-
- public String toString()
- {
- return style;
- }
-}
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -23,6 +23,7 @@
// $Id$
+import java.beans.IntrospectionException;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Method;
import java.util.List;
@@ -34,6 +35,7 @@
import javassist.LoaderClassPath;
import javassist.Modifier;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
@@ -64,12 +66,6 @@
if (opMetaData.getStyle() != Style.DOCUMENT)
throw new WSException("Unexpected style: " + opMetaData.getStyle());
- if (opMetaData.getNonHeaderParameters().size() != 1)
- throw new WSException("Unexpected number of input parameters: " + opMetaData.getParameters().size());
-
- if (opMetaData.getReturnParameter() == null && opMetaData.isOneWayOperation() == false)
- throw new WSException("Unexpected null return parameter");
-
if (opMetaData.getParameterStyle() != ParameterStyle.WRAPPED)
throw new WSException("Unexpected parameter style: " + opMetaData.getParameterStyle());
}
@@ -78,6 +74,13 @@
{
assertOperationMetaData(opMetaData);
+ // [JBWS-1125] Support empty soap body elements
+ if (opMetaData.getParameters().size() == 0)
+ {
+ log.debug("Detected document/literal/wrapped with no parameter part");
+ return true;
+ }
+
ParameterMetaData paramMetaData = opMetaData.getParameters().get(0);
List<String> varNames = paramMetaData.getWrappedVariables();
Class reqStructType = paramMetaData.getJavaType();
@@ -89,8 +92,26 @@
for (int i = 0; pass && i < varNames.size(); i++)
{
String varName = varNames.get(i);
- PropertyDescriptor pd = new PropertyDescriptor(varName, reqStructType);
- Method method = pd.getWriteMethod();
+ Method method = null;
+ try
+ {
+ PropertyDescriptor pd = new PropertyDescriptor(varName, reqStructType);
+ method = pd.getWriteMethod();
+ }
+ catch (IntrospectionException ex)
+ {
+ // jaxws-ri wsimport generates setter without the underscore
+ if (varName.indexOf("_") > 0)
+ {
+ varName = varName.replace("_", "");
+ PropertyDescriptor pd = new PropertyDescriptor(varName, reqStructType);
+ method = pd.getWriteMethod();
+ }
+ }
+
+ if (method == null)
+ throw new NoSuchMethodError("No write method for: " + varName);
+
Class methodType = method.getParameterTypes()[0];
Class paramType = paramTypes[i];
pass = JavaUtils.isAssignableFrom(methodType, paramType);
@@ -104,10 +125,62 @@
}
}
+ public static boolean matchResponseParameters(OperationMetaData opMetaData, Class returnType)
+ {
+ assertOperationMetaData(opMetaData);
+
+ // [JBWS-1125] Support empty soap body elements
+ if (opMetaData.getReturnParameter() == null)
+ {
+ log.debug("Detected document/literal/wrapped with no return part");
+ return true;
+ }
+
+ ParameterMetaData paramMetaData = opMetaData.getReturnParameter();
+ Class resStructType = paramMetaData.getJavaType();
+
+ log.debug("matchResponseParameters: " + resStructType.getName());
+ try
+ {
+ boolean pass = (returnType == void.class);
+ if (pass == false)
+ {
+ try
+ {
+ resStructType.getConstructor(new Class[] { returnType });
+ pass = true;
+ }
+ catch (NoSuchMethodException ex)
+ {
+ // jaxws-ri wsimport does not generate a ctor with return param type
+ resStructType.getMethod("setResult", returnType);
+ pass = true;
+ }
+ }
+ return pass;
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ catch (Exception ex)
+ {
+ log.debug("Invalid response wrapper: " + ex);
+ return false;
+ }
+ }
+
public static Object wrapRequestParameters(OperationMetaData opMetaData, Object[] inParams)
{
assertOperationMetaData(opMetaData);
+ // [JBWS-1125] Support empty soap body elements
+ if (opMetaData.getParameters().size() == 0)
+ {
+ log.debug("Detected document/literal/wrapped with no parameter part");
+ return null;
+ }
+
ParameterMetaData paramMetaData = opMetaData.getParameters().get(0);
List<String> varNames = paramMetaData.getWrappedVariables();
Class reqStructType = paramMetaData.getJavaType();
@@ -119,8 +192,26 @@
for (int i = 0; i < varNames.size(); i++)
{
String varName = varNames.get(i);
- PropertyDescriptor pd = new PropertyDescriptor(varName, reqStructType);
- Method method = pd.getWriteMethod();
+ Method method = null;
+ try
+ {
+ PropertyDescriptor pd = new PropertyDescriptor(varName, reqStructType);
+ method = pd.getWriteMethod();
+ }
+ catch (IntrospectionException ex)
+ {
+ // jaxws-ri wsimport generates setter without the underscore
+ if (varName.indexOf("_") > 0)
+ {
+ varName = varName.replace("_", "");
+ PropertyDescriptor pd = new PropertyDescriptor(varName, reqStructType);
+ method = pd.getWriteMethod();
+ }
+ }
+
+ if (method == null)
+ throw new NoSuchMethodError("No write method for: " + varName);
+
Object value = inParams[i];
log.debug(" " + method.getName() + ": " + (value != null ? value.getClass().getName() : null));
method.invoke(reqStruct, new Object[] { value });
@@ -156,8 +247,26 @@
for (int i = 0; i < varNames.size(); i++)
{
String varName = varNames.get(i);
- PropertyDescriptor pd = new PropertyDescriptor(varName, reqStructType);
- Method method = pd.getReadMethod();
+ Method method = null;
+ try
+ {
+ PropertyDescriptor pd = new PropertyDescriptor(varName, reqStructType);
+ method = pd.getReadMethod();
+ }
+ catch (IntrospectionException ex)
+ {
+ // jaxws-ri wsimport generates getter without the underscore
+ if (varName.indexOf("_") > 0)
+ {
+ varName = varName.replace("_", "");
+ PropertyDescriptor pd = new PropertyDescriptor(varName, reqStructType);
+ method = pd.getReadMethod();
+ }
+ }
+
+ if (method == null)
+ throw new NoSuchMethodError("No read method for: " + varName);
+
Object value = method.invoke(reqStruct, new Object[] {});
log.debug(" " + method.getName() + ": " + (value != null ? value.getClass().getName() : null));
inParams[i] = value;
@@ -179,6 +288,13 @@
{
assertOperationMetaData(opMetaData);
+ // [JBWS-1125] Support empty soap body elements
+ if (opMetaData.getReturnParameter() == null)
+ {
+ log.debug("Detected document/literal/wrapped with no return part");
+ return null;
+ }
+
ParameterMetaData paramMetaData = opMetaData.getReturnParameter();
List<String> varNames = paramMetaData.getWrappedVariables();
Class resStructType = paramMetaData.getJavaType();
@@ -196,8 +312,26 @@
if (varNames.size() > 0)
{
String varName = varNames.get(0);
- PropertyDescriptor pd = new PropertyDescriptor(varName, resStructType);
- Method method = pd.getWriteMethod();
+ Method method = null;
+ try
+ {
+ PropertyDescriptor pd = new PropertyDescriptor(varName, resStructType);
+ method = pd.getWriteMethod();
+ }
+ catch (IntrospectionException ex)
+ {
+ // jaxws-ri wsimport generates setter without the underscore
+ if (varName.indexOf("_") > 0)
+ {
+ varName = varName.replace("_", "");
+ PropertyDescriptor pd = new PropertyDescriptor(varName, resStructType);
+ method = pd.getWriteMethod();
+ }
+ }
+
+ if (method == null)
+ throw new NoSuchMethodError("No write method for: " + varName);
+
Object value = outParam;
log.debug(" " + method.getName() + ": " + (value != null ? value.getClass().getName() : null));
method.invoke(resStruct, new Object[] { value });
@@ -231,8 +365,26 @@
if (varNames.size() > 0)
{
String varName = varNames.get(0);
- PropertyDescriptor pd = new PropertyDescriptor(varName, resStructType);
- Method method = pd.getReadMethod();
+ Method method = null;
+ try
+ {
+ PropertyDescriptor pd = new PropertyDescriptor(varName, resStructType);
+ method = pd.getReadMethod();
+ }
+ catch (IntrospectionException ex)
+ {
+ // jaxws-ri wsimport generates getter without the underscore
+ if (varName.indexOf("_") > 0)
+ {
+ varName = varName.replace("_", "");
+ PropertyDescriptor pd = new PropertyDescriptor(varName, resStructType);
+ method = pd.getReadMethod();
+ }
+ }
+
+ if (method == null)
+ throw new NoSuchMethodError("No read method for: " + varName);
+
Object value = method.invoke(resStruct, new Object[] {});
log.debug(" " + method.getName() + ": " + (value != null ? value.getClass().getName() : null));
retValue = value;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -29,12 +29,12 @@
import java.util.List;
import java.util.Properties;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.namespace.QName;
import javax.xml.rpc.ParameterMode;
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.jaxrpc.ParameterStyle;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.jaxrpc.Use;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
@@ -213,7 +213,7 @@
public ParameterStyle getParameterStyle()
{
if (parameterStyle == null)
- parameterStyle = ParameterStyle.getDefaultStyle();
+ parameterStyle = ParameterStyle.WRAPPED;
return parameterStyle;
}
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/OperationMetaData.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -27,12 +27,12 @@
import java.util.ArrayList;
import java.util.List;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.namespace.QName;
import javax.xml.rpc.ParameterMode;
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.jaxrpc.ParameterStyle;
import org.jboss.ws.jaxrpc.ParameterWrapping;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.jaxrpc.Use;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPMessageDispatcher.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPMessageDispatcher.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPMessageDispatcher.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -35,6 +35,7 @@
import javax.xml.ws.addressing.JAXWSAConstants;
import org.jboss.logging.Logger;
+import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.metadata.EndpointMetaData;
import org.jboss.ws.metadata.OperationMetaData;
@@ -78,15 +79,31 @@
Iterator bodyChildren = soapBody.getChildElements();
if (bodyChildren.hasNext() == false)
- throw new SOAPException("SOAPBody has no child element");
+ {
+ if (epMetaData.getStyle() == Style.RPC)
+ throw new SOAPException("Empty SOAP body with no child element not supported for RPC");
+
+ // [JBWS-1125] Support empty soap body elements
+ for (OperationMetaData opAux : epMetaData.getOperations())
+ {
+ if (opAux.getParameters().size() == 0)
+ {
+ log.debug ("Dispatching empty SOAP body");
+ opMetaData = opAux;
+ break;
+ }
+ }
+ }
+ else
+ {
+ SOAPBodyElement soapBodyElement = (SOAPBodyElement)bodyChildren.next();
+ if (bodyChildren.hasNext())
+ throw new SOAPException("SOAPBody has more than on child element");
- SOAPBodyElement soapBodyElement = (SOAPBodyElement)bodyChildren.next();
- if (bodyChildren.hasNext())
- throw new SOAPException("SOAPBody has more than on child element");
-
- Name soapName = soapBodyElement.getElementName();
- QName xmlElementName = new QName(soapName.getURI(), soapName.getLocalName());
- opMetaData = epMetaData.getOperation(xmlElementName);
+ Name soapName = soapBodyElement.getElementName();
+ QName xmlElementName = new QName(soapName.getURI(), soapName.getLocalName());
+ opMetaData = epMetaData.getOperation(xmlElementName);
+ }
}
// Dispatch to a generic operation that takes an org.w3c.dom.Element
@@ -96,8 +113,8 @@
{
if (opAux.isMessageEndpoint())
{
+ log.debug("Use generic message style dispatch");
opMetaData = opAux;
- log.debug("Use generic message style dispatch");
break;
}
}
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/JavaToWSDL.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/JavaToWSDL.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/JavaToWSDL.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -28,12 +28,12 @@
import java.util.List;
import java.util.Map;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
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.jaxrpc.ParameterStyle;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.metadata.UnifiedMetaData;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/JavaToWSDL11.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/JavaToWSDL11.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/JavaToWSDL11.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -1,24 +1,24 @@
/*
-* 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.
-*/
+ * 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.tools;
import java.io.IOException;
@@ -58,10 +58,10 @@
private final String wsdlNamespace = Constants.NS_WSDL11;
/** Features as represented by Constants*/
- private HashMap<String,Boolean> features = new HashMap<String,Boolean>();
+ private HashMap<String, Boolean> features = new HashMap<String, Boolean>();
// A Map of package/namespace mapping that needs to be passed onto types generator
- private Map<String,String> packageNamespaceMap = null;
+ private Map<String, String> packageNamespaceMap = null;
private TypeMapping typeMapping = null;
@@ -87,7 +87,7 @@
*/
public void addFeature(String name, boolean value)
{
- features.put(name,new Boolean(value));
+ features.put(name, new Boolean(value));
}
/**
@@ -95,9 +95,9 @@
* @see org.jboss.ws.tools.WSToolsConstants
* @param map
*/
- public void addFeatures(Map<String,Boolean> map)
+ public void addFeatures(Map<String, Boolean> map)
{
- features.putAll(map);
+ features.putAll(map);
}
/**
@@ -109,9 +109,10 @@
*/
public boolean getFeature(String name)
{
- Boolean val = features.get(name);
- if(val != null) return val.booleanValue();
- throw new WSException("Feature unrecognized");
+ Boolean val = features.get(name);
+ if (val != null)
+ return val.booleanValue();
+ throw new WSException("Feature unrecognized");
}
/**
@@ -119,7 +120,7 @@
*
* @param map
*/
- public void setPackageNamespaceMap(Map<String,String> map)
+ public void setPackageNamespaceMap(Map<String, String> map)
{
packageNamespaceMap = map;
}
@@ -133,7 +134,7 @@
*/
public TypeMapping getTypeMapping()
{
- if(typeMapping == null)
+ if (typeMapping == null)
throw new WSException("TypeMapping has not been generated");
return typeMapping;
}
@@ -154,10 +155,10 @@
*/
public WSDLDefinitions generate(Class endpoint)
{
- WSDLDefinitions wsdl = new WSDLDefinitions();
+ WSDLDefinitions wsdl = new WSDLDefinitions();
wsdl.setWsdlNamespace(this.wsdlNamespace);
- if(umd != null)
+ if (umd != null)
{
JavaToWSDLHelper helper = new JavaToWSDLHelper(wsdl, wsdlNamespace);
try
@@ -170,7 +171,7 @@
}
catch (IOException e)
{
- log.error("Error during Java->WSDL generation:",e);
+ log.error("Error during Java->WSDL generation:", e);
}
}
@@ -201,24 +202,23 @@
}
//PRIVATE METHODS
- private void handleJavaToWSDLGeneration(JavaToWSDLHelper helper, String endpointName)
- throws IOException
+ private void handleJavaToWSDLGeneration(JavaToWSDLHelper helper, String endpointName) throws IOException
{
- if(umd == null)
+ if (umd == null)
throw new WSException("Unified Meta Data Model is null");
List<ServiceMetaData> servicelist = umd.getServices();
- for(ServiceMetaData smd: servicelist)
+ for (ServiceMetaData smd : servicelist)
{
List<EndpointMetaData> endpoints = smd.getEndpoints();
- for(EndpointMetaData endpt : endpoints)
+ for (EndpointMetaData endpt : endpoints)
{
// FIXME - The API needs to be reworked instead of using hacks like this
- if (! endpointName.equals(endpt.getServiceEndpointInterfaceName()))
+ if (!endpointName.equals(endpt.getServiceEndpointInterfaceName()))
continue;
// FIXME - We should store the port type
- QName endptName= endpt.getName();
+ QName endptName = endpt.getName();
String intfName = endptName.getLocalPart();
helper.appendDefinitions(endptName.getNamespaceURI());
@@ -227,24 +227,24 @@
intfName = intfName.substring(0, intfName.length() - 4);
List<OperationMetaData> ops = endpt.getOperations();
- for(OperationMetaData op : ops)
+ for (OperationMetaData op : ops)
{
//Generate Types for the individual parameters
List<ParameterMetaData> pmds = op.getParameters();
- for(ParameterMetaData pmd : pmds)
+ for (ParameterMetaData pmd : pmds)
helper.generateTypesForXSD(pmd);
List<FaultMetaData> fmds = op.getFaults();
- for(FaultMetaData fmd: fmds)
+ for (FaultMetaData fmd : fmds)
{
helper.generateTypesForXSD(fmd);
}
ParameterMetaData pmd = op.getReturnParameter();
if (pmd != null)
- helper.generateTypesForXSD(pmd);
+ helper.generateTypesForXSD(pmd);
- helper.generateInterfaces(op, intfName );
+ helper.generateInterfaces(op, intfName);
helper.generateBindings(op, intfName + "Binding");
}
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -32,6 +32,7 @@
import java.util.List;
import java.util.Map;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
@@ -40,7 +41,6 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.jaxrpc.LiteralTypeMapping;
-import org.jboss.ws.jaxrpc.ParameterStyle;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.metadata.EndpointMetaData;
import org.jboss.ws.metadata.OperationMetaData;
@@ -57,7 +57,6 @@
import org.jboss.ws.tools.JavaToWSDL;
import org.jboss.ws.tools.JavaWriter;
import org.jboss.ws.tools.NamespacePackageMapping;
-import org.jboss.ws.tools.ToolsUtils;
import org.jboss.ws.tools.WSDLToJava;
import org.jboss.ws.tools.WSDotXMLCreator;
import org.jboss.ws.tools.Configuration.GlobalConfig;
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -1,36 +1,35 @@
/*
-* 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.
-*/
+ * 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.tools.metadata;
import java.rmi.Remote;
import java.util.List;
import java.util.Map;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
-import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.jaxrpc.ParameterStyle;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.metadata.ServiceMetaData;
import org.jboss.ws.metadata.UnifiedMetaData;
@@ -56,12 +55,11 @@
private Style style;
private ParameterStyle parameterStyle;
- public ToolsUnifiedMetaDataBuilder(Class epClass, String targetNamespace,
- String typeNamespace, String serviceName, Style style, ParameterStyle parameterStyle,
+ public ToolsUnifiedMetaDataBuilder(Class epClass, String targetNamespace, String typeNamespace, String serviceName, Style style, ParameterStyle parameterStyle,
Map<String, List<OperationConfig>> operationMap)
{
this.seiClass = epClass;
- this.targetNamespace = targetNamespace;
+ this.targetNamespace = targetNamespace;
this.typeNamespace = typeNamespace != null ? typeNamespace : targetNamespace;
this.serviceName = serviceName;
this.style = style;
@@ -80,16 +78,17 @@
private void buildMetaData()
{
//Check if it extends Remote Interface
- if( !Remote.class.isAssignableFrom(seiClass))
+ if (!Remote.class.isAssignableFrom(seiClass))
throw new WSException("A service endpoint interface should extend Remote");
um = new UnifiedMetaData();
- String portTypeName = WSDLUtils.getInstance().getJustClassName(seiClass.getName());
+ String seiName = WSDLUtils.getInstance().getJustClassName(seiClass.getName());
if (serviceName == null)
- serviceName = portTypeName + "Service";
+ serviceName = seiName + "Service";
- um.addService(getServiceMetaData(um,targetNamespace, serviceName, portTypeName, seiClass));
+ String portName = seiName + "Port";
+ um.addService(getServiceMetaData(um, targetNamespace, serviceName, portName, seiClass));
generateOperationMetaData(seiClass);
}
@@ -98,19 +97,17 @@
{
ServiceMetaData sm = um.getServices().get(0);
ToolsEndpointMetaData em = (ToolsEndpointMetaData)sm.getEndpointByServiceEndpointInterface(seiClass.getName());
- if(em == null)
+ if (em == null)
throw new WSException("EndpointMetadata is null");
ReflectiveMetaDataBuilder rmb = new ReflectiveMetaDataBuilder(em);
rmb.setOperationMap(operationMap);
em = rmb.generate();
}
- private ServiceMetaData getServiceMetaData(UnifiedMetaData um, String targetNamespace,
- String serviceName, String portTypeName, Class seiClass)
+ private ServiceMetaData getServiceMetaData(UnifiedMetaData um, String targetNamespace, String serviceName, String portName, Class seiClass)
{
- ServiceMetaData sm = new ServiceMetaData(um, new QName(targetNamespace,serviceName));
- ToolsEndpointMetaData tm = new ToolsEndpointMetaData(sm,
- new QName(targetNamespace, portTypeName + "Port"));
+ ServiceMetaData sm = new ServiceMetaData(um, new QName(targetNamespace, serviceName));
+ ToolsEndpointMetaData tm = new ToolsEndpointMetaData(sm, new QName(targetNamespace, portName));
tm.typeNamespace = typeNamespace;
tm.setServiceEndpointInterfaceName(seiClass.getName());
tm.setStyle(style);
Modified: branches/jbossws-1.0/src/test/ant/build-jars.xml
===================================================================
--- branches/jbossws-1.0/src/test/ant/build-jars.xml 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/test/ant/build-jars.xml 2006-08-16 13:53:20 UTC (rev 755)
@@ -289,184 +289,6 @@
</metainf>
</jar>
- <!-- jbossws-jbws1010 -->
- <war warfile="${build.test.dir}/libs/jbossws-jbws1010.war" webxml="${build.test.dir}/resources/jbws1010/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1010/InheritenceChildInterface.class"/>
- <include name="org/jboss/test/ws/jbws1010/InheritenceParentInterface.class"/>
- <include name="org/jboss/test/ws/jbws1010/TestEndpointImpl.class"/>
- </classes>
- <webinf dir="${build.test.dir}/resources/jbws1010/WEB-INF">
- <include name="webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar destfile="${build.test.dir}/libs/jbossws-jbws1010-client.jar">
- <fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1010/InheritenceChildInterface.class"/>
- <include name="org/jboss/test/ws/jbws1010/InheritenceParentInterface.class"/>
- </fileset>
- <metainf dir="${build.test.dir}/resources/jbws1010/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${build.test.dir}/resources/jbws1010/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jbossws-jbws1011 -->
- <jar destfile="${build.test.dir}/libs/jbossws-jbws1011.jar">
- <fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1011/SimpleEntityLocal.class"/>
- <include name="org/jboss/test/ws/jbws1011/SimpleEntityHome.class"/>
- <include name="org/jboss/test/ws/jbws1011/SimpleEntityBean.class"/>
- <include name="org/jboss/test/ws/jbws1011/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jbws1011/TestEndpointBean.class"/>
- </fileset>
- <metainf dir="${build.test.dir}/resources/jbws1011/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="jbosscmp-jdbc.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/TestService.wsdl"/>
- </metainf>
- </jar>
- <jar destfile="${build.test.dir}/libs/jbossws-jbws1011-client.jar">
- <fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1011/TestEndpoint.class"/>
- </fileset>
- <metainf dir="${build.test.dir}/resources/jbws1011/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jbossws-jbws1107 -->
- <war warfile="${build.test.dir}/libs/jbossws-jbws1107.war" webxml="${build.test.dir}/resources/jbws1107/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1107/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jbws1107/TestEndpointImpl.class"/>
- </classes>
- <webinf dir="${build.test.dir}/resources/jbws1107/WEB-INF">
- <include name="webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar destfile="${build.test.dir}/libs/jbossws-jbws1107-client.jar">
- <fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1107/TestEndpoint.class"/>
- </fileset>
- <metainf dir="${build.test.dir}/resources/jbws1107/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${build.test.dir}/resources/jbws1107/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jbossws-jbws1121 -->
- <war destfile="${build.test.dir}/libs/jbossws-jbws1121.war" webxml="${build.test.dir}/resources/jbws1121/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1121/HelloWorld.class"/>
- <include name="org/jboss/test/ws/jbws1121/HelloWorldBean.class"/>
- </classes>
- <webinf dir="${build.test.dir}/resources/jbws1121/WEB-INF">
- <include name="webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/*"/>
- <include name="jboss-wsse-server.xml"/>
- </webinf>
- <webinf dir="${build.test.dir}/resources/jbws1121">
- <include name="wsse.keystore"/>
- <include name="wsse.truststore"/>
- </webinf>
- </war>
- <jar destfile="${build.test.dir}/libs/jbossws-jbws1121-client.jar">
- <fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1121/HelloWorld.class"/>
- </fileset>
- <metainf dir="${build.test.dir}/resources/jbws1121/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jboss-wsse-client.xml"/>
- </metainf>
- <metainf dir="${build.test.dir}/resources/jbws1121/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/*"/>
- </metainf>
- <metainf dir="${build.test.dir}/resources/jbws1121">
- <include name="wsse.keystore"/>
- <include name="wsse.truststore"/>
- </metainf>
- </jar>
- <ear destfile="${build.test.dir}/libs/jbossws-jbws1121.ear"
- appxml="${build.test.dir}/resources/jbws1121/META-INF/application.xml">
- <fileset dir="${build.test.dir}/libs">
- <include name="jbossws-jbws1121-client.jar"/>
- <include name="jbossws-jbws1121.war"/>
- </fileset>
- <metainf dir="${build.test.dir}/resources/jbws1121/META-INF">
- <include name="jboss-app.xml"/>
- </metainf>
- </ear>
-
- <!-- jbossws-jbws1124one -->
- <copy todir="${build.test.dir}/resources" overwrite="true">
- <fileset dir="${test.resources.dir}">
- <include name="jbws1124/META-INF/jboss-client.xml"/>
- <include name="jbws1124/WEB-INF/test-resource.txt"/>
- <include name="jbws1124/WEB-INF/jboss-web.xml"/>
- </fileset>
- <filterset>
- <filter token="jbws1124.domain" value="jbws1124one"/>
- </filterset>
- </copy>
- <war warfile="${build.test.dir}/libs/jbossws-jbws1124one.war" webxml="${build.test.dir}/resources/jbws1124/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1124/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jbws1124/TestEndpointImpl.class"/>
- </classes>
- <webinf dir="${build.test.dir}/resources/jbws1124/WEB-INF">
- <include name="webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="test-resource.txt"/>
- <include name="jboss-web.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <!-- jbossws-jbws1124two -->
- <copy todir="${build.test.dir}/resources" overwrite="true">
- <fileset dir="${test.resources.dir}">
- <include name="jbws1124/META-INF/jboss-client.xml"/>
- <include name="jbws1124/WEB-INF/test-resource.txt"/>
- <include name="jbws1124/WEB-INF/jboss-web.xml"/>
- </fileset>
- <filterset>
- <filter token="jbws1124.domain" value="jbws1124two"/>
- </filterset>
- </copy>
- <war warfile="${build.test.dir}/libs/jbossws-jbws1124two.war" webxml="${build.test.dir}/resources/jbws1124/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1124/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jbws1124/TestEndpointImpl.class"/>
- </classes>
- <webinf dir="${build.test.dir}/resources/jbws1124/WEB-INF">
- <include name="webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="test-resource.txt"/>
- <include name="jboss-web.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
-
<!-- jbossws-jbws231 -->
<war warfile="${build.test.dir}/libs/jbossws-jbws231.war" webxml="${build.test.dir}/resources/jbws231/WEB-INF/web.xml">
<classes dir="${build.test.dir}/classes">
@@ -791,6 +613,214 @@
</webinf>
</war>
+ <!-- jbossws-jbws1010 -->
+ <war warfile="${build.test.dir}/libs/jbossws-jbws1010.war" webxml="${build.test.dir}/resources/jbws1010/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1010/InheritenceChildInterface.class"/>
+ <include name="org/jboss/test/ws/jbws1010/InheritenceParentInterface.class"/>
+ <include name="org/jboss/test/ws/jbws1010/TestEndpointImpl.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jbws1010/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${build.test.dir}/libs/jbossws-jbws1010-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1010/InheritenceChildInterface.class"/>
+ <include name="org/jboss/test/ws/jbws1010/InheritenceParentInterface.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1010/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jbws1010/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jbossws-jbws1011 -->
+ <jar destfile="${build.test.dir}/libs/jbossws-jbws1011.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1011/SimpleEntityLocal.class"/>
+ <include name="org/jboss/test/ws/jbws1011/SimpleEntityHome.class"/>
+ <include name="org/jboss/test/ws/jbws1011/SimpleEntityBean.class"/>
+ <include name="org/jboss/test/ws/jbws1011/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jbws1011/TestEndpointBean.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1011/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="jbosscmp-jdbc.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/TestService.wsdl"/>
+ </metainf>
+ </jar>
+ <jar destfile="${build.test.dir}/libs/jbossws-jbws1011-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1011/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1011/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jbossws-jbws1107 -->
+ <war warfile="${build.test.dir}/libs/jbossws-jbws1107.war" webxml="${build.test.dir}/resources/jbws1107/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1107/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jbws1107/TestEndpointImpl.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jbws1107/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${build.test.dir}/libs/jbossws-jbws1107-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1107/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1107/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jbws1107/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jbossws-jbws1121 -->
+ <war destfile="${build.test.dir}/libs/jbossws-jbws1121.war" webxml="${build.test.dir}/resources/jbws1121/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1121/HelloWorld.class"/>
+ <include name="org/jboss/test/ws/jbws1121/HelloWorldBean.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jbws1121/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/*"/>
+ <include name="jboss-wsse-server.xml"/>
+ </webinf>
+ <webinf dir="${build.test.dir}/resources/jbws1121">
+ <include name="wsse.keystore"/>
+ <include name="wsse.truststore"/>
+ </webinf>
+ </war>
+ <jar destfile="${build.test.dir}/libs/jbossws-jbws1121-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1121/HelloWorld.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1121/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jboss-wsse-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jbws1121/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/*"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jbws1121">
+ <include name="wsse.keystore"/>
+ <include name="wsse.truststore"/>
+ </metainf>
+ </jar>
+ <ear destfile="${build.test.dir}/libs/jbossws-jbws1121.ear"
+ appxml="${build.test.dir}/resources/jbws1121/META-INF/application.xml">
+ <fileset dir="${build.test.dir}/libs">
+ <include name="jbossws-jbws1121-client.jar"/>
+ <include name="jbossws-jbws1121.war"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1121/META-INF">
+ <include name="jboss-app.xml"/>
+ </metainf>
+ </ear>
+
+ <!-- jbossws-jbws1124one -->
+ <copy todir="${build.test.dir}/resources" overwrite="true">
+ <fileset dir="${test.resources.dir}">
+ <include name="jbws1124/META-INF/jboss-client.xml"/>
+ <include name="jbws1124/WEB-INF/test-resource.txt"/>
+ <include name="jbws1124/WEB-INF/jboss-web.xml"/>
+ </fileset>
+ <filterset>
+ <filter token="jbws1124.domain" value="jbws1124one"/>
+ </filterset>
+ </copy>
+ <war warfile="${build.test.dir}/libs/jbossws-jbws1124one.war" webxml="${build.test.dir}/resources/jbws1124/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1124/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jbws1124/TestEndpointImpl.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jbws1124/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="test-resource.txt"/>
+ <include name="jboss-web.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <!-- jbossws-jbws1124two -->
+ <copy todir="${build.test.dir}/resources" overwrite="true">
+ <fileset dir="${test.resources.dir}">
+ <include name="jbws1124/META-INF/jboss-client.xml"/>
+ <include name="jbws1124/WEB-INF/test-resource.txt"/>
+ <include name="jbws1124/WEB-INF/jboss-web.xml"/>
+ </fileset>
+ <filterset>
+ <filter token="jbws1124.domain" value="jbws1124two"/>
+ </filterset>
+ </copy>
+ <war warfile="${build.test.dir}/libs/jbossws-jbws1124two.war" webxml="${build.test.dir}/resources/jbws1124/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1124/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jbws1124/TestEndpointImpl.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jbws1124/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="test-resource.txt"/>
+ <include name="jboss-web.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+
+ <!-- jbossws-jbws1125 -->
+ <war warfile="${build.test.dir}/libs/jbossws-jbws1125.war" webxml="${build.test.dir}/resources/jbws1125/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1125/TestEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jbws1125/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jbws1125/*RequestStruct.class"/>
+ <include name="org/jboss/test/ws/jbws1125/*ResponseStruct.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jbws1125/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${build.test.dir}/libs/jbossws-jbws1125-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1125/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jbws1125/*RequestStruct.class"/>
+ <include name="org/jboss/test/ws/jbws1125/*ResponseStruct.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1125/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jbws1125/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
<!-- jbossws-jsr181-handlerchain -->
<war warfile="${build.test.dir}/libs/jbossws-jsr181-handlerchain.war" webxml="${build.test.dir}/resources/jsr181/handlerchain/WEB-INF/web.xml">
<classes dir="${build.test.dir}/classes">
Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/JBWS1125TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/JBWS1125TestCase.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/JBWS1125TestCase.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -0,0 +1,94 @@
+/*
+ * 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.jbws1125;
+
+// $Id: $
+
+import java.io.ByteArrayInputStream;
+
+import javax.naming.InitialContext;
+import javax.xml.rpc.Service;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPConnection;
+import javax.xml.soap.SOAPConnectionFactory;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPMessage;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.JBossWSTestSetup;
+
+/**
+ * Support empty soap body elements
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-1125
+ *
+ * @author Thomas.Diesler at jboss.com
+ * @since 16-August-2006
+ */
+public class JBWS1125TestCase extends JBossWSTest
+{
+ private static TestEndpoint port;
+
+ public static Test suite() throws Exception
+ {
+ return JBossWSTestSetup.newTestSetup(JBWS1125TestCase.class, "jbossws-jbws1125.war, jbossws-jbws1125-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 testClientAccess() throws Exception
+ {
+ String retObj = port.noParamPart();
+ assertEquals("noParamPart", retObj);
+
+ port.noReturnPart("hello");
+ }
+
+ public void _testMessageAccess() throws Exception
+ {
+ String reqEnv =
+ "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
+ " <env:Body/>" +
+ "</env:Envelope>";
+
+ MessageFactory msgFactory = MessageFactory.newInstance();
+ SOAPMessage soapMessage = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes()));
+
+ SOAPConnectionFactory conFactory = SOAPConnectionFactory.newInstance();
+ SOAPConnection con = conFactory.createConnection();
+ SOAPMessage resMessage = con.call(soapMessage, "http://" + getServerHost() + ":8080/jbossws-jbws1125");
+ SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next();
+ assertEquals("noParamPartResponse", soapElement.getElementName().getLocalName());
+
+ }
+}
Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/JBWS1125TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -0,0 +1,32 @@
+/*
+ * 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.jbws1125;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+public interface TestEndpoint extends Remote
+{
+ public String noParamPart() throws RemoteException;
+
+ public void noReturnPart(String param) throws RemoteException;
+}
Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpointImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpointImpl.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpointImpl.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -0,0 +1,41 @@
+/*
+ * 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.jbws1125;
+
+import org.jboss.logging.Logger;
+
+public class TestEndpointImpl implements TestEndpoint
+{
+ private Logger log = Logger.getLogger(TestEndpointImpl.class);
+
+ public String noParamPart()
+ {
+ log.info("noParamPart");
+ return "noParamPart";
+ }
+
+ public void noReturnPart(String param)
+ {
+ log.info("noReturnPart: " + param);
+ }
+
+}
Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_RequestStruct.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_RequestStruct.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_RequestStruct.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -0,0 +1,18 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Aug 16 14:41:18 CEST 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.jbws1125;
+
+
+public class TestEndpoint_noParamPart_RequestStruct
+{
+public TestEndpoint_noParamPart_RequestStruct(){
+}
+}
Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_RequestStruct.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_ResponseStruct.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_ResponseStruct.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_ResponseStruct.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Aug 16 14:41:18 CEST 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.jbws1125;
+
+
+public class TestEndpoint_noParamPart_ResponseStruct
+{
+
+protected java.lang.String result;
+public TestEndpoint_noParamPart_ResponseStruct(){}
+
+public TestEndpoint_noParamPart_ResponseStruct(java.lang.String result){
+this.result=result;
+}
+public java.lang.String getResult() { return result ;}
+
+public void setResult(java.lang.String result){ this.result=result; }
+
+}
Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_ResponseStruct.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_RequestStruct.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_RequestStruct.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_RequestStruct.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Aug 16 14:41:18 CEST 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.jbws1125;
+
+
+public class TestEndpoint_noReturnPart_RequestStruct
+{
+
+protected java.lang.String string_1;
+public TestEndpoint_noReturnPart_RequestStruct(){}
+
+public TestEndpoint_noReturnPart_RequestStruct(java.lang.String string_1){
+this.string_1=string_1;
+}
+public java.lang.String getString_1() { return string_1 ;}
+
+public void setString_1(java.lang.String string_1){ this.string_1=string_1; }
+
+}
Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_RequestStruct.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_ResponseStruct.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_ResponseStruct.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_ResponseStruct.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -0,0 +1,18 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Aug 16 14:41:18 CEST 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.jbws1125;
+
+
+public class TestEndpoint_noReturnPart_ResponseStruct
+{
+public TestEndpoint_noReturnPart_ResponseStruct(){
+}
+}
Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_ResponseStruct.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java 2006-08-16 13:53:20 UTC (rev 755)
@@ -25,6 +25,7 @@
import java.io.File;
import java.net.URL;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
import javax.xml.soap.MessageFactory;
@@ -38,7 +39,6 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.jaxrpc.CallImpl;
-import org.jboss.ws.jaxrpc.ParameterStyle;
import org.jboss.ws.jaxrpc.ServiceFactoryImpl;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.jaxrpc.Use;
Added: branches/jbossws-1.0/src/test/resources/jbws1125/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1125/META-INF/application-client.xml 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/test/resources/jbws1125/META-INF/application-client.xml 2006-08-16 13:53:20 UTC (rev 755)
@@ -0,0 +1,21 @@
+<?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>HelloService</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.jbws1125.TestEndpoint</service-endpoint-interface>
+ </port-component-ref>
+ </service-ref>
+
+</application-client>
+
Property changes on: branches/jbossws-1.0/src/test/resources/jbws1125/META-INF/application-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jbws1125/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1125/META-INF/jboss-client.xml 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/test/resources/jbws1125/META-INF/jboss-client.xml 2006-08-16 13:53:20 UTC (rev 755)
@@ -0,0 +1,15 @@
+<?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/jbossws-jbws1125?wsdl</wsdl-override>
+ </service-ref>
+
+</jboss-client>
Property changes on: branches/jbossws-1.0/src/test/resources/jbws1125/META-INF/jboss-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/jaxrpc-mapping.xml 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/jaxrpc-mapping.xml 2006-08-16 13:53:20 UTC (rev 755)
@@ -0,0 +1,71 @@
+<?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.jbws1125</package-type>
+ <namespaceURI>http://jbws1125.ws.test.jboss.org/jaws/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1125.TestEndpoint_noParamPart_RequestStruct</java-type>
+ <root-type-qname xmlns:typeNS='http://jbws1125.ws.test.jboss.org/jaws/types'>typeNS:noParamPart</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1125.TestEndpoint_noParamPart_ResponseStruct</java-type>
+ <root-type-qname xmlns:typeNS='http://jbws1125.ws.test.jboss.org/jaws/types'>typeNS:noParamPartResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1125.TestEndpoint_noReturnPart_RequestStruct</java-type>
+ <root-type-qname xmlns:typeNS='http://jbws1125.ws.test.jboss.org/jaws/types'>typeNS:noReturnPart</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>string_1</java-variable-name>
+ <xml-element-name>String_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1125.TestEndpoint_noReturnPart_ResponseStruct</java-type>
+ <root-type-qname xmlns:typeNS='http://jbws1125.ws.test.jboss.org/jaws/types'>typeNS:noReturnPartResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1125.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://jbws1125.ws.test.jboss.org/jaws'>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.jbws1125.TestEndpoint</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://jbws1125.ws.test.jboss.org/jaws'>portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://jbws1125.ws.test.jboss.org/jaws'>bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>noParamPart</java-method-name>
+ <wsdl-operation>noParamPart</wsdl-operation>
+ <wrapped-element/>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.String</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://jbws1125.ws.test.jboss.org/jaws'>wsdlMsgNS:TestEndpoint_noParamPartResponse</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>noReturnPart</java-method-name>
+ <wsdl-operation>noReturnPart</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://jbws1125.ws.test.jboss.org/jaws'>wsdlMsgNS:TestEndpoint_noReturnPart</wsdl-message>
+ <wsdl-message-part-name>String_1</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
Property changes on: branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/web.xml 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/web.xml 2006-08-16 13:53:20 UTC (rev 755)
@@ -0,0 +1,19 @@
+<?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.jbws1125.TestEndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Property changes on: branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/webservices.xml 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/webservices.xml 2006-08-16 13:53:20 UTC (rev 755)
@@ -0,0 +1,15 @@
+<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://jbws1125.ws.test.jboss.org/jaws' 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.jbws1125.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
Property changes on: branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/webservices.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/wsdl/TestService.wsdl 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/wsdl/TestService.wsdl 2006-08-16 13:53:20 UTC (rev 755)
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestService' targetNamespace='http://jbws1125.ws.test.jboss.org/jaws' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://jbws1125.ws.test.jboss.org/jaws/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://jbws1125.ws.test.jboss.org/jaws' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://jbws1125.ws.test.jboss.org/jaws/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://jbws1125.ws.test.jboss.org/jaws/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name='noParamPart'>
+ <sequence/>
+ </complexType>
+ <complexType name='noParamPartResponse'>
+ <sequence>
+ <element name='result' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ <complexType name='noReturnPart'>
+ <sequence>
+ <element name='String_1' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ <complexType name='noReturnPartResponse'>
+ <sequence/>
+ </complexType>
+ <element name='noParamPart' type='tns:noParamPart'/>
+ <element name='noParamPartResponse' type='tns:noParamPartResponse'/>
+ <element name='noReturnPart' type='tns:noReturnPart'/>
+ <element name='noReturnPartResponse' type='tns:noReturnPartResponse'/>
+ </schema>
+ </types>
+
+ <!--
+ BP-1.0 5.3.1 Bindings and Parts
+ Use of wsdl:message elements with zero parts is permitted in Document styles to permit operations
+ that can send or receive messages with empty soap:Bodys.
+ -->
+ <message name='TestEndpoint_noParamPart'>
+ <!-- part element='ns1:noParamPart' name='parameters'/ -->
+ </message>
+ <message name='TestEndpoint_noParamPartResponse'>
+ <part element='ns1:noParamPartResponse' name='result'/>
+ </message>
+
+ <message name='TestEndpoint_noReturnPart'>
+ <part element='ns1:noReturnPart' name='parameters'/>
+ </message>
+ <message name='TestEndpoint_noReturnPartResponse'>
+ <!-- part element='ns1:noReturnPartResponse' name='result'/ -->
+ </message>
+
+ <portType name='TestEndpoint'>
+ <operation name='noParamPart'>
+ <input message='tns:TestEndpoint_noParamPart'/>
+ <output message='tns:TestEndpoint_noParamPartResponse'/>
+ </operation>
+ <operation name='noReturnPart'>
+ <input message='tns:TestEndpoint_noReturnPart'/>
+ <output message='tns:TestEndpoint_noReturnPartResponse'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='noParamPart'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='noReturnPart'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body 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
Property changes on: branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/wsdl/TestService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.0/src/test/resources/jbws1125/wstools-config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1125/wstools-config.xml 2006-08-16 13:11:15 UTC (rev 754)
+++ branches/jbossws-1.0/src/test/resources/jbws1125/wstools-config.xml 2006-08-16 13:53:20 UTC (rev 755)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+-->
+
+<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.jbws1125.TestEndpoint" style="document">
+ </service>
+ <namespaces target-namespace="http://jbws1125.ws.test.jboss.org/jaws" type-namespace="http://jbws1125.ws.test.jboss.org/jaws/types"/>
+ <mapping file="jaxrpc-mapping.xml"/>
+ <webservices servlet-link="TestEndpoint"/>
+ </java-wsdl>
+</configuration>
+
Property changes on: branches/jbossws-1.0/src/test/resources/jbws1125/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
More information about the jboss-svn-commits
mailing list