[jboss-svn-commits] JBL Code SVN: r33592 - in labs/jbosstm/trunk/XTS: WS-C/dev/src11/com/arjuna/webservices11 and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jun 22 07:08:42 EDT 2010
Author: adinn
Date: 2010-06-22 07:08:41 -0400 (Tue, 22 Jun 2010)
New Revision: 33592
Added:
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/soapfault/
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/soapfault/SoapFaultConstants.java
Modified:
labs/jbosstm/trunk/XTS/WS-C/dev/dd/soapfault/wsdl/soapfault.wsdl
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/TestUtil.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionCoordinatorTestCase.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCParticipantTestCase.java
Log:
fixed tests to install SoapFaultService metadata into FaultTo endpoints to allow CXF tests to continue -- may not be the correct fix though for JBTN-753
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/dd/soapfault/wsdl/soapfault.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/dd/soapfault/wsdl/soapfault.wsdl 2010-06-22 10:25:13 UTC (rev 33591)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/dd/soapfault/wsdl/soapfault.wsdl 2010-06-22 11:08:41 UTC (rev 33592)
@@ -14,7 +14,7 @@
<types>
<s:schema>
<s:import namespace="http://schemas.xmlsoap.org/soap/envelope/"
- schemaLocation="http://schemas.xmlsoap.org/soap/envelope"/>
+ schemaLocation="http://schemas.xmlsoap.org/soap/envelope/"/>
</s:schema>
</types>
<message name="SoapFault">
Added: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/soapfault/SoapFaultConstants.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/soapfault/SoapFaultConstants.java (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/soapfault/SoapFaultConstants.java 2010-06-22 11:08:41 UTC (rev 33592)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat Inc., and individual contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a full listing
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.arjuna.webservices11.soapfault;
+
+import javax.xml.namespace.QName;
+
+/**
+ * constants identifying the soap fault service employed for JaxWS dispatch and delivery of asynch fauls generated by
+ * endpoint web methods which implement oneway messages
+ */
+public interface SoapFaultConstants
+{
+ /**
+ * The Namespace.
+ */
+ public String SOAPFAULT_NAMESPACE = "http://jbossts.jboss.org/xts/soapfault" ;
+
+ /**
+ * the service name
+ */
+ public String SOAPFAULT_SERVICE_NAME = "SoapFaultService";
+
+ /**
+ * the service QName
+ */
+ public QName SOAPFAULT_SERVICE_QNAME = new QName(SOAPFAULT_NAMESPACE, SOAPFAULT_SERVICE_NAME);
+
+ /**
+ * the port name
+ */
+ public String SOAPFAULT_PORT_NAME = "SoapFaultPortType";
+
+ /**
+ * the port QName
+ */
+ public QName SOAPFAULT_PORT_QNAME = new QName(SOAPFAULT_NAMESPACE, SOAPFAULT_PORT_NAME);
+}
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/TestUtil.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/TestUtil.java 2010-06-22 10:25:13 UTC (rev 33591)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/TestUtil.java 2010-06-22 11:08:41 UTC (rev 33592)
@@ -26,6 +26,7 @@
package com.arjuna.wst11.tests;
+import com.arjuna.webservices11.soapfault.SoapFaultConstants;
import com.arjuna.webservices11.wsba.BusinessActivityConstants;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
@@ -97,6 +98,14 @@
id);
}
+ public static W3CEndpointReference getCoordinatorFaultToEndpoint(String id)
+ {
+ return getEndpoint(SoapFaultConstants.SOAPFAULT_SERVICE_QNAME,
+ SoapFaultConstants.SOAPFAULT_PORT_QNAME,
+ coordinatorServiceURI,
+ id);
+ }
+
public static W3CEndpointReference getCompletionInitiatorEndpoint(String id)
{
return getEndpoint(AtomicTransactionConstants.COMPLETION_INITIATOR_SERVICE_QNAME,
@@ -105,6 +114,14 @@
id);
}
+ public static W3CEndpointReference getCompletionInitiatorFaultToEndpoint(String id)
+ {
+ return getEndpoint(SoapFaultConstants.SOAPFAULT_SERVICE_QNAME,
+ SoapFaultConstants.SOAPFAULT_PORT_QNAME,
+ completionInitiatorServiceURI,
+ id);
+ }
+
public static W3CEndpointReference getCompletionCoordinatorEndpoint(String id)
{
return getEndpoint(AtomicTransactionConstants.COMPLETION_COORDINATOR_SERVICE_QNAME,
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionCoordinatorTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionCoordinatorTestCase.java 2010-06-22 10:25:13 UTC (rev 33591)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionCoordinatorTestCase.java 2010-06-22 11:08:41 UTC (rev 33592)
@@ -145,7 +145,7 @@
final String messageId = "123456" ;
final String reason = "testSendErrorReason" ;
final String instanceIdentifier = "testSendError" ;
- final W3CEndpointReference completionInitiatorEndpoint = TestUtil.getCompletionInitiatorEndpoint(instanceIdentifier);
+ final W3CEndpointReference completionInitiatorEndpoint = TestUtil.getCompletionInitiatorFaultToEndpoint(instanceIdentifier);
final MAP map = AddressingHelper.createRequestContext(TestUtil.completionInitiatorServiceURI, messageId) ;
final SoapFaultType soapFaultType = SoapFaultType.FAULT_SENDER ;
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCParticipantTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCParticipantTestCase.java 2010-06-22 10:25:13 UTC (rev 33591)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCParticipantTestCase.java 2010-06-22 11:08:41 UTC (rev 33592)
@@ -135,7 +135,7 @@
{
final String messageId = "testSendError" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("5");
- W3CEndpointReference coordinatorEndpoint = TestUtil.getCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
+ W3CEndpointReference coordinatorEndpoint = TestUtil.getCoordinatorFaultToEndpoint(instanceIdentifier.getInstanceIdentifier());
final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorServiceURI, messageId);
final String reason = "testSendErrorReason" ;
final SoapFaultType soapFaultType = SoapFaultType.FAULT_SENDER ;
More information about the jboss-svn-commits
mailing list