[jboss-svn-commits] JBL Code SVN: r26581 - in labs/jbosstm/trunk/XTS/interop: WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon May 18 04:53:40 EDT 2009
Author: adinn
Date: 2009-05-18 04:53:39 -0400 (Mon, 18 May 2009)
New Revision: 26581
Modified:
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/InitiatorPortTypeImpl.java
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/ParticipantPortTypeImpl.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/InitiatorPortTypeImpl.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/InitiatorPortTypeImpl.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java
Log:
added missing fault handling code to the end point implementation classes and also made them implement the relevant server endpoint interfaces
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/InitiatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/InitiatorPortTypeImpl.java 2009-05-18 08:32:03 UTC (rev 26580)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/InitiatorPortTypeImpl.java 2009-05-18 08:53:39 UTC (rev 26581)
@@ -21,6 +21,7 @@
package com.jboss.transaction.wstf.webservices.sc007.sei;
import com.jboss.transaction.wstf.webservices.sc007.processors.InitiatorProcessor;
+import com.jboss.transaction.wstf.webservices.sc007.generated.InitiatorPortType;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import org.jboss.jbossts.xts.wsaddr.map.MAP;
@@ -41,6 +42,7 @@
import javax.jws.soap.SOAPBinding;
import org.jboss.jbossts.xts.soapfault.Fault;
+import org.jboss.jbossts.xts.soapfault.SoapFaultPortType;
/**
* Implementation class for WSTX 1.1 AT Interop Test Initiator service
@@ -51,7 +53,7 @@
portName = "sc007InitiatorPort",
serviceName="sc007Service")
@Addressing(required=true)
-public class InitiatorPortTypeImpl {
+public class InitiatorPortTypeImpl implements InitiatorPortType, SoapFaultPortType {
/**
* injected resource providing access to WSA addressing properties
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/ParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/ParticipantPortTypeImpl.java 2009-05-18 08:32:03 UTC (rev 26580)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/ParticipantPortTypeImpl.java 2009-05-18 08:53:39 UTC (rev 26581)
@@ -22,9 +22,12 @@
import com.jboss.transaction.wstf.webservices.sc007.processors.ParticipantProcessor;
import com.jboss.transaction.wstf.webservices.sc007.client.InitiatorClient;
+import com.jboss.transaction.wstf.webservices.sc007.generated.ParticipantPortType;
import com.jboss.transaction.wstf.webservices.CoordinationContextManager;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.soapfault.SoapFaultPortType;
+import org.jboss.jbossts.xts.soapfault.Fault;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.wsc11.messaging.MessageId;
@@ -49,7 +52,7 @@
serviceName="sc007Service")
@Addressing(required=true)
@HandlerChain(file="participanthandlers.xml")
-public class ParticipantPortTypeImpl {
+public class ParticipantPortTypeImpl implements ParticipantPortType, SoapFaultPortType {
/**
* injected resource providing access to WSA addressing properties
@@ -393,4 +396,14 @@
throw new ProtocolException(th);
}
}
+
+
+ public void soapFault(
+ @WebParam(name = "Fault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "fault")
+ Fault fault)
+ {
+ // hmm, probably ought not to happen -- just log this as an error
+ SoapFault11 soapFaultInternal = SoapFault11.fromFault(fault);
+ System.out.println("com.jboss.transaction.txinterop.webservices.sc007.sei.ParticipantPortTypeImpl_3: unexpected soap fault " + soapFaultInternal);
+ }
}
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/InitiatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/InitiatorPortTypeImpl.java 2009-05-18 08:32:03 UTC (rev 26580)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/InitiatorPortTypeImpl.java 2009-05-18 08:53:39 UTC (rev 26581)
@@ -21,6 +21,7 @@
package com.jboss.transaction.txinterop.webservices.atinterop.sei;
import com.jboss.transaction.txinterop.webservices.atinterop.processors.ATInitiatorProcessor;
+import com.jboss.transaction.txinterop.webservices.atinterop.generated.InitiatorPortType;
import com.arjuna.webservices11.SoapFault11;
import org.jboss.jbossts.xts.wsaddr.map.MAP;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
@@ -40,6 +41,7 @@
import javax.jws.WebParam;
import javax.jws.soap.SOAPBinding;
import org.jboss.jbossts.xts.soapfault.Fault;
+import org.jboss.jbossts.xts.soapfault.SoapFaultPortType;
/**
* Implementation class for WSTX 1.1 AT Interop Test Initiator service
@@ -50,7 +52,7 @@
wsdlLocation="/WEB-INF/wsdl/interopat-initiator-binding.wsdl",
serviceName="InitiatorService")
@Addressing(required=true)
-public class InitiatorPortTypeImpl {
+public class InitiatorPortTypeImpl implements InitiatorPortType, SoapFaultPortType {
/**
* injected resource providing access to WSA addressing properties
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java 2009-05-18 08:32:03 UTC (rev 26580)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java 2009-05-18 08:53:39 UTC (rev 26581)
@@ -22,9 +22,12 @@
import com.jboss.transaction.txinterop.webservices.atinterop.processors.ATParticipantProcessor;
import com.jboss.transaction.txinterop.webservices.atinterop.client.InitiatorClient;
+import com.jboss.transaction.txinterop.webservices.atinterop.generated.ParticipantPortType;
import com.jboss.transaction.txinterop.webservices.CoordinationContextManager;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.soapfault.SoapFaultPortType;
+import org.jboss.jbossts.xts.soapfault.Fault;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.wsc11.messaging.MessageId;
@@ -49,7 +52,7 @@
serviceName="ParticipantService")
@Addressing(required=true)
@HandlerChain(file="participanthandlers.xml")
-public class ParticipantPortTypeImpl {
+public class ParticipantPortTypeImpl implements ParticipantPortType, SoapFaultPortType {
/**
* injected resource providing access to WSA addressing properties
@@ -393,4 +396,13 @@
throw new ProtocolException(th);
}
}
+
+ public void soapFault(
+ @WebParam(name = "Fault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "fault")
+ Fault fault)
+ {
+ // hmm, probably ought not to happen -- just log this as an error
+ SoapFault11 soapFaultInternal = SoapFault11.fromFault(fault);
+ System.out.println("com.jboss.transaction.txinterop.webservices.atinterop.sei.ParticipantPortTypeImpl_3: unexpected soap fault " + soapFaultInternal);
+ }
}
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/InitiatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/InitiatorPortTypeImpl.java 2009-05-18 08:32:03 UTC (rev 26580)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/InitiatorPortTypeImpl.java 2009-05-18 08:53:39 UTC (rev 26581)
@@ -21,8 +21,12 @@
package com.jboss.transaction.txinterop.webservices.bainterop.sei;
import com.jboss.transaction.txinterop.webservices.bainterop.processors.BAInitiatorProcessor;
+import com.jboss.transaction.txinterop.webservices.bainterop.generated.InitiatorPortType;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.SoapFault11;
import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.soapfault.SoapFaultPortType;
+import org.jboss.jbossts.xts.soapfault.Fault;
import javax.xml.ws.RequestWrapper;
import javax.xml.ws.WebServiceContext;
@@ -35,6 +39,7 @@
import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebService;
+import javax.jws.WebParam;
import javax.xml.ws.soap.Addressing;
/**
@@ -46,7 +51,7 @@
wsdlLocation="/WEB-INF/wsdl/interopba-initiator-binding.wsdl",
serviceName="InitiatorService")
@Addressing(required=true)
-public class InitiatorPortTypeImpl {
+public class InitiatorPortTypeImpl implements InitiatorPortType, SoapFaultPortType {
/**
* injected resource providing access to WSA addressing properties
@@ -68,4 +73,14 @@
BAInitiatorProcessor.getInitiator().handleResponse(inboundMap) ;
}
+ public void soapFault(
+ @WebParam(name = "Fault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "fault")
+ Fault fault)
+ {
+ MessageContext ctx = webServiceCtx.getMessageContext();
+ MAP inboundMap = AddressingHelper.inboundMap(ctx);
+
+ SoapFault11 soapFaultInternal = SoapFault11.fromFault(fault);
+ BAInitiatorProcessor.getInitiator().handleSoapFault(soapFaultInternal, inboundMap) ;
+ }
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java 2009-05-18 08:32:03 UTC (rev 26580)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java 2009-05-18 08:53:39 UTC (rev 26581)
@@ -22,9 +22,12 @@
import com.jboss.transaction.txinterop.webservices.bainterop.client.InitiatorClient;
import com.jboss.transaction.txinterop.webservices.bainterop.processors.BAParticipantProcessor;
+import com.jboss.transaction.txinterop.webservices.bainterop.generated.ParticipantPortType;
import com.jboss.transaction.txinterop.webservices.CoordinationContextManager;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import org.jboss.jbossts.xts.wsaddr.map.MAP;
+import org.jboss.jbossts.xts.soapfault.SoapFaultPortType;
+import org.jboss.jbossts.xts.soapfault.Fault;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.wsc11.messaging.MessageId;
@@ -48,7 +51,7 @@
serviceName="ParticipantService")
@Addressing(required=true)
@HandlerChain(file="participanthandlers.xml")
-public class ParticipantPortTypeImpl {
+public class ParticipantPortTypeImpl implements ParticipantPortType, SoapFaultPortType {
/**
* injected resource providing access to WSA addressing properties
@@ -330,4 +333,14 @@
throw new ProtocolException(th);
}
}
+
+
+ public void soapFault(
+ @WebParam(name = "Fault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "fault")
+ Fault fault)
+ {
+ // hmm, probably ought not to happen -- just log this as an error
+ SoapFault11 soapFaultInternal = SoapFault11.fromFault(fault);
+ System.out.println("com.jboss.transaction.txinterop.webservices.bainterop.sei.ParticipantPortTypeImpl_3: unexpected soap fault " + soapFaultInternal);
+ }
}
\ No newline at end of file
More information about the jboss-svn-commits
mailing list