[jboss-cvs] JBossAS SVN: r57759 - in branches/JBoss_4_0_2_CP: common/src/main/org/jboss/util/loading common/src/main/org/jboss/util/xml jaxrpc/src/main/org/jboss/axis/encoding jaxrpc/src/main/org/jboss/axis/encoding/ser testsuite/imports testsuite/src/main/org/jboss/test/webservice testsuite/src/main/org/jboss/test/webservice/case10977 testsuite/src/main/org/jboss/test/webservice/jbws349 testsuite/src/resources/webservice testsuite/src/resources/webservice/case10977 testsuite/src/resources/webservice/case10977/WEB-INF testsuite/src/resources/webservice/case10977/WEB-INF/wsdl testsuite/src/resources/webservice/jbws349 testsuite/src/resources/webservice/jbws349/META-INF testsuite/src/resources/webservice/jbws349/WEB-INF testsuite/src/resources/webservice/jbws349/WEB-INF/wsdl webservice/src/main/org/jboss/webservice/deployment webservice/src/main/org/jboss/webservice/encoding/ser
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 20 13:05:31 EDT 2006
Author: fnasser at redhat.com
Date: 2006-10-20 13:05:17 -0400 (Fri, 20 Oct 2006)
New Revision: 57759
Added:
branches/JBoss_4_0_2_CP/common/src/main/org/jboss/util/xml/DOMUtils.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/ArrayOfSessionAttribute.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/Case10977TestCase.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/ServiceDeliveryAPI.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/ServiceDeliveryPlatformException.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionAttribute.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomain.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomainImpl.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomain_getSessionAttributeNames_RequestStruct.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomain_getSessionAttributeNames_ResponseStruct.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/UpstreamClientApplication.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetCreate.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetCreateResult.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetRead.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetReadResult.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/Event.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/EventException.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/JBWS349TestCase.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/Result.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/ServiceFacadeEndpoint.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/ServiceFacadeEndpointImpl.java
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/jaxrpc-mapping.xml
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/web.xml
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/webservices.xml
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/wsdl/
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/wsdl/servicedelivery.wsdl
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/wsconfig.xml
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/META-INF/
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/META-INF/application-client.xml
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/META-INF/jboss-client.xml
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/jaxrpc-mapping.xml
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/web.xml
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/webservices.xml
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/wsdl/
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/wsdl/ServiceFacade.wsdl
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/wsdl/ServiceFacade.xsd
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/config.xml
Removed:
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/ArrayOfSessionAttribute.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/Case10977TestCase.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/ServiceDeliveryAPI.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/ServiceDeliveryPlatformException.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionAttribute.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomain.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomainImpl.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomain_getSessionAttributeNames_RequestStruct.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomain_getSessionAttributeNames_ResponseStruct.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/UpstreamClientApplication.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetCreate.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetCreateResult.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetRead.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetReadResult.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/Event.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/EventException.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/JBWS349TestCase.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/Result.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/ServiceFacadeEndpoint.java
branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/ServiceFacadeEndpointImpl.java
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/jaxrpc-mapping.xml
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/web.xml
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/webservices.xml
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/wsdl/
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/wsdl/servicedelivery.wsdl
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/wsconfig.xml
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/META-INF/
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/META-INF/application-client.xml
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/META-INF/jboss-client.xml
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/jaxrpc-mapping.xml
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/web.xml
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/webservices.xml
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/wsdl/
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/wsdl/ServiceFacade.wsdl
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/wsdl/ServiceFacade.xsd
branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/config.xml
Modified:
branches/JBoss_4_0_2_CP/common/src/main/org/jboss/util/loading/DelegatingClassLoader.java
branches/JBoss_4_0_2_CP/jaxrpc/src/main/org/jboss/axis/encoding/SerializationContextImpl.java
branches/JBoss_4_0_2_CP/jaxrpc/src/main/org/jboss/axis/encoding/ser/BeanSerializer.java
branches/JBoss_4_0_2_CP/testsuite/imports/test-jars.xml
branches/JBoss_4_0_2_CP/webservice/src/main/org/jboss/webservice/deployment/BeanXMLMetaData.java
branches/JBoss_4_0_2_CP/webservice/src/main/org/jboss/webservice/deployment/OperationDescription.java
branches/JBoss_4_0_2_CP/webservice/src/main/org/jboss/webservice/deployment/ServiceDescription.java
branches/JBoss_4_0_2_CP/webservice/src/main/org/jboss/webservice/encoding/ser/MetaDataTypeDesc.java
Log:
ASPATCH-73: JBWS-863: Errornous element in soap response
Modified: branches/JBoss_4_0_2_CP/common/src/main/org/jboss/util/loading/DelegatingClassLoader.java
===================================================================
--- branches/JBoss_4_0_2_CP/common/src/main/org/jboss/util/loading/DelegatingClassLoader.java 2006-10-20 17:01:02 UTC (rev 57758)
+++ branches/JBoss_4_0_2_CP/common/src/main/org/jboss/util/loading/DelegatingClassLoader.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -24,11 +24,11 @@
* @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
* @version $Revision$
*/
-public class DelegatingClassLoader
- extends URLClassLoader
+public class DelegatingClassLoader extends URLClassLoader
{
/** The value returned by {@link getURLs}. */
- public static final URL[] EMPTY_URL_ARRAY = {};
+ public static final URL[] EMPTY_URL_ARRAY =
+ {};
/** Whether to use standard loading */
protected boolean standard = false;
@@ -66,15 +66,26 @@
* @return the loaded class
* @throws ClassNotFoundException when the class could not be found
*/
- protected Class loadClass(String className, boolean resolve)
- throws ClassNotFoundException
+ protected Class loadClass(String className, boolean resolve) throws ClassNotFoundException
{
// Revert to standard rules
if (standard)
return super.loadClass(className, resolve);
// Ask the parent
- Class clazz = getParent().loadClass(className);
+ Class clazz = null;
+ try
+ {
+ clazz = getParent().loadClass(className);
+ }
+ catch (ClassNotFoundException e)
+ {
+ // Not found in parent,
+ // maybe it is a proxy registered against this classloader?
+ clazz = findLoadedClass(className);
+ if (clazz == null)
+ throw e;
+ }
// Link the class
if (resolve)
Copied: branches/JBoss_4_0_2_CP/common/src/main/org/jboss/util/xml/DOMUtils.java (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/common/src/main/org/jboss/util/xml/DOMUtils.java)
Modified: branches/JBoss_4_0_2_CP/jaxrpc/src/main/org/jboss/axis/encoding/SerializationContextImpl.java
===================================================================
--- branches/JBoss_4_0_2_CP/jaxrpc/src/main/org/jboss/axis/encoding/SerializationContextImpl.java 2006-10-20 17:01:02 UTC (rev 57758)
+++ branches/JBoss_4_0_2_CP/jaxrpc/src/main/org/jboss/axis/encoding/SerializationContextImpl.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -298,7 +298,9 @@
// whether the elements should have xsi:type attributes.
// Only turn this off is the user tells us to
if (!msgContext.isPropertyTrue(Call.SEND_TYPE_ATTR, true))
+ {
sendXSIType = false;
+ }
Boolean opt = (Boolean)optionSource.getOption(AxisEngine.PROP_SEND_XSI);
if ((opt != null) && (opt.equals(Boolean.FALSE)))
@@ -1394,8 +1396,7 @@
Boolean sendType)
throws IOException
{
- boolean shouldSendType = (sendType == null) ? shouldSendXSIType() :
- sendType.booleanValue();
+ boolean shouldSendType = (sendType != null ? sendType.booleanValue() : shouldSendXSIType());
if (value != null)
{
@@ -1425,16 +1426,18 @@
QNameHolder actualXMLType = new QNameHolder();
Serializer ser = getSerializer(javaType, xmlType, actualXMLType);
+ if (xmlType != null && shouldSendType == false)
+ {
+ shouldSendType = !xmlType.equals(actualXMLType.value);
+ }
+
if (ser != null)
{
// Send the xmlType if indicated or if
// the actual xmlType is different than the
// prefered xmlType
- if (shouldSendType || (xmlType != null && !xmlType.equals(actualXMLType.value)))
+ if (shouldSendType)
{
- // Only do this if we are encoded
- // TDI 21-June-2004
- if (msgContext != null && msgContext.isEncoded())
attributes = setTypeAttribute(attributes, actualXMLType.value);
}
Modified: branches/JBoss_4_0_2_CP/jaxrpc/src/main/org/jboss/axis/encoding/ser/BeanSerializer.java
===================================================================
--- branches/JBoss_4_0_2_CP/jaxrpc/src/main/org/jboss/axis/encoding/ser/BeanSerializer.java 2006-10-20 17:01:02 UTC (rev 57758)
+++ branches/JBoss_4_0_2_CP/jaxrpc/src/main/org/jboss/axis/encoding/ser/BeanSerializer.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -214,6 +214,18 @@
if (typeDesc != null)
{
FieldDesc field = typeDesc.getFieldByName(propName);
+
+ if (field == null)
+ {
+ String upperName = propName.substring(0, 1).toUpperCase() + propName.substring(1);
+ field = typeDesc.getFieldByName(upperName);
+ }
+ if (field == null)
+ {
+ String lowerName = propName.substring(0, 1).toLowerCase() + propName.substring(1);
+ field = typeDesc.getFieldByName(lowerName);
+ }
+
if (field != null)
{
Modified: branches/JBoss_4_0_2_CP/testsuite/imports/test-jars.xml
===================================================================
--- branches/JBoss_4_0_2_CP/testsuite/imports/test-jars.xml 2006-10-20 17:01:02 UTC (rev 57758)
+++ branches/JBoss_4_0_2_CP/testsuite/imports/test-jars.xml 2006-10-20 17:05:17 UTC (rev 57759)
@@ -4667,6 +4667,20 @@
</metainf>
</jar>
+ <!-- ws4ee-case10977 -->
+ <war warfile="${build.lib}/ws4ee-case10977.war"
+ webxml="${source.resources}/webservice/case10977/WEB-INF/web.xml">
+ <classes dir="${build.classes}">
+ <include name="org/jboss/test/webservice/case10977/*.class"/>
+ <exclude name="org/jboss/test/webservice/case10977/Case10977TestCase.class"/>
+ </classes>
+ <webinf dir="${source.resources}/webservice/case10977/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ </webinf>
+ </war>
+
<!-- ws4ee-contextroot -->
<jar destfile="${build.lib}/ws4ee-contextmodule.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
@@ -5258,6 +5272,34 @@
</metainf>
</jar>
+ <!-- ws4ee-jbws349 -->
+ <war warfile="${build.lib}/ws4ee-jbws349.war" webxml="${build.resources}/webservice/jbws349/WEB-INF/web.xml">
+ <classes dir="${build.classes}">
+ <include name="org/jboss/test/webservice/jbws349/*"/>
+ <exclude name="org/jboss/test/webservice/jbws349/*TestCase.class"/>
+ </classes>
+ <webinf dir="${build.resources}/webservice/jbws349/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${build.lib}/ws4ee-jbws349-client.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/webservice/jbws349/*"/>
+ <exclude name="org/jboss/test/webservice/jbws349/*EndpointImpl.class"/>
+ <exclude name="org/jboss/test/webservice/jbws349/*TestCase.class"/>
+ </fileset>
+ <metainf dir="${build.resources}/webservice/jbws349/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${build.resources}/webservice/jbws349/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
<!-- ws4ee-marshall-doclit -->
<jar destfile="${build.lib}/ws4ee-marshall-doclit.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977 (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/case10977)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/ArrayOfSessionAttribute.java
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/case10977/ArrayOfSessionAttribute.java 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/ArrayOfSessionAttribute.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,26 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.webservice.case10977;
-
-
-public class ArrayOfSessionAttribute {
- protected SessionAttribute[] attribute;
-
- public ArrayOfSessionAttribute() {
- }
-
- public ArrayOfSessionAttribute(SessionAttribute[] attribute) {
- this.attribute = attribute;
- }
-
- public SessionAttribute[] getAttribute() {
- return attribute;
- }
-
- public void setAttribute(SessionAttribute[] attribute) {
- this.attribute = attribute;
- }
-}
Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/ArrayOfSessionAttribute.java (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/case10977/ArrayOfSessionAttribute.java)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/Case10977TestCase.java
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/case10977/Case10977TestCase.java 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/Case10977TestCase.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,62 +0,0 @@
-/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.test.webservice.case10977;
-
-// $Id$
-
-import java.io.File;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Service;
-import javax.xml.rpc.ServiceFactory;
-
-import junit.framework.Test;
-
-import org.jboss.test.webservice.WebserviceTestBase;
-import org.jboss.webservice.client.ServiceFactoryImpl;
-
-/** Soap encoded arrays used over ValueObjArray
- *
- * https://na1.salesforce.com/50030000002VEin
- *
- * @author Thomas.Diesler at jboss.org
- * @since 04-Sep-2006
- */
-public class Case10977TestCase extends WebserviceTestBase
-{
- private static String NS_URI = "http://schemas.SDP.com/wsdl/1.0";
-
- public Case10977TestCase(String name)
- {
- super(name);
- }
-
- /** Deploy the test */
- public static Test suite() throws Exception
- {
- return getDeploySetup(Case10977TestCase.class, "ws4ee-case10977.war");
- }
-
- public void testEndpoint() throws Exception
- {
- QName serviceName = new QName(NS_URI, "ServiceDeliveryAPI");
-
- File wsdl = new File("resources/webservice/case10977/WEB-INF/wsdl/servicedelivery.wsdl");
- assertTrue(wsdl.exists());
- File mapping = new File("resources/webservice/case10977/WEB-INF/jaxrpc-mapping.xml");
- assertTrue(mapping.exists());
-
- ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance();
- Service service = factory.createService(wsdl.toURL(), mapping.toURL(), null, serviceName, "SessionDomainPort");
- SessionDomain port = (SessionDomain)service.getPort(SessionDomain.class);
-
- UpstreamClientApplication clientApp = new UpstreamClientApplication("apOne");
- ArrayOfSessionAttribute retObj = port.getSessionAttributeNames(clientApp, "pass");
-
- assertEquals(3, retObj.getAttribute().length);
- }
-}
Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/Case10977TestCase.java (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/case10977/Case10977TestCase.java)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/ServiceDeliveryAPI.java
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/case10977/ServiceDeliveryAPI.java 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/ServiceDeliveryAPI.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,12 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.webservice.case10977;
-
-import javax.xml.rpc.*;
-
-public interface ServiceDeliveryAPI extends javax.xml.rpc.Service {
- public org.jboss.test.webservice.case10977.SessionDomain getSessionDomainPort() throws ServiceException;
-}
Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/ServiceDeliveryAPI.java (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/case10977/ServiceDeliveryAPI.java)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/ServiceDeliveryPlatformException.java
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/case10977/ServiceDeliveryPlatformException.java 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/ServiceDeliveryPlatformException.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,62 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.webservice.case10977;
-
-
-public class ServiceDeliveryPlatformException extends Exception {
- private String errorCategory;
- private String errorCode;
- private String errorMessage;
- private String exceptionName;
- private String exceptionStackTrace;
- private String paymentErrorCode;
- private String paymentErrorMessage;
- private String message;
-
-
- public ServiceDeliveryPlatformException(String errorCategory, String errorCode, String errorMessage, String exceptionName, String exceptionStackTrace, String paymentErrorCode, String paymentErrorMessage, String message) {
- this.errorCategory = errorCategory;
- this.errorCode = errorCode;
- this.errorMessage = errorMessage;
- this.exceptionName = exceptionName;
- this.exceptionStackTrace = exceptionStackTrace;
- this.paymentErrorCode = paymentErrorCode;
- this.paymentErrorMessage = paymentErrorMessage;
- this.message = message;
- }
-
- public String getErrorCategory() {
- return errorCategory;
- }
-
- public String getErrorCode() {
- return errorCode;
- }
-
- public String getErrorMessage() {
- return errorMessage;
- }
-
- public String getExceptionName() {
- return exceptionName;
- }
-
- public String getExceptionStackTrace() {
- return exceptionStackTrace;
- }
-
- public String getPaymentErrorCode() {
- return paymentErrorCode;
- }
-
- public String getPaymentErrorMessage() {
- return paymentErrorMessage;
- }
-
- public String getMessage() {
- return message;
- }
-}
Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/ServiceDeliveryPlatformException.java (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/case10977/ServiceDeliveryPlatformException.java)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionAttribute.java
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/case10977/SessionAttribute.java 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionAttribute.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,46 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.webservice.case10977;
-
-
-public class SessionAttribute {
- protected String name;
- protected byte[] value;
- protected Integer version;
-
- public SessionAttribute() {
- }
-
- public SessionAttribute(String name, byte[] value, Integer version) {
- this.name = name;
- this.value = value;
- this.version = version;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public byte[] getValue() {
- return value;
- }
-
- public void setValue(byte[] value) {
- this.value = value;
- }
-
- public Integer getVersion() {
- return version;
- }
-
- public void setVersion(Integer version) {
- this.version = version;
- }
-}
Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionAttribute.java (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/case10977/SessionAttribute.java)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomain.java
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomain.java 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomain.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,11 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.webservice.case10977;
-
-public interface SessionDomain extends java.rmi.Remote {
- public org.jboss.test.webservice.case10977.ArrayOfSessionAttribute getSessionAttributeNames(org.jboss.test.webservice.case10977.UpstreamClientApplication upstreamClientApplication, java.lang.String sessionId) throws
- org.jboss.test.webservice.case10977.ServiceDeliveryPlatformException, java.rmi.RemoteException;
-}
Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomain.java (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomain.java)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomainImpl.java
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomainImpl.java 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomainImpl.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,26 +0,0 @@
-package org.jboss.test.webservice.case10977;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-import org.jboss.logging.Logger;
-
-public class SessionDomainImpl implements SessionDomain, Remote
-{
- private Logger log = Logger.getLogger(SessionDomainImpl.class);
-
- public ArrayOfSessionAttribute getSessionAttributeNames(UpstreamClientApplication upstreamClientApplication, String sessionId)
- throws ServiceDeliveryPlatformException, RemoteException
- {
- log.info("getSessionAttributeNames: " + sessionId);
-
- if (!"pass".equals(sessionId))
- throw new ServiceDeliveryPlatformException("errorCategory", "errorCode", "errorMessage", "exceptionName", "exceptionStackTrace", "paymentErrorCode", "paymentErrorMessage", "message");
-
- SessionAttribute sa1 = new SessionAttribute("name1", "abc".getBytes(), new Integer(1));
- SessionAttribute sa2 = new SessionAttribute("name2", "def".getBytes(), new Integer(2));
- SessionAttribute sa3 = new SessionAttribute("name3", "ghi".getBytes(), new Integer(3));
- ArrayOfSessionAttribute retVal = new ArrayOfSessionAttribute(new SessionAttribute[] {sa1, sa2, sa3});
- return retVal;
- }
-}
Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomainImpl.java (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomainImpl.java)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomain_getSessionAttributeNames_RequestStruct.java
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomain_getSessionAttributeNames_RequestStruct.java 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomain_getSessionAttributeNames_RequestStruct.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,36 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.webservice.case10977;
-
-
-public class SessionDomain_getSessionAttributeNames_RequestStruct {
- protected org.jboss.test.webservice.case10977.UpstreamClientApplication upstreamClientApplication;
- protected java.lang.String sessionId;
-
- public SessionDomain_getSessionAttributeNames_RequestStruct() {
- }
-
- public SessionDomain_getSessionAttributeNames_RequestStruct(org.jboss.test.webservice.case10977.UpstreamClientApplication upstreamClientApplication, java.lang.String sessionId) {
- this.upstreamClientApplication = upstreamClientApplication;
- this.sessionId = sessionId;
- }
-
- public org.jboss.test.webservice.case10977.UpstreamClientApplication getUpstreamClientApplication() {
- return upstreamClientApplication;
- }
-
- public void setUpstreamClientApplication(org.jboss.test.webservice.case10977.UpstreamClientApplication upstreamClientApplication) {
- this.upstreamClientApplication = upstreamClientApplication;
- }
-
- public java.lang.String getSessionId() {
- return sessionId;
- }
-
- public void setSessionId(java.lang.String sessionId) {
- this.sessionId = sessionId;
- }
-}
Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomain_getSessionAttributeNames_RequestStruct.java (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomain_getSessionAttributeNames_RequestStruct.java)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomain_getSessionAttributeNames_ResponseStruct.java
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomain_getSessionAttributeNames_ResponseStruct.java 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomain_getSessionAttributeNames_ResponseStruct.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,26 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.webservice.case10977;
-
-
-public class SessionDomain_getSessionAttributeNames_ResponseStruct {
- protected org.jboss.test.webservice.case10977.ArrayOfSessionAttribute result;
-
- public SessionDomain_getSessionAttributeNames_ResponseStruct() {
- }
-
- public SessionDomain_getSessionAttributeNames_ResponseStruct(org.jboss.test.webservice.case10977.ArrayOfSessionAttribute result) {
- this.result = result;
- }
-
- public org.jboss.test.webservice.case10977.ArrayOfSessionAttribute getResult() {
- return result;
- }
-
- public void setResult(org.jboss.test.webservice.case10977.ArrayOfSessionAttribute result) {
- this.result = result;
- }
-}
Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomain_getSessionAttributeNames_ResponseStruct.java (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/case10977/SessionDomain_getSessionAttributeNames_ResponseStruct.java)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/UpstreamClientApplication.java
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/case10977/UpstreamClientApplication.java 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/UpstreamClientApplication.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,26 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.webservice.case10977;
-
-
-public class UpstreamClientApplication {
- protected String upstreamClientApplicationId;
-
- public UpstreamClientApplication() {
- }
-
- public UpstreamClientApplication(String upstreamClientApplicationId) {
- this.upstreamClientApplicationId = upstreamClientApplicationId;
- }
-
- public String getUpstreamClientApplicationId() {
- return upstreamClientApplicationId;
- }
-
- public void setUpstreamClientApplicationId(String upstreamClientApplicationId) {
- this.upstreamClientApplicationId = upstreamClientApplicationId;
- }
-}
Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/case10977/UpstreamClientApplication.java (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/case10977/UpstreamClientApplication.java)
Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349 (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/jbws349)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetCreate.java
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetCreate.java 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetCreate.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,38 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.webservice.jbws349;
-
-
-public class AssetCreate extends org.jboss.test.webservice.jbws349.Event {
- protected int nextStep;
- protected java.lang.String template;
-
- public AssetCreate() {
- }
-
- public AssetCreate(java.lang.String id, int nextStep, java.lang.String template) {
- this.id = id;
- this.nextStep = nextStep;
- this.template = template;
- }
-
- public int getNextStep() {
- return nextStep;
- }
-
- public void setNextStep(int nextStep) {
- this.nextStep = nextStep;
- }
-
- public java.lang.String getTemplate() {
- return template;
- }
-
- public void setTemplate(java.lang.String template) {
- this.template = template;
- }
-
-}
Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetCreate.java (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetCreate.java)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetCreateResult.java
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetCreateResult.java 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetCreateResult.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,35 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.webservice.jbws349;
-
-
-public class AssetCreateResult extends org.jboss.test.webservice.jbws349.Result {
- protected java.lang.String id;
- private String fish;
-
- public AssetCreateResult() {
- }
-
- public AssetCreateResult(java.lang.String id) {
- this.id = id;
- }
-
- public java.lang.String getId() {
- return id;
- }
-
- public void setId(java.lang.String id) {
- this.id = id;
- }
-
- public String getFish() {
- return fish;
- }
-
- public void setFish(String fish) {
- this.fish = fish;
- }
-}
Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetCreateResult.java (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetCreateResult.java)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetRead.java
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetRead.java 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetRead.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,17 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.webservice.jbws349;
-
-
-public class AssetRead extends org.jboss.test.webservice.jbws349.Event {
-
- public AssetRead() {
- }
-
- public AssetRead(java.lang.String id) {
- this.id = id;
- }
-}
Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetRead.java (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetRead.java)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetReadResult.java
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetReadResult.java 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetReadResult.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,36 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.webservice.jbws349;
-
-
-public class AssetReadResult extends org.jboss.test.webservice.jbws349.Result {
- protected java.lang.String id;
- protected java.lang.String body;
-
- public AssetReadResult() {
- }
-
- public AssetReadResult(java.lang.String id, java.lang.String body) {
- this.id = id;
- this.body = body;
- }
-
- public java.lang.String getId() {
- return id;
- }
-
- public void setId(java.lang.String id) {
- this.id = id;
- }
-
- public java.lang.String getBody() {
- return body;
- }
-
- public void setBody(java.lang.String body) {
- this.body = body;
- }
-}
Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetReadResult.java (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/jbws349/AssetReadResult.java)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/Event.java
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/jbws349/Event.java 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/Event.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,26 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.webservice.jbws349;
-
-
-public class Event {
- protected java.lang.String id;
-
- public Event() {
- }
-
- public Event(java.lang.String id) {
- this.id = id;
- }
-
- public java.lang.String getId() {
- return id;
- }
-
- public void setId(java.lang.String id) {
- this.id = id;
- }
-}
Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/Event.java (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/jbws349/Event.java)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/EventException.java
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/jbws349/EventException.java 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/EventException.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,21 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.webservice.jbws349;
-
-
-public class EventException extends java.lang.Exception {
- private java.lang.String message;
-
-
- public EventException(java.lang.String message) {
- super(message);
- this.message = message;
- }
-
- public java.lang.String getMessage() {
- return message;
- }
-}
Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/EventException.java (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/jbws349/EventException.java)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/JBWS349TestCase.java
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/jbws349/JBWS349TestCase.java 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/JBWS349TestCase.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,92 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.webservice.jbws349;
-
-import javax.naming.InitialContext;
-import javax.xml.rpc.Service;
-
-import junit.framework.Test;
-
-import org.jboss.test.webservice.WebserviceTestBase;
-
-/**
- * Polymorphism in return types
- *
- * http://jira.jboss.com/jira/browse/JBWS-349
- *
- * @author Thomas.Diesler at jboss.org
- * @since 30-Nov-2005
- */
-public class JBWS349TestCase extends WebserviceTestBase
-{
- private static ServiceFacadeEndpoint endpoint;
-
- public JBWS349TestCase(String name)
- {
- super(name);
- }
-
- public static Test suite() throws Exception
- {
- return getDeploySetup(JBWS349TestCase.class, "ws4ee-jbws349.war, ws4ee-jbws349-client.jar");
- }
-
- public void setUp() throws Exception
- {
- super.setUp();
- if (endpoint == null)
- {
- InitialContext iniCtx = getClientContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/ServiceFacade");
- endpoint = (ServiceFacadeEndpoint)service.getPort(ServiceFacadeEndpoint.class);
- }
- }
-
- public void testAssetCreate() throws Exception
- {
- Event event = new AssetCreate("testAssetCreate", 1, "templ");
- AssetCreateResult retObj = (AssetCreateResult)endpoint.processEvent(event);
- assertEquals("123", retObj.getId());
- }
-
- public void testAssetRead() throws Exception
- {
- Event event = new AssetRead("testAssetRead");
- AssetReadResult retObj = (AssetReadResult)endpoint.processEvent(event);
- assertEquals("123", retObj.getId());
- assertEquals("body", retObj.getBody());
- }
-
- public void testEvent() throws Exception
- {
- try
- {
- Event event = new Event("testEvent");
- endpoint.processEvent(event);
- fail("EventException expected");
- }
- catch (EventException ex)
- {
- assertEquals("Invalid event", ex.getMessage());
- }
- }
-}
Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/JBWS349TestCase.java (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/jbws349/JBWS349TestCase.java)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/Result.java
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/jbws349/Result.java 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/Result.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,13 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.webservice.jbws349;
-
-
-public class Result {
-
- public Result() {
- }
-}
Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/Result.java (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/jbws349/Result.java)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/ServiceFacadeEndpoint.java
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/jbws349/ServiceFacadeEndpoint.java 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/ServiceFacadeEndpoint.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.webservice.jbws349;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-public interface ServiceFacadeEndpoint extends Remote
-{
- Result processEvent(Event event) throws EventException, RemoteException;
-}
Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/ServiceFacadeEndpoint.java (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/jbws349/ServiceFacadeEndpoint.java)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/ServiceFacadeEndpointImpl.java
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/jbws349/ServiceFacadeEndpointImpl.java 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/ServiceFacadeEndpointImpl.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.webservice.jbws349;
-
-import org.jboss.logging.Logger;
-
-public class ServiceFacadeEndpointImpl implements ServiceFacadeEndpoint
-{
- // provide logging
- private static final Logger log = Logger.getLogger(ServiceFacadeEndpointImpl.class);
-
- public Result processEvent(Event event) throws EventException
- {
- log.info("processEvent: " + event);
-
- Result res;
- if (event instanceof AssetCreate)
- {
- AssetCreateResult a = new AssetCreateResult("123");
- a.setFish("cod");
-
- res = a;
- }
- else if (event instanceof AssetRead)
- {
- res = new AssetReadResult("123", "body");
- }
- else
- {
- throw new EventException("Invalid event");
- }
-
- return res;
- }
-}
Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/webservice/jbws349/ServiceFacadeEndpointImpl.java (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/main/org/jboss/test/webservice/jbws349/ServiceFacadeEndpointImpl.java)
Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977 (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/case10977)
Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/case10977/WEB-INF)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/case10977/WEB-INF/jaxrpc-mapping.xml 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/jaxrpc-mapping.xml 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1"
- 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.webservice.case10977</package-type>
- <namespaceURI>http://schemas.SDP.com/wsdl/1.0</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type> org.jboss.test.webservice.case10977.ServiceDeliveryPlatformException</java-type>
- <root-type-qname xmlns:typeNS="http://schemas.SDP.com/wsdl/1.0"> typeNS:ServiceDeliveryPlatformException</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>errorCategory</java-variable-name>
- <xml-element-name>errorCategory</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>errorCode</java-variable-name>
- <xml-element-name>errorCode</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>errorMessage</java-variable-name>
- <xml-element-name>errorMessage</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>exceptionName</java-variable-name>
- <xml-element-name>exceptionName</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>exceptionStackTrace</java-variable-name>
- <xml-element-name>exceptionStackTrace</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>paymentErrorCode</java-variable-name>
- <xml-element-name>paymentErrorCode</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>paymentErrorMessage</java-variable-name>
- <xml-element-name>paymentErrorMessage</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>message</java-variable-name>
- <xml-element-name>message</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type> org.jboss.test.webservice.case10977.ArrayOfSessionAttribute</java-type>
- <root-type-qname xmlns:typeNS="http://schemas.SDP.com/wsdl/1.0"> typeNS:ArrayOfSessionAttribute</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>attribute</java-variable-name>
- <xml-element-name>attribute</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type> org.jboss.test.webservice.case10977.UpstreamClientApplication</java-type>
- <root-type-qname xmlns:typeNS="http://schemas.SDP.com/wsdl/1.0"> typeNS:UpstreamClientApplication</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>upstreamClientApplicationId</java-variable-name>
- <xml-element-name>upstreamClientApplicationId</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type> org.jboss.test.webservice.case10977.SessionAttribute</java-type>
- <root-type-qname xmlns:typeNS="http://schemas.SDP.com/wsdl/1.0"> typeNS:SessionAttribute</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>name</java-variable-name>
- <xml-element-name>name</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>value</java-variable-name>
- <xml-element-name>value</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>version</java-variable-name>
- <xml-element-name>version</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type> org.jboss.test.webservice.case10977.SessionAttribute[]</java-type>
- <anonymous-type-qname> http://schemas.SDP.com/wsdl/1.0:ArrayOfSessionAttribute>attribute[0,unbounded]</anonymous-type-qname>
- <qname-scope>complexType</qname-scope>
- </java-xml-type-mapping>
- <exception-mapping>
- <exception-type> org.jboss.test.webservice.case10977.ServiceDeliveryPlatformException</exception-type>
- <wsdl-message xmlns:exMsgNS="http://schemas.SDP.com/wsdl/1.0"> exMsgNS:ServiceDeliveryPlatformException</wsdl-message>
- <constructor-parameter-order>
- <element-name>errorCategory</element-name>
- <element-name>errorCode</element-name>
- <element-name>errorMessage</element-name>
- <element-name>exceptionName</element-name>
- <element-name>exceptionStackTrace</element-name>
- <element-name>paymentErrorCode</element-name>
- <element-name>paymentErrorMessage</element-name>
- <element-name>message</element-name>
- </constructor-parameter-order>
- </exception-mapping>
- <service-interface-mapping>
- <service-interface> org.jboss.test.webservice.case10977.ServiceDeliveryAPI</service-interface>
- <wsdl-service-name xmlns:serviceNS="http://schemas.SDP.com/wsdl/1.0"> serviceNS:ServiceDeliveryAPI</wsdl-service-name>
- <port-mapping>
- <port-name>SessionDomainPort</port-name>
- <java-port-name>SessionDomainPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface> org.jboss.test.webservice.case10977.SessionDomain</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS="http://schemas.SDP.com/wsdl/1.0"> portTypeNS:SessionDomain</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS="http://schemas.SDP.com/wsdl/1.0"> bindingNS:SessionDomainBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>getSessionAttributeNames</java-method-name>
- <wsdl-operation>getSessionAttributeNames</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type> org.jboss.test.webservice.case10977.UpstreamClientApplication</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://schemas.SDP.com/wsdl/1.0"> wsdlMsgNS:SessionDomain_getSessionAttributeNames</wsdl-message>
- <wsdl-message-part-name> upstreamClientApplication</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <method-param-parts-mapping>
- <param-position>1</param-position>
- <param-type>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://schemas.SDP.com/wsdl/1.0"> wsdlMsgNS:SessionDomain_getSessionAttributeNames</wsdl-message>
- <wsdl-message-part-name>sessionId</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value> org.jboss.test.webservice.case10977.ArrayOfSessionAttribute</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://schemas.SDP.com/wsdl/1.0"> wsdlMsgNS:SessionDomain_getSessionAttributeNamesResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/jaxrpc-mapping.xml (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/case10977/WEB-INF/jaxrpc-mapping.xml)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/web.xml
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/case10977/WEB-INF/web.xml 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/web.xml 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <servlet>
- <servlet-name>SessionDomain</servlet-name>
- <servlet-class>org.jboss.test.webservice.case10977.SessionDomainImpl</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>SessionDomain</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-</web-app>
-
Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/web.xml (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/case10977/WEB-INF/web.xml)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/webservices.xml
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/case10977/WEB-INF/webservices.xml 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/webservices.xml 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<webservices
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:impl="http://schemas.SDP.com/wsdl/1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
-
- <webservice-description>
- <webservice-description-name>ServiceDeliveryAPI</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/servicedelivery.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>SessionDomainPort</port-component-name>
- <wsdl-port>impl:SessionDomainPort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.webservice.case10977.SessionDomain</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>SessionDomain</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/webservices.xml (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/case10977/WEB-INF/webservices.xml)
Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/wsdl (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/case10977/WEB-INF/wsdl)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/wsdl/servicedelivery.wsdl
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/case10977/WEB-INF/wsdl/servicedelivery.wsdl 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/wsdl/servicedelivery.wsdl 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,399 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2005 rel. 3 U (http://www.altova.com) by Tim Fox (T-Mobile) -->
-<definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://schemas.SDP.com/wsdl/1.0" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns3="http://schemas.SDP.com/wsdl/arrays/java/lang" xmlns:wsi="http://ws-i.org/schemas/conformanceClaim" targetNamespace="http://schemas.SDP.com/wsdl/1.0" name="ServiceDeliveryAPI">
- <types>
- <schema targetNamespace="http://schemas.SDP.com/wsdl/1.0" xmlns:tns="http://schemas.SDP.com/wsdl/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://www.w3.org/2001/XMLSchema">
- <complexType name="HttpHeader">
- <sequence>
- <element name="name" type="string"/>
- <element name="value" type="string"/>
- </sequence>
- </complexType>
- <complexType name="HttpParameter">
- <sequence>
- <element name="name" type="string"/>
- <element name="value" type="string"/>
- </sequence>
- </complexType>
- <complexType name="HttpInfo">
- <sequence>
- <element name="httpHeaders" type="tns:HttpHeader" minOccurs="0" maxOccurs="unbounded"/>
- <element name="httpParameters" type="tns:HttpParameter" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- </complexType>
- <complexType name="UpstreamClientApplication">
- <sequence>
- <element name="upstreamClientApplicationId" type="string" nillable="true"/>
- </sequence>
- </complexType>
- <complexType name="ExternalSessionProvider">
- <sequence>
- <element name="externalSessionProviderId" type="string" nillable="true"/>
- </sequence>
- </complexType>
- <complexType name="NetworkAccessSignature">
- <sequence>
- <element name="destinationAddress" type="string" nillable="true"/>
- <element name="destinationPort" type="string" nillable="true"/>
- <element name="sourceAddress" type="string"/>
- <element name="sourcePort" type="string" nillable="true"/>
- </sequence>
- </complexType>
- <complexType name="HttpNetworkAccessSignature">
- <complexContent>
- <extension base="tns:NetworkAccessSignature">
- <sequence>
- <element name="httpInfo" type="tns:HttpInfo" nillable="true"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <complexType name="ConsumerCredential">
- <sequence>
- <element name="type" type="string"/>
- <element name="value" type="string"/>
- </sequence>
- </complexType>
- <complexType name="AccessMethodInfo">
- <sequence>
- <element name="name" type="string"/>
- <element name="isOnLine" type="boolean"/>
- </sequence>
- </complexType>
- <complexType name="SessionAttribute">
- <sequence>
- <element name="name" type="string"/>
- <element name="value" type="base64Binary" nillable="true"/>
- <element name="version" type="int" nillable="true"/>
- </sequence>
- </complexType>
- <complexType name="ArrayOfSessionAttribute">
- <sequence>
- <element name="attribute" type="tns:SessionAttribute" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- </complexType>
- <complexType name="SessionOptionsInfo">
- <sequence>
- <element name="force" type="boolean"/>
- <element name="sessionInfo" type="boolean"/>
- </sequence>
- </complexType>
- <complexType name="SessionDataInfo">
- <sequence>
- <element name="rootSessionId" type="string"/>
- <element name="parentSessionId" type="string"/>
- <element name="creationTime" type="dateTime"/>
- <element name="lastAccessedTime" type="dateTime"/>
- <element name="maxInactiveInterval" type="int"/>
- <element name="upstreamClientApplication" type="tns:UpstreamClientApplication" nillable="true"/>
- </sequence>
- </complexType>
- <complexType name="SessionInfo">
- <sequence>
- <element name="sessionAttributes" type="tns:ArrayOfSessionAttribute" nillable="true"/>
- <element name="sessionDataInfo" type="tns:SessionDataInfo" nillable="true"/>
- </sequence>
- </complexType>
- <complexType name="UpstreamApplicationCredentials">
- <sequence>
- <element name="username" type="string"/>
- <element name="password" type="string"/>
- </sequence>
- </complexType>
- <complexType name="ResourceRight">
- <sequence>
- <element name="periodPeriod" type="int"/>
- <element name="periodUnits" type="string" nillable="true"/>
- <element name="usageLimit" type="int"/>
- </sequence>
- </complexType>
- <complexType name="Tax">
- <sequence>
- <element name="code" type="string"/>
- <element name="rate" type="decimal"/>
- <element name="amount" type="decimal"/>
- </sequence>
- </complexType>
- <complexType name="Price">
- <sequence>
- <element name="currencyCode" type="string"/>
- <element name="currencySymbol" type="string"/>
- <element name="gross" type="decimal"/>
- <element name="net" type="decimal"/>
- <element name="taxes" type="tns:Tax" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- </complexType>
- <complexType name="PurchaseInfo">
- <sequence>
- <element name="Id" type="string" nillable="true"/>
- <element name="price" type="tns:Price" nillable="true"/>
- <element name="isDiscounted" type="boolean"/>
- <element name="resourceRights" type="tns:ResourceRight" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
- <element name="promotionalPeriod" type="int"/>
- <element name="promotionalUnits" type="string" nillable="true"/>
- <element name="recurPeriod" type="int"/>
- <element name="recurUnits" type="string" nillable="true"/>
- <element name="promotionalPrice" type="tns:Price" nillable="true"/>
- </sequence>
- </complexType>
- <complexType name="PaymentTransaction">
- <sequence>
- <element name="paymentTransactionId" type="string"/>
- <element name="purchaseInfo" type="tns:PurchaseInfo"/>
- </sequence>
- </complexType>
- <complexType name="ArrayOfConsumerRight">
- <sequence>
- <element name="consumerRight" type="tns:ConsumerRight" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- </complexType>
- <complexType name="ConsumerRight">
- <sequence>
- <element name="purchaseTime" type="dateTime" nillable="true"/>
- <element name="purchasePrice" type="tns:Price" nillable="true"/>
- <element name="usageLimit" type="int"/>
- <element name="startTime" type="dateTime" nillable="true"/>
- <element name="endTime" type="dateTime" nillable="true"/>
- <element name="lastConfirmedUsage" type="dateTime" nillable="true"/>
- <element name="usageConfirmations" type="int"/>
- <element name="uniqueSubscriptionId" type="string" nillable="true"/>
- <element name="subscriptionStatus" type="string" nillable="true"/>
- <element name="subscriptionStatusChangeMessage" type="string" nillable="true"/>
- </sequence>
- </complexType>
- <complexType name="ServiceType">
- <sequence>
- <element name="serviceType" type="string"/>
- <element name="description" type="string" nillable="true"/>
- </sequence>
- </complexType>
- <complexType name="ApplicationService">
- <complexContent>
- <extension base="tns:TradableAsset">
- <sequence>
- <element name="serviceName" type="string"/>
- <element name="serviceTypes" type="tns:ServiceType" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <complexType name="TradableAsset">
- </complexType>
- <complexType name="Application">
- <complexContent>
- <extension base="tns:TradableAsset">
- <sequence>
- <element name="applicationId" type="string"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <complexType name="ApplicationEvent">
- <complexContent>
- <extension base="tns:TradableAsset">
- <sequence>
- <element name="applicationId" type="string"/>
- <element name="eventId" type="string"/>
- <element name="contentItemId" type="string" nillable="true"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <complexType name="FactoredCharge">
- <complexContent>
- <extension base="tns:TradableAsset">
- <sequence>
- <element name="price" type="tns:Price"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <complexType name="ProductInfo">
- <sequence>
- <element name="requiresSMSConfirmation" type="boolean"/>
- <element name="tradableAssetType" type="string" nillable="true"/>
- <element name="integratedCharging" type="boolean"/>
- </sequence>
- </complexType>
- <complexType name="TradableAssetInfo">
- <sequence>
- <element name="productInfo" type="tns:ProductInfo"/>
- <element name="purchaseInfo" type="tns:PurchaseInfo" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- </complexType>
- <complexType name="PaymentTransactionType">
- <sequence>
- <element name="paymentTransactionType" type="string" nillable="true"/>
- </sequence>
- </complexType>
- <complexType name="PaymentTransactionInfo">
- <sequence>
- <element name="paymentProviderId" type="string" nillable="true"/>
- <element name="transactionState" type="string" nillable="true"/>
- <element name="paymentTransactionType" type="tns:PaymentTransactionType" nillable="true"/>
- <element name="tradableAssetType" type="string" nillable="true"/>
- <element name="integratedCharging" type="boolean"/>
- <element name="involvesPurchase" type="boolean"/>
- <element name="appAuthorised" type="boolean"/>
- <element name="purchaseInfo" type="tns:PurchaseInfo" nillable="true"/>
- <element name="tradableAsset" type="tns:TradableAsset" nillable="true"/>
- <element name="description" type="string" nillable="true"/>
- </sequence>
- </complexType>
- <complexType name="MultimediaMessageOption">
- <sequence>
- <element name="name" type="string"/>
- <element name="value" type="string"/>
- </sequence>
- </complexType>
- <complexType name="MultimediaMessagePart">
- <sequence>
- <element name="contentType" type="string"/>
- <element name="contentId" type="string" nillable="true"/>
- <element name="contentLocation" type="string" nillable="true"/>
- </sequence>
- </complexType>
- <complexType name="MultimediaMessage">
- <sequence>
- <element name="originator" type="string"/>
- <element name="recipient" type="string"/>
- <element name="messageId" type="string" nillable="true"/>
- <element name="options" type="tns:MultimediaMessageOption" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
- <element name="body" type="tns:MultimediaMessagePart"/>
- </sequence>
- </complexType>
- <complexType name="ContentMessagePart">
- <complexContent>
- <extension base="tns:MultimediaMessagePart">
- <sequence>
- <element name="data" type="base64Binary"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <complexType name="MultipartMessagePart">
- <complexContent>
- <extension base="tns:MultimediaMessagePart">
- <sequence>
- <element name="multiparts" type="tns:MultimediaMessagePart" maxOccurs="unbounded"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <complexType name="ReceivedMessages">
- <sequence>
- <element name="messages" type="tns:MultimediaMessage" minOccurs="0" maxOccurs="unbounded"/>
- <element name="moreMessages" type="boolean"/>
- </sequence>
- </complexType>
- <complexType name="GeographicLocation">
- <sequence>
- <element name="accuracy" type="int"/>
- <element name="latitude" type="float"/>
- <element name="longitude" type="float"/>
- <element name="time" type="dateTime"/>
- </sequence>
- </complexType>
- <complexType name="ConsumerServiceProvider">
- <sequence>
- <element name="retailPackageId" type="string"/>
- </sequence>
- </complexType>
- <complexType name="ProvisioningChange"/>
- <complexType name="ConsumerCredentialChange">
- <complexContent>
- <extension base="tns:ProvisioningChange">
- <sequence>
- <element name="oldCredential" type="tns:ConsumerCredential"/>
- <element name="newCredential" type="tns:ConsumerCredential"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <complexType name="AuthorisationChange">
- <complexContent>
- <extension base="tns:ProvisioningChange">
- <sequence>
- <element name="consumer" type="tns:ConsumerCredential"/>
- <element name="tradableAsset" type="tns:TradableAsset"/>
- <element name="status" type="string"/>
- <element name="reason" type="string"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <complexType name="ProvisioningChanges">
- <sequence>
- <element name="provisioningChanges" type="tns:ProvisioningChange" minOccurs="0" maxOccurs="unbounded"/>
- <element name="moreChanges" type="boolean"/>
- </sequence>
- </complexType>
- <element name="ServiceDeliveryPlatformException" type="tns:ServiceDeliveryPlatformException"/>
- <complexType name="ServiceDeliveryPlatformException">
- <sequence>
- <element name="errorCategory" type="string"/>
- <element name="errorCode" type="string"/>
- <element name="errorMessage" type="string"/>
- <element name="exceptionName" type="string"/>
- <element name="exceptionStackTrace" type="string"/>
- <element name="paymentErrorCode" type="string"/>
- <element name="paymentErrorMessage" type="string"/>
- <element name="message" type="string"/>
- </sequence>
- </complexType>
- </schema>
- <schema targetNamespace="http://schemas.SDP.com/wsdl/arrays/java/lang" xmlns:tns="http://schemas.SDP.com/wsdl/arrays/java/lang" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://www.w3.org/2001/XMLSchema">
- <complexType name="StringArray">
- <sequence>
- <element name="value" type="string" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- </complexType>
- </schema>
- </types>
- <message name="SessionDomain_getSessionAttributeNames">
- <part name="upstreamClientApplication" type="tns:UpstreamClientApplication" xsd:nillable="true"/>
- <part name="sessionId" type="xsd:string"/>
- </message>
- <message name="SessionDomain_getSessionAttributeNamesResponse">
- <part name="result" type="tns:ArrayOfSessionAttribute"/>
- </message>
-
- <message name="ServiceDeliveryPlatformException">
- <part name="ServiceDeliveryPlatformException" element="tns:ServiceDeliveryPlatformException"/>
- </message>
- <portType name="SessionDomain">
- <operation name="getSessionAttributeNames" parameterOrder="upstreamClientApplication sessionId">
- <input message="tns:SessionDomain_getSessionAttributeNames"/>
- <output message="tns:SessionDomain_getSessionAttributeNamesResponse"/>
- <fault name="ServiceDeliveryPlatformException" message="tns:ServiceDeliveryPlatformException"/>
- </operation>
- </portType>
- <binding name="SessionDomainBinding" type="tns:SessionDomain">
- <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
- <operation name="getSessionAttributeNames">
- <soap:operation/>
- <input>
- <soap:body use="literal" namespace="http://schemas.SDP.com/wsdl/1.0"/>
- </input>
- <output>
- <soap:body use="literal" namespace="http://schemas.SDP.com/wsdl/1.0"/>
- </output>
- <fault name="ServiceDeliveryPlatformException">
- <soap:fault name="ServiceDeliveryPlatformException" use="literal"/>
- </fault>
- </operation>
- </binding>
- <service name="ServiceDeliveryAPI">
- <port name="SessionDomainPort" binding="tns:SessionDomainBinding">
- <soap:address location="http://localhost:8080/ws4ee-case10977"/>
- <documentation>
- <wsi:Claim conformsTo="http://ws-i.org/profiles/basic/1.0"/>
- </documentation>
- </port>
- </service>
- <documentation>
- T-Mobile Service Delivery API 1.0.
- Definition Version: 0.9.5 Date: 24 September 2004
- Copyright (c) 2004 T-Mobile International UK Limited. All Rights Reserved.
- </documentation>
-</definitions>
Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/WEB-INF/wsdl/servicedelivery.wsdl (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/case10977/WEB-INF/wsdl/servicedelivery.wsdl)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/wsconfig.xml
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/case10977/wsconfig.xml 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/wsconfig.xml 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- wscompile -keep -import -mapping ./WEB-INF/jaxrpc-mapping.xml -d ./WEB-INF wsconfig.xml
--->
-<configuration xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
-<wsdl
- location="WEB-INF/wsdl/servicedelivery.wsdl"
- packageName="org.jboss.test.webservice.case10977" />
-</configuration>
Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/case10977/wsconfig.xml (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/case10977/wsconfig.xml)
Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349 (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/jbws349)
Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/META-INF (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/jbws349/META-INF)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/META-INF/application-client.xml
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/jbws349/META-INF/application-client.xml 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/META-INF/application-client.xml 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application-client xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:impl="http://org.jboss.test.webservice/jbws84" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" version="1.4">
-
- <display-name>Test Service</display-name>
-
- <service-ref>
- <service-ref-name>service/ServiceFacade</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/ServiceFacade.wsdl</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface> org.jboss.test.webservice.jbws349.ServiceFacadeEndpoint</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</application-client>
-
Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/META-INF/application-client.xml (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/jbws349/META-INF/application-client.xml)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/META-INF/jboss-client.xml
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/jbws349/META-INF/jboss-client.xml 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/META-INF/jboss-client.xml 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
-
-<jboss-client>
- <jndi-name>ws4ee-client</jndi-name>
-
- <service-ref>
- <service-ref-name>service/ServiceFacade</service-ref-name>
- <wsdl-override>http://localhost:8080/ws4ee-jbws349?wsdl</wsdl-override>
- </service-ref>
-
-</jboss-client>
Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/META-INF/jboss-client.xml (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/jbws349/META-INF/jboss-client.xml)
Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/jbws349/WEB-INF)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/jbws349/WEB-INF/jaxrpc-mapping.xml 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/jaxrpc-mapping.xml 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1"
- 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.webservice.jbws349</package-type>
- <namespaceURI>http://siterefresh.refreshsoftware.com/wsdl/services</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.webservice.jbws349</package-type>
- <namespaceURI>http://siterefresh.refreshsoftware.com/types</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.webservice.jbws349.Result</java-type>
- <root-type-qname xmlns:typeNS="http://siterefresh.refreshsoftware.com/types">typeNS:Result</root-type-qname>
- <qname-scope>complexType</qname-scope>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.webservice.jbws349.AssetCreateResult</java-type>
- <root-type-qname xmlns:typeNS="http://siterefresh.refreshsoftware.com/types">typeNS:AssetCreateResult</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>id</java-variable-name>
- <xml-element-name>id</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.webservice.jbws349.AssetCreate</java-type>
- <root-type-qname xmlns:typeNS="http://siterefresh.refreshsoftware.com/types">typeNS:AssetCreate</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>id</java-variable-name>
- <xml-element-name>id</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>nextStep</java-variable-name>
- <xml-element-name>nextStep</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>template</java-variable-name>
- <xml-element-name>template</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <!-- BEGIN manual type mapping -->
- <java-xml-type-mapping>
- <java-type>org.jboss.test.webservice.jbws349.AssetRead</java-type>
- <root-type-qname xmlns:typeNS="http://siterefresh.refreshsoftware.com/types">typeNS:AssetRead</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>id</java-variable-name>
- <xml-element-name>id</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <!-- END manual type mapping -->
- <java-xml-type-mapping>
- <java-type>org.jboss.test.webservice.jbws349.Event</java-type>
- <root-type-qname xmlns:typeNS="http://siterefresh.refreshsoftware.com/types">typeNS:Event</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>id</java-variable-name>
- <xml-element-name>id</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <!--
- <java-xml-type-mapping>
- <java-type>org.jboss.test.webservice.jbws349.EventException_Type</java-type>
- <root-type-qname xmlns:typeNS="http://siterefresh.refreshsoftware.com/types">typeNS:EventException</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>message</java-variable-name>
- <xml-element-name>message</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- -->
- <!-- BEGIN manual type mapping -->
- <java-xml-type-mapping>
- <java-type>org.jboss.test.webservice.jbws349.AssetRead</java-type>
- <root-type-qname xmlns:typeNS="http://siterefresh.refreshsoftware.com/types">typeNS:AssetRead</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>id</java-variable-name>
- <xml-element-name>id</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <!-- END manual type mapping -->
- <java-xml-type-mapping>
- <java-type>org.jboss.test.webservice.jbws349.AssetReadResult</java-type>
- <root-type-qname xmlns:typeNS="http://siterefresh.refreshsoftware.com/types">typeNS:AssetReadResult</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>id</java-variable-name>
- <xml-element-name>id</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>body</java-variable-name>
- <xml-element-name>body</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.webservice.jbws349.EventException</java-type>
- <root-type-qname xmlns:typeNS="http://siterefresh.refreshsoftware.com/types">typeNS:EventException</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>message</java-variable-name>
- <xml-element-name>message</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <exception-mapping>
- <exception-type>org.jboss.test.webservice.jbws349.EventException</exception-type>
- <wsdl-message xmlns:exMsgNS="http://siterefresh.refreshsoftware.com/wsdl/services">exMsgNS:processEventException</wsdl-message>
- <constructor-parameter-order>
- <element-name>message</element-name>
- </constructor-parameter-order>
- </exception-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.webservice.jbws349.ServiceFacade</service-interface>
- <wsdl-service-name xmlns:serviceNS="http://siterefresh.refreshsoftware.com/wsdl/services">serviceNS:ServiceFacade</wsdl-service-name>
- <port-mapping>
- <port-name>ServiceFacadePort</port-name>
- <java-port-name>ServiceFacadePort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.webservice.jbws349.ServiceFacadeEndpoint</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS="http://siterefresh.refreshsoftware.com/wsdl/services">portTypeNS:ServiceFacadeEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS="http://siterefresh.refreshsoftware.com/wsdl/services">bindingNS:ServiceFacadeSoapBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>processEvent</java-method-name>
- <wsdl-operation>processEvent</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.webservice.jbws349.Event</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://siterefresh.refreshsoftware.com/wsdl/services">wsdlMsgNS:processEventRequest</wsdl-message>
- <wsdl-message-part-name>id</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.webservice.jbws349.Result</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://siterefresh.refreshsoftware.com/wsdl/services">wsdlMsgNS:processEventResponse</wsdl-message>
- <wsdl-message-part-name>processEventResponse</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/jaxrpc-mapping.xml (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/jbws349/WEB-INF/jaxrpc-mapping.xml)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/web.xml
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/jbws349/WEB-INF/web.xml 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/web.xml 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
- <servlet>
- <servlet-name>ServiceFacade</servlet-name>
- <servlet-class>org.jboss.test.webservice.jbws349.ServiceFacadeEndpointImpl</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>ServiceFacade</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-</web-app>
-
Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/web.xml (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/jbws349/WEB-INF/web.xml)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/webservices.xml
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/jbws349/WEB-INF/webservices.xml 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/webservices.xml 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:impl="http://siterefresh.refreshsoftware.com/wsdl/services"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
-
- <webservice-description>
- <webservice-description-name>HelloService</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/ServiceFacade.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>ServiceFacadePort</port-component-name>
- <wsdl-port>impl:ServiceFacadePort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.webservice.jbws349.ServiceFacadeEndpoint</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>ServiceFacade</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
\ No newline at end of file
Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/webservices.xml (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/jbws349/WEB-INF/webservices.xml)
Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/wsdl (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/jbws349/WEB-INF/wsdl)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/wsdl/ServiceFacade.wsdl
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/jbws349/WEB-INF/wsdl/ServiceFacade.wsdl 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/wsdl/ServiceFacade.wsdl 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,52 +0,0 @@
-<definitions targetNamespace="http://siterefresh.refreshsoftware.com/wsdl/services" xmlns:tns="http://siterefresh.refreshsoftware.com/wsdl/services"
- xmlns:srt="http://siterefresh.refreshsoftware.com/types" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soapbind="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="SiteRefreshSoapServices">
-
- <types>
- <xsd:schema>
- <xsd:import namespace="http://siterefresh.refreshsoftware.com/types" schemaLocation="ServiceFacade.xsd"/>
- </xsd:schema>
- </types>
-
- <message name="processEventResponse">
- <part name="processEventResponse" element="srt:result"/>
- </message>
- <message name="processEventRequest">
- <part name="processEventRequest" element="srt:event"/>
- </message>
- <message name="processEventException">
- <part name="processEventException" element="srt:eventException"/>
- </message>
-
- <portType name="ServiceFacadeEndpoint">
- <operation name="processEvent">
- <input message="tns:processEventRequest" name="processEventRequest"/>
- <output message="tns:processEventResponse" name="processEventResponse"/>
- <fault message="tns:processEventException" name="processEventException"/>
- </operation>
- </portType>
-
- <binding name="ServiceFacadeSoapBinding" type="tns:ServiceFacadeEndpoint">
- <soapbind:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <operation name="processEvent">
- <soapbind:operation soapAction=""/>
- <input name="processEventRequest">
- <soapbind:body use="literal"/>
- </input>
- <output name="processEventResponse">
- <soapbind:body use="literal"/>
- </output>
- <fault name="processEventException">
- <soapbind:fault name="processEventException" use="literal"/>
- </fault>
- </operation>
- </binding>
-
- <service name="ServiceFacade">
- <port binding="tns:ServiceFacadeSoapBinding" name="ServiceFacadePort">
- <soapbind:address location="http://dummy-location"/>
- </port>
- </service>
-
-</definitions>
\ No newline at end of file
Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/wsdl/ServiceFacade.wsdl (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/jbws349/WEB-INF/wsdl/ServiceFacade.wsdl)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/wsdl/ServiceFacade.xsd
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/jbws349/WEB-INF/wsdl/ServiceFacade.xsd 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/wsdl/ServiceFacade.xsd 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,60 +0,0 @@
- <schema targetNamespace="http://siterefresh.refreshsoftware.com/types" xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:srt="http://siterefresh.refreshsoftware.com/types">
-
- <element name="event" type="srt:Event"/>
- <element name="eventException" type="srt:EventException"/>
- <element name="result" type="srt:Result"/>
-
- <complexType name="Event" abstract="true">
- <sequence>
- <element name="id" type="string" minOccurs="0"/>
- </sequence>
- </complexType>
-
- <complexType name="AssetRead">
- <complexContent>
- <extension base="srt:Event"/>
- </complexContent>
- </complexType>
-
- <complexType name="AssetCreate">
- <complexContent>
- <extension base="srt:Event">
- <sequence>
- <element name="nextStep" type="int"/>
- <element name="template" type="string"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="Result" abstract="true"></complexType>
-
- <complexType name="AssetCreateResult">
- <complexContent>
- <extension base="srt:Result">
- <sequence>
- <element name="id" type="string"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="AssetReadResult">
- <complexContent>
- <extension base="srt:Result">
- <sequence>
- <element name="id" type="string"/>
- <element name="body" type="string"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="EventException">
- <sequence>
- <element name="message" type="string"/>
- </sequence>
- </complexType>
-
- </schema>
Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/WEB-INF/wsdl/ServiceFacade.xsd (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/jbws349/WEB-INF/wsdl/ServiceFacade.xsd)
Deleted: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/config.xml
===================================================================
--- branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/jbws349/config.xml 2006-10-20 12:22:14 UTC (rev 57756)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/config.xml 2006-10-20 17:05:17 UTC (rev 57759)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wscompile -cp ../../../../output/classes -gen:server -f:searchschema -mapping jaxrpc-mapping.xml -keep config.xml
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
-
- <wsdl location="./WEB-INF/wsdl/ServiceFacade.wsdl"
- packageName="org.jboss.test.webservice.jbws349">
- </wsdl>
-
-</configuration>
-
- <!-- BEGIN manual type mapping - ->
- <java-xml-type-mapping>
- <java-type>org.jboss.test.webservice.jbws349.AssetRead</java-type>
- <root-type-qname xmlns:typeNS="http://siterefresh.refreshsoftware.com/types">typeNS:AssetRead</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>id</java-variable-name>
- <xml-element-name>id</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <!- - END manual type mapping -->
Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/webservice/jbws349/config.xml (from rev 57756, branches/JBoss_4_0_2_LogicaCMG/testsuite/src/resources/webservice/jbws349/config.xml)
Modified: branches/JBoss_4_0_2_CP/webservice/src/main/org/jboss/webservice/deployment/BeanXMLMetaData.java
===================================================================
--- branches/JBoss_4_0_2_CP/webservice/src/main/org/jboss/webservice/deployment/BeanXMLMetaData.java 2006-10-20 17:01:02 UTC (rev 57758)
+++ branches/JBoss_4_0_2_CP/webservice/src/main/org/jboss/webservice/deployment/BeanXMLMetaData.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -8,18 +8,19 @@
// $Id$
-import org.jboss.axis.utils.LinkedHashMap;
-import org.jboss.webservice.util.DOMUtils;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-import javax.xml.namespace.QName;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import javax.xml.namespace.QName;
+
+import org.jboss.axis.utils.LinkedHashMap;
+import org.jboss.util.xml.DOMUtils;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
/**
* Additional bean serialization meta data.
*
@@ -80,6 +81,8 @@
public class BeanXMLMetaData
{
private Map elementDescMap = new LinkedHashMap();
+
+ // List<String> of field names
private List elementOrderList = new ArrayList();
// Hide constructoer
@@ -87,7 +90,8 @@
{
}
- /** Parse the bean mets data from XML
+ /**
+ * Parse the bean mets data from XML
*/
public static BeanXMLMetaData parse(Element metaData)
{
@@ -117,20 +121,28 @@
qnames.add(xmlType);
}
+ ElementMetaData elMetaData = new ElementMetaData(fieldName, xmlName, xmlType);
+ beanMetaData.elementDescMap.put(fieldName, elMetaData);
+
boolean asAttribute = DOMUtils.getAttributeValueAsBoolean(elDesc, "asAttr");
+ elMetaData.setAsAttribute(asAttribute);
+
boolean asContent = DOMUtils.getAttributeValueAsBoolean(elDesc, "asContent");
+ elMetaData.setAsContent(asContent);
+ Integer minOccurs = DOMUtils.getAttributeValueAsInteger(elDesc, "minOccurs");
+ elMetaData.setMinOccurs(minOccurs);
+
QName itemXmlType = DOMUtils.getAttributeValueAsQName(elDesc, "itemXmlType");
-
- ElementMetaData elMetaData = new ElementMetaData(fieldName, xmlName, xmlType, itemXmlType, asAttribute, asContent);
- beanMetaData.elementDescMap.put(fieldName, elMetaData);
+ elMetaData.setItemXmlType(itemXmlType);
}
// Parse element order
Element orderEl = DOMUtils.getFirstChildElement(metaData, "elementOrder");
if (orderEl != null)
{
- // copy the BeanPropertyDescriptors according to the meta data elementOrder
+ // copy the BeanPropertyDescriptors according to the meta data
+ // elementOrder
NodeList nlistElementOrder = orderEl.getElementsByTagName("element");
for (int i = 0; i < nlistElementOrder.getLength(); i++)
{
@@ -149,11 +161,27 @@
return elementDescMap.values().iterator();
}
- public Iterator getElementOrder()
+ public ElementMetaData getElementMetaDataByFieldName(String fieldName)
{
- return elementOrderList.iterator();
+ ElementMetaData elMetaData = null;
+ Iterator it = elementDescMap.keySet().iterator();
+ while (it.hasNext())
+ {
+ String key = (String)it.next();
+ if (key.equalsIgnoreCase(fieldName))
+ {
+ elMetaData = (ElementMetaData)elementDescMap.get(key);
+ break;
+ }
+ }
+ return elMetaData;
}
+ public List getElementOrder()
+ {
+ return new ArrayList(elementOrderList);
+ }
+
public void serializeAsXML(PrintWriter out)
{
String pad = " ";
@@ -177,6 +205,12 @@
if (elMetaData.isAsContent())
out.print(" asContent='true'");
+ if (elMetaData.getMinOccurs() != null)
+ out.print(" minOccurs='" + elMetaData.getMinOccurs() + "'");
+
+ if (elMetaData.getItemXmlType() != null)
+ out.print(" itemXmlType='" + elMetaData.getPrefixedItemXmlType() + "'");
+
out.println("/>");
}
@@ -194,25 +228,31 @@
out.println(pad + "</typeDesc>");
}
- /** An XML element description
+ /**
+ * An XML element description
*/
public static class ElementMetaData
{
+
private String fieldName;
+
private QName xmlName;
+
private QName xmlType;
+
private QName itemXmlType;
+
private boolean asAttribute;
+
private boolean asContent;
- public ElementMetaData(String fieldName, QName xmlName, QName xmlType, QName itemXmlType, boolean asAttribute, boolean asContent)
+ private Integer minOccurs;
+
+ public ElementMetaData(String fieldName, QName xmlName, QName xmlType)
{
this.fieldName = fieldName;
this.xmlName = xmlName;
this.xmlType = xmlType;
- this.itemXmlType = itemXmlType;
- this.asAttribute = asAttribute;
- this.asContent = asContent;
}
public String getFieldName()
@@ -254,6 +294,36 @@
return retStr;
}
+ public boolean isAsAttribute()
+ {
+ return asAttribute;
+ }
+
+ public void setAsAttribute(boolean asAttribute)
+ {
+ this.asAttribute = asAttribute;
+ }
+
+ public boolean isAsContent()
+ {
+ return asContent;
+ }
+
+ public void setAsContent(boolean asContent)
+ {
+ this.asContent = asContent;
+ }
+
+ public Integer getMinOccurs()
+ {
+ return minOccurs;
+ }
+
+ public void setMinOccurs(Integer minOccurs)
+ {
+ this.minOccurs = minOccurs;
+ }
+
public QName getItemXmlType()
{
return itemXmlType;
@@ -271,14 +341,12 @@
return retStr;
}
- public boolean isAsAttribute()
+ /**
+ * Solves mapping problems were a nested type in an array can not be properly determined
+ */
+ public void setItemXmlType(QName itemXmlType)
{
- return asAttribute;
+ this.itemXmlType = itemXmlType;
}
-
- public boolean isAsContent()
- {
- return asContent;
- }
}
}
Modified: branches/JBoss_4_0_2_CP/webservice/src/main/org/jboss/webservice/deployment/OperationDescription.java
===================================================================
--- branches/JBoss_4_0_2_CP/webservice/src/main/org/jboss/webservice/deployment/OperationDescription.java 2006-10-20 17:01:02 UTC (rev 57758)
+++ branches/JBoss_4_0_2_CP/webservice/src/main/org/jboss/webservice/deployment/OperationDescription.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -160,20 +160,20 @@
public void writeWSDD(PrintWriter out)
{
String name = getJavaName();
- QName qname = getQName();
+ QName opQName = getQName();
QName returnQName = getReturnQName();
QName returnType = getReturnType();
log.trace("Operation: " + this);
- String xmlns = "";
- String opPrefix = qname.getPrefix();
+ String opNS = "";
+ String opPrefix = opQName.getPrefix();
if (opPrefix.length() > 0)
{
- xmlns = "xmlns:" + opPrefix + "='" + qname.getNamespaceURI() + "' ";
+ opNS = "xmlns:" + opPrefix + "='" + opQName.getNamespaceURI() + "' ";
}
- String qnameAttr = WSDDGenerator.getQNameAttrValue(qname);
+ String qnameAttr = WSDDGenerator.getQNameAttrValue(opQName);
if (returnType != null)
{
@@ -181,17 +181,17 @@
String typeAttr = WSDDGenerator.getQNameAttrValue(returnType);
String typePrefix = returnType.getPrefix();
- if (typePrefix.startsWith("ns") && xmlns.startsWith("xmlns:" + typePrefix) == false)
+ if (opNS.indexOf("xmlns:" + typePrefix) < 0)
{
- xmlns += "xmlns:" + typePrefix + "='" + returnType.getNamespaceURI() + "' ";
+ opNS += "xmlns:" + typePrefix + "='" + returnType.getNamespaceURI() + "' ";
}
- out.println(" <operation name='" + name + "' qname='" + qnameAttr + "' returnQName='" + returnAttr + "' returnType='" + typeAttr + "' " + xmlns + ">");
+ out.println(" <operation name='" + name + "' qname='" + qnameAttr + "' returnQName='" + returnAttr + "' returnType='" + typeAttr + "' " + opNS + ">");
}
else
{
String onewayStr = (oneWay ? "oneway='true' " : "");
- out.println(" <operation name='" + name + "' qname='" + qnameAttr + "' " + onewayStr + xmlns + ">");
+ out.println(" <operation name='" + name + "' qname='" + qnameAttr + "' " + onewayStr + opNS + ">");
}
Iterator itParam = getParameters();
@@ -212,23 +212,22 @@
if (inHeader) headers += "inHeader='true' ";
if (outHeader) headers += "outHeader='true' ";
- xmlns = "";
-
+ String paramNS = "";
if (typeQName != null)
{
String typeAttr = WSDDGenerator.getQNameAttrValue(typeQName);
String typePrefix = typeQName.getPrefix();
- if (typePrefix.startsWith("ns"))
+ if (opNS.indexOf("xmlns:" + typePrefix) < 0)
{
- xmlns += "xmlns:" + typePrefix + "='" + typeQName.getNamespaceURI() + "' ";
+ paramNS = "xmlns:" + typePrefix + "='" + typeQName.getNamespaceURI() + "' ";
}
qnameAttr = WSDDGenerator.getQNameAttrValue(paramQName);
- out.println(" <parameter name='" + paramName + "' qname='" + qnameAttr + "' mode='" + mode + "' type='" + typeAttr + "' " + headers + xmlns + "/>");
+ out.println(" <parameter name='" + paramName + "' qname='" + qnameAttr + "' mode='" + mode + "' type='" + typeAttr + "' " + headers + paramNS + "/>");
}
else
{
- out.println(" <parameter name='" + paramName + "' mode='" + mode + "' " + headers + xmlns + "/>");
+ out.println(" <parameter name='" + paramName + "' mode='" + mode + "' " + headers + paramNS + "/>");
}
}
@@ -246,15 +245,15 @@
String typeAttr = WSDDGenerator.getQNameAttrValue(typeQName);
- xmlns = "";
+ String faultNS = "";
String typePrefix = typeQName.getPrefix();
- if (typePrefix.startsWith("ns"))
+ if (opNS.indexOf("xmlns:" + typePrefix) < 0)
{
- xmlns += "xmlns:" + typePrefix + "='" + typeQName.getNamespaceURI() + "' ";
+ faultNS = "xmlns:" + typePrefix + "='" + typeQName.getNamespaceURI() + "' ";
}
qnameAttr = WSDDGenerator.getQNameAttrValue(faultQName);
- out.println(" <fault name='" + faultName + "' qname='" + qnameAttr + "' type='" + typeAttr + "' class='" + javaType + "' " + xmlns + "/>");
+ out.println(" <fault name='" + faultName + "' qname='" + qnameAttr + "' type='" + typeAttr + "' class='" + javaType + "' " + faultNS + "/>");
}
out.println(" </operation>");
Modified: branches/JBoss_4_0_2_CP/webservice/src/main/org/jboss/webservice/deployment/ServiceDescription.java
===================================================================
--- branches/JBoss_4_0_2_CP/webservice/src/main/org/jboss/webservice/deployment/ServiceDescription.java 2006-10-20 17:01:02 UTC (rev 57758)
+++ branches/JBoss_4_0_2_CP/webservice/src/main/org/jboss/webservice/deployment/ServiceDescription.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -137,7 +137,9 @@
{
initServiceStyle();
initServiceUse();
+ initTypeMappings();
initOperations();
+ // operations might have contained user types
initTypeMappings();
}
@@ -592,13 +594,16 @@
boolean outHeader = isHeaderParam(opWsdlName, paramName);
QName element = wsdlPart.getElementName();
- if (typeQName == null && element != null)
- typeQName = element;
-
- if (typeQName != null)
+ if (element != null)
{
- typeQName = nsRegistry.registerQName(typeQName);
- userTypes.add(typeQName);
+ if (outHeader == false)
+ {
+ paramName = element.getLocalPart();
+ }
+ if (typeQName == null)
+ {
+ typeQName = guessTypeFromElement(element);
+ }
}
// Get the param mode from jaxrpc-mapping
@@ -652,9 +657,20 @@
boolean inHeader = isHeaderParam(opWsdlName, paramName);
- if (typeQName == null && wsdlPart.getElementName() != null)
- typeQName = wsdlPart.getElementName();
+ QName element = wsdlPart.getElementName();
+ if (element != null)
+ {
+ if (inHeader == false)
+ {
+ paramName = element.getLocalPart();
+ }
+ if (typeQName == null)
+ {
+ typeQName = guessTypeFromElement(element);
+ }
+ }
+
if (typeQName != null)
{
typeQName = nsRegistry.registerQName(typeQName);
@@ -691,7 +707,9 @@
QName faultQName = wsdlPart.getElementName();
if (typeQName == null && faultQName != null)
- typeQName = faultQName;
+ {
+ typeQName = guessTypeFromElement(faultQName);
+ }
if (typeQName != null)
typeQName = nsRegistry.registerQName(typeQName);
@@ -743,6 +761,34 @@
log.warn("Cannot find any operations for portType: " + wsdlPortType.getQName());
}
+ private QName guessTypeFromElement(QName element)
+ {
+ QName typeQName = null;
+ Iterator it = typeMappings.keySet().iterator();
+ while(typeQName == null && it.hasNext())
+ {
+ QName xmlType = (QName)it.next();
+ if (xmlType.equals(element))
+ {
+ typeQName = xmlType;
+ }
+ else if (xmlType.getLocalPart().equalsIgnoreCase(element.getLocalPart() + "Type"))
+ {
+ typeQName = xmlType;
+ }
+ else if (xmlType.getLocalPart().equalsIgnoreCase(element.getLocalPart()))
+ {
+ typeQName = xmlType;
+ }
+ }
+ if (typeQName == null)
+ {
+ typeQName = element;
+ }
+ log.warn("Guess type from " + element + ": " + typeQName);
+ return typeQName;
+ }
+
/** Reorder the parameters */
private void reorderOperationParameters(OperationDescription opDesc, javax.wsdl.Operation wsdlOperation)
{
Modified: branches/JBoss_4_0_2_CP/webservice/src/main/org/jboss/webservice/encoding/ser/MetaDataTypeDesc.java
===================================================================
--- branches/JBoss_4_0_2_CP/webservice/src/main/org/jboss/webservice/encoding/ser/MetaDataTypeDesc.java 2006-10-20 17:01:02 UTC (rev 57758)
+++ branches/JBoss_4_0_2_CP/webservice/src/main/org/jboss/webservice/encoding/ser/MetaDataTypeDesc.java 2006-10-20 17:05:17 UTC (rev 57759)
@@ -17,6 +17,7 @@
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.webservice.deployment.BeanXMLMetaData;
import org.jboss.webservice.deployment.MetaDataRegistry;
+import org.jboss.webservice.deployment.BeanXMLMetaData.ElementMetaData;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -174,6 +175,12 @@
fieldDesc = new ElementDesc();
((ElementDesc)fieldDesc).setAsContent(asContent);
((ElementDesc)fieldDesc).setItemXmlType(elMetaData.getItemXmlType());
+
+ Integer minOccurs = elMetaData.getMinOccurs();
+ if (minOccurs != null)
+ {
+ ((ElementDesc)fieldDesc).setMinOccurs(minOccurs.intValue());
+ }
}
fieldDesc.setFieldName(fieldName);
@@ -186,17 +193,31 @@
private void setupElementOrder(BeanXMLMetaData metaData)
{
// Setup element order
- Iterator itElementOrder = metaData.getElementOrder();
+ Iterator itElementOrder = metaData.getElementOrder().iterator();
if (itElementOrder.hasNext())
{
Map bpdMap = getPropertyDescriptorMap();
+
+ // Remove the properties that are not in the meta data
+ ArrayList keys = new ArrayList(bpdMap.keySet());
+ Iterator it = keys.iterator();
+ while (it.hasNext())
+ {
+ String propName = (String)it.next();
+ ElementMetaData elMetaData = metaData.getElementMetaDataByFieldName(propName);
+ if ("class".equals(propName) == false && elMetaData == null)
+ {
+ log.warn("Removing unmapped property: " + propName);
+ bpdMap.remove(propName);
+ }
+ }
+ keys = new ArrayList(bpdMap.keySet());
+
BeanPropertyDescriptor[] bpdArr = new BeanPropertyDescriptor[bpdMap.size()];
int index = 0;
if (bpdMap.size() > 0)
{
- ArrayList keys = new ArrayList(bpdMap.keySet());
-
// The first one is fixed
BeanPropertyDescriptor bpd = (BeanPropertyDescriptor)bpdMap.get("class");
if (bpd != null)
@@ -219,7 +240,7 @@
}
// copy the remaining BeanPropertyDescriptors
- Iterator it = keys.iterator();
+ it = keys.iterator();
while (it.hasNext())
{
String name = (String)it.next();
More information about the jboss-cvs-commits
mailing list