[jboss-svn-commits] JBL Code SVN: r32813 - in labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS: WS-C/dev/src11/com/arjuna/webservices11/wscoor and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue May 11 04:49:20 EDT 2010
Author: adinn
Date: 2010-05-11 04:49:19 -0400 (Tue, 11 May 2010)
New Revision: 32813
Added:
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/dev/src/com/arjuna/wsc/CannotRegisterException.java
Modified:
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/CoordinationConstants.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/dev/src11/com/arjuna/wsc11/RegistrationCoordinator.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/ActivationCoordinatorProcessorImpl.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/RegistrationCoordinatorProcessorImpl.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/EnduranceTestCase.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/RegistrationServiceExceptionTestCase.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestRegistrationCoordinatorProcessor.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WSTX/classes11/com/arjuna/mw/wst11/BusinessActivityManager.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WSTX/classes11/com/arjuna/mw/wst11/TransactionManager.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WSTX/classes11/com/arjuna/mwlabs/wst11/at/remote/TransactionManagerImple.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WSTX/classes11/com/arjuna/mwlabs/wst11/at/remote/UserTransactionImple.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WSTX/classes11/com/arjuna/mwlabs/wst11/ba/remote/BusinessActivityManagerImple.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/docs/ProgrammersGuide.odt
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/docs/ProgrammersGuide.pdf
Log:
backported fixes for JBTM-489 to 4.6.1.GA.CP branch
Added: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/dev/src/com/arjuna/wsc/CannotRegisterException.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/dev/src/com/arjuna/wsc/CannotRegisterException.java (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/dev/src/com/arjuna/wsc/CannotRegisterException.java 2010-05-11 08:49:19 UTC (rev 32813)
@@ -0,0 +1,37 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2010 Red Hat Inc and individual contributors as identified
+* 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.
+*
+* @authors Andrew Dinn
+ */
+
+package com.arjuna.wsc;
+
+public class CannotRegisterException extends Exception
+{
+ public CannotRegisterException()
+ {
+ }
+
+ public CannotRegisterException(String message)
+ {
+ super(message);
+ }
+}
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/CoordinationConstants.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/CoordinationConstants.java 2010-05-11 08:36:50 UTC (rev 32812)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/CoordinationConstants.java 2010-05-11 08:49:19 UTC (rev 32813)
@@ -189,21 +189,21 @@
*/
public String WSCOOR_ACTION_FAULT = WSCOOR_NAMESPACE + "/fault" ;
/**
- * The AlreadyRegistered error code.
+ * The CannotRegister error code.
*/
- public String WSCOOR_ERROR_CODE_ALREADY_REGISTERED = "AlreadyRegistered" ;
+ public String WSCOOR_ERROR_CODE_CANNOT_REGISTER = "CannotRegister" ;
/**
- * The AlreadyRegistered error code QName.
+ * The CannotRegister error code QName.
*/
- public QName WSCOOR_ERROR_CODE_ALREADY_REGISTERED_QNAME = new QName(WSCOOR_NAMESPACE, WSCOOR_ERROR_CODE_ALREADY_REGISTERED, WSCOOR_PREFIX) ;
+ public QName WSCOOR_ERROR_CODE_CANNOT_REGISTER_QNAME = new QName(WSCOOR_NAMESPACE, WSCOOR_ERROR_CODE_CANNOT_REGISTER, WSCOOR_PREFIX) ;
/**
- * The ContextRefused error code.
+ * The CannotCreateContext error code.
*/
- public String WSCOOR_ERROR_CODE_CONTEXT_REFUSED = "ContextRefused" ;
+ public String WSCOOR_ERROR_CODE_CANNOT_CREATE_CONTEXT = "CannotCreateContext" ;
/**
- * The ContextRefused error code QName.
+ * The CannotCreateContext error code QName.
*/
- public QName WSCOOR_ERROR_CODE_CONTEXT_REFUSED_QNAME = new QName(WSCOOR_NAMESPACE, WSCOOR_ERROR_CODE_CONTEXT_REFUSED, WSCOOR_PREFIX) ;
+ public QName WSCOOR_ERROR_CODE_CANNOT_CREATE_CONTEXT_QNAME = new QName(WSCOOR_NAMESPACE, WSCOOR_ERROR_CODE_CANNOT_CREATE_CONTEXT, WSCOOR_PREFIX) ;
/**
* The InvalidParameters error code.
*/
@@ -229,14 +229,6 @@
*/
public QName WSCOOR_ERROR_CODE_INVALID_STATE_QNAME = new QName(WSCOOR_NAMESPACE, WSCOOR_ERROR_CODE_INVALID_STATE, WSCOOR_PREFIX) ;
/**
- * The NoActivity error code.
- */
- public String WSCOOR_ERROR_CODE_NO_ACTIVITY = "NoActivity" ;
- /**
- * The NoActivity error code QName.
- */
- public QName WSCOOR_ERROR_CODE_NO_ACTIVITY_QNAME = new QName(WSCOOR_NAMESPACE, WSCOOR_ERROR_CODE_NO_ACTIVITY, WSCOOR_PREFIX) ;
- /**
* The unexpected exception error code.
*/
public String WSCOOR_ERROR_CODE_EXCEPTION = "Exception" ;
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/dev/src11/com/arjuna/wsc11/RegistrationCoordinator.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/dev/src11/com/arjuna/wsc11/RegistrationCoordinator.java 2010-05-11 08:36:50 UTC (rev 32812)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/dev/src11/com/arjuna/wsc11/RegistrationCoordinator.java 2010-05-11 08:49:19 UTC (rev 32813)
@@ -4,10 +4,7 @@
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wscoor.CoordinationConstants;
import com.arjuna.webservices11.wscoor.client.WSCOORClient;
-import com.arjuna.wsc.AlreadyRegisteredException;
-import com.arjuna.wsc.InvalidProtocolException;
-import com.arjuna.wsc.InvalidStateException;
-import com.arjuna.wsc.NoActivityException;
+import com.arjuna.wsc.*;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.RegisterResponseType;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.RegisterType;
@@ -40,8 +37,8 @@
public static W3CEndpointReference register(final CoordinationContextType coordinationContext,
final String messageID, final W3CEndpointReference participantProtocolService,
final String protocolIdentifier)
- throws AlreadyRegisteredException, InvalidProtocolException,
- InvalidStateException, NoActivityException, SoapFault
+ throws CannotRegisterException, InvalidProtocolException,
+ InvalidStateException, SoapFault
{
final W3CEndpointReference endpointReference = coordinationContext.getRegistrationService() ;
@@ -59,9 +56,9 @@
// TODO -- work out which faults we should really throw. in particular do we need to retain SoapFault
final SOAPFault soapFault = sfe.getFault() ;
final QName subcode = soapFault.getFaultCodeAsQName() ;
- if (CoordinationConstants.WSCOOR_ERROR_CODE_ALREADY_REGISTERED_QNAME.equals(subcode))
+ if (CoordinationConstants.WSCOOR_ERROR_CODE_CANNOT_REGISTER_QNAME.equals(subcode))
{
- throw new AlreadyRegisteredException(soapFault.getFaultString()) ;
+ throw new CannotRegisterException(soapFault.getFaultString()) ;
}
else if (CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_PROTOCOL_QNAME.equals(subcode))
{
@@ -71,10 +68,6 @@
{
throw new InvalidStateException(soapFault.getFaultString()) ;
}
- else if (CoordinationConstants.WSCOOR_ERROR_CODE_NO_ACTIVITY_QNAME.equals(subcode))
- {
- throw new NoActivityException(soapFault.getFaultString()) ;
- }
throw new SoapFault11(sfe);
}
}
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/ActivationCoordinatorProcessorImpl.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/ActivationCoordinatorProcessorImpl.java 2010-05-11 08:36:50 UTC (rev 32812)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/ActivationCoordinatorProcessorImpl.java 2010-05-11 08:49:19 UTC (rev 32813)
@@ -88,9 +88,8 @@
WSCLogger.arjLoggerI18N.debug("com.arjuna.wsc11.messaging.ActivationCoordinatorProcessorImpl_2", th) ;
}
SOAPFactory factory = SOAPFactory.newInstance();
- SOAPFault soapFault = factory.createFault() ;
- soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_EXCEPTION_QNAME).addTextNode(th.getMessage());
- throw new SOAPFaultException(soapFault);
+ SOAPFault soapFault = factory.createFault(SoapFaultType.FAULT_SENDER.getValue(), CoordinationConstants.WSCOOR_ERROR_CODE_CANNOT_CREATE_CONTEXT_QNAME) ;
+ soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_CANNOT_CREATE_CONTEXT_QNAME).addTextNode(th.getMessage()); throw new SOAPFaultException(soapFault);
}
}
else
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/RegistrationCoordinatorProcessorImpl.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/RegistrationCoordinatorProcessorImpl.java 2010-05-11 08:36:50 UTC (rev 32812)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/dev/src11/com/arjuna/wsc11/messaging/RegistrationCoordinatorProcessorImpl.java 2010-05-11 08:49:19 UTC (rev 32813)
@@ -83,8 +83,8 @@
catch (final AlreadyRegisteredException alreadyRegisteredException)
{
SOAPFactory factory = SOAPFactory.newInstance();
- SOAPFault soapFault = factory.createFault(SoapFaultType.FAULT_SENDER.getValue(), CoordinationConstants.WSCOOR_ERROR_CODE_ALREADY_REGISTERED_QNAME);
- soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_ALREADY_REGISTERED_QNAME).addTextNode(WSCLogger.log_mesg.getString("com.arjuna.wsc11.messaging.RegistrationCoordinatorProcessorImpl_1"));
+ SOAPFault soapFault = factory.createFault(SoapFaultType.FAULT_SENDER.getValue(), CoordinationConstants.WSCOOR_ERROR_CODE_CANNOT_REGISTER_QNAME);
+ soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_CANNOT_REGISTER_QNAME).addTextNode(WSCLogger.log_mesg.getString("com.arjuna.wsc11.messaging.RegistrationCoordinatorProcessorImpl_1"));
throw new SOAPFaultException(soapFault);
}
catch (final InvalidProtocolException invalidProtocolException)
@@ -104,8 +104,8 @@
catch (final NoActivityException noActivityException)
{
SOAPFactory factory = SOAPFactory.newInstance();
- SOAPFault soapFault = factory.createFault(SoapFaultType.FAULT_SENDER.getValue(), CoordinationConstants.WSCOOR_ERROR_CODE_NO_ACTIVITY_QNAME);
- soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_NO_ACTIVITY_QNAME).addTextNode(WSCLogger.log_mesg.getString("com.arjuna.wsc11.messaging.RegistrationCoordinatorProcessorImpl_4"));
+ SOAPFault soapFault = factory.createFault(SoapFaultType.FAULT_SENDER.getValue(), CoordinationConstants.WSCOOR_ERROR_CODE_CANNOT_REGISTER_QNAME);
+ soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_CANNOT_REGISTER_QNAME).addTextNode(WSCLogger.log_mesg.getString("com.arjuna.wsc11.messaging.RegistrationCoordinatorProcessorImpl_4"));
throw new SOAPFaultException(soapFault);
}
catch (final Throwable th)
@@ -115,8 +115,8 @@
WSCLogger.arjLoggerI18N.debug("com.arjuna.wsc11.messaging.RegistrationCoordinatorProcessorImpl_5", th) ;
}
SOAPFactory factory = SOAPFactory.newInstance();
- SOAPFault soapFault = factory.createFault();
- soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_EXCEPTION_QNAME).addTextNode(th.getMessage());
+ SOAPFault soapFault = factory.createFault(SoapFaultType.FAULT_SENDER.getValue(), CoordinationConstants.WSCOOR_ERROR_CODE_CANNOT_REGISTER_QNAME);
+ soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_CANNOT_REGISTER_QNAME).addTextNode(th.getMessage());
throw new SOAPFaultException(soapFault);
}
}
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/EnduranceTestCase.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/EnduranceTestCase.java 2010-05-11 08:36:50 UTC (rev 32812)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/EnduranceTestCase.java 2010-05-11 08:49:19 UTC (rev 32813)
@@ -255,20 +255,20 @@
protocolIdentifier = TestUtil.NO_ACTIVITY_PROTOCOL_IDENTIFIER;
try {
coordinator = RegistrationCoordinator.register(coordinationContext, messageId, participantProtocolService, protocolIdentifier) ;
- } catch (NoActivityException nae) {
+ } catch (CannotRegisterException nae) {
}
if (coordinator != null) {
- fail("expected no activity exception");
+ fail("expected cannot register exception");
}
break;
default:
protocolIdentifier = TestUtil.ALREADY_REGISTERED_PROTOCOL_IDENTIFIER;
try {
coordinator = RegistrationCoordinator.register(coordinationContext, messageId, participantProtocolService, protocolIdentifier) ;
- } catch (AlreadyRegisteredException are) {
+ } catch (CannotRegisterException are) {
}
if (coordinator != null) {
- fail("expected already registered exception");
+ fail("expected cannot register exception");
}
break;
}
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/RegistrationServiceExceptionTestCase.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/RegistrationServiceExceptionTestCase.java 2010-05-11 08:36:50 UTC (rev 32812)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/RegistrationServiceExceptionTestCase.java 2010-05-11 08:49:19 UTC (rev 32813)
@@ -26,10 +26,7 @@
package com.arjuna.wsc11.tests.junit;
-import com.arjuna.wsc.AlreadyRegisteredException;
-import com.arjuna.wsc.InvalidProtocolException;
-import com.arjuna.wsc.InvalidStateException;
-import com.arjuna.wsc.NoActivityException;
+import com.arjuna.wsc.*;
import com.arjuna.wsc.tests.TestUtil;
import com.arjuna.wsc11.RegistrationCoordinator;
import com.arjuna.wsc11.tests.TestUtil11;
@@ -56,7 +53,7 @@
{
RegistrationCoordinator.register(coordinationContext, messageId, participantEndpoint, protocolIdentifier) ;
}
- catch (final AlreadyRegisteredException are) {}
+ catch (final CannotRegisterException cre) {}
catch (final Throwable th)
{
fail("Unexpected exception: " + th) ;
@@ -125,7 +122,7 @@
{
RegistrationCoordinator.register(coordinationContext, messageId, participantEndpoint, protocolIdentifier) ;
}
- catch (final NoActivityException nae) {}
+ catch (final CannotRegisterException cre) {}
catch (final Throwable th)
{
fail("Unexpected exception: " + th) ;
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestRegistrationCoordinatorProcessor.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestRegistrationCoordinatorProcessor.java 2010-05-11 08:36:50 UTC (rev 32812)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestRegistrationCoordinatorProcessor.java 2010-05-11 08:49:19 UTC (rev 32813)
@@ -55,8 +55,8 @@
if (TestUtil.ALREADY_REGISTERED_PROTOCOL_IDENTIFIER.equals(protocolIdentifier)) {
try {
SOAPFactory factory = SOAPFactory.newInstance();
- SOAPFault soapFault = factory.createFault(SoapFaultType.FAULT_SENDER.getValue(), CoordinationConstants.WSCOOR_ERROR_CODE_ALREADY_REGISTERED_QNAME);
- soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_ALREADY_REGISTERED_QNAME).addTextNode("already registered");
+ SOAPFault soapFault = factory.createFault(SoapFaultType.FAULT_SENDER.getValue(), CoordinationConstants.WSCOOR_ERROR_CODE_CANNOT_REGISTER_QNAME);
+ soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_CANNOT_REGISTER_QNAME).addTextNode("already registered");
throw new SOAPFaultException(soapFault);
} catch (Throwable th) {
throw new ProtocolException(th);
@@ -85,8 +85,8 @@
if (TestUtil.NO_ACTIVITY_PROTOCOL_IDENTIFIER.equals(protocolIdentifier)) {
try {
SOAPFactory factory = SOAPFactory.newInstance();
- SOAPFault soapFault = factory.createFault(SoapFaultType.FAULT_SENDER.getValue(), CoordinationConstants.WSCOOR_ERROR_CODE_NO_ACTIVITY_QNAME);
- soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_NO_ACTIVITY_QNAME).addTextNode("no activity");
+ SOAPFault soapFault = factory.createFault(SoapFaultType.FAULT_SENDER.getValue(), CoordinationConstants.WSCOOR_ERROR_CODE_CANNOT_REGISTER_QNAME);
+ soapFault.addDetail().addDetailEntry(CoordinationConstants.WSCOOR_ERROR_CODE_CANNOT_REGISTER_QNAME).addTextNode("no activity");
throw new SOAPFaultException(soapFault);
} catch (Throwable th) {
throw new ProtocolException(th);
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WSTX/classes11/com/arjuna/mw/wst11/BusinessActivityManager.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WSTX/classes11/com/arjuna/mw/wst11/BusinessActivityManager.java 2010-05-11 08:36:50 UTC (rev 32812)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WSTX/classes11/com/arjuna/mw/wst11/BusinessActivityManager.java 2010-05-11 08:49:19 UTC (rev 32813)
@@ -83,7 +83,7 @@
*/
public abstract BAParticipantManager enlistForBusinessAgreementWithParticipantCompletion(
final BusinessAgreementWithParticipantCompletionParticipant bap, final String id)
- throws WrongStateException, UnknownTransactionException, AlreadyRegisteredException, SystemException;
+ throws WrongStateException, UnknownTransactionException, SystemException;
/**
* Enlist a participant for the BusinessAgreementWithCoordinatorCompletion protocol.
@@ -92,7 +92,7 @@
*/
public abstract BAParticipantManager enlistForBusinessAgreementWithCoordinatorCompletion(
final BusinessAgreementWithCoordinatorCompletionParticipant bawcp, final String id)
- throws WrongStateException, UnknownTransactionException, AlreadyRegisteredException, SystemException;
+ throws WrongStateException, UnknownTransactionException, SystemException;
/**
* The resume method can be used to (re-)associate a thread with a
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WSTX/classes11/com/arjuna/mw/wst11/TransactionManager.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WSTX/classes11/com/arjuna/mw/wst11/TransactionManager.java 2010-05-11 08:36:50 UTC (rev 32812)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WSTX/classes11/com/arjuna/mw/wst11/TransactionManager.java 2010-05-11 08:49:19 UTC (rev 32813)
@@ -90,7 +90,7 @@
* (e.g., it is terminating) then WrongStateException will be thrown.
*/
public abstract void enlistForVolatileTwoPhase(final Volatile2PCParticipant pzp, final String id)
- throws WrongStateException, UnknownTransactionException, AlreadyRegisteredException, SystemException;
+ throws WrongStateException, UnknownTransactionException, SystemException;
/**
* Enlist the specified participant with current transaction such that it
@@ -103,7 +103,7 @@
* it is terminating) then WrongStateException will be thrown.
*/
public abstract void enlistForDurableTwoPhase(final Durable2PCParticipant tpp, final String id)
- throws WrongStateException, UnknownTransactionException, AlreadyRegisteredException, SystemException;
+ throws WrongStateException, UnknownTransactionException, SystemException;
public abstract int replay () throws SystemException;
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WSTX/classes11/com/arjuna/mwlabs/wst11/at/remote/TransactionManagerImple.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WSTX/classes11/com/arjuna/mwlabs/wst11/at/remote/TransactionManagerImple.java 2010-05-11 08:36:50 UTC (rev 32812)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WSTX/classes11/com/arjuna/mwlabs/wst11/at/remote/TransactionManagerImple.java 2010-05-11 08:49:19 UTC (rev 32813)
@@ -33,8 +33,7 @@
}
public void enlistForDurableTwoPhase (Durable2PCParticipant tpp, String id)
- throws WrongStateException, UnknownTransactionException,
- AlreadyRegisteredException, SystemException
+ throws WrongStateException, UnknownTransactionException, SystemException
{
try
{
@@ -51,15 +50,14 @@
{
throw new WrongStateException();
}
- catch (com.arjuna.wsc.NoActivityException ex)
+ catch (com.arjuna.wsc.CannotRegisterException ex)
{
throw new UnknownTransactionException();
}
}
public void enlistForVolatileTwoPhase (Volatile2PCParticipant tpp, String id)
- throws WrongStateException, UnknownTransactionException,
- AlreadyRegisteredException, SystemException
+ throws WrongStateException, UnknownTransactionException, SystemException
{
try
{
@@ -76,7 +74,7 @@
{
throw new WrongStateException();
}
- catch (com.arjuna.wsc.NoActivityException ex)
+ catch (com.arjuna.wsc.CannotRegisterException ex)
{
ex.printStackTrace();
@@ -123,15 +121,14 @@
}
protected W3CEndpointReference enlistForCompletion (final W3CEndpointReference participantEndpoint)
- throws WrongStateException, UnknownTransactionException,
- AlreadyRegisteredException, SystemException
+ throws WrongStateException, UnknownTransactionException, SystemException
{
try
{
TxContextImple currentTx = (TxContextImple) _ctxManager.currentTransaction();
if (currentTx == null)
- throw new com.arjuna.wsc.NoActivityException();
+ throw new com.arjuna.wsc.CannotRegisterException();
return registerParticipant(participantEndpoint, AtomicTransactionConstants.WSAT_SUB_PROTOCOL_COMPLETION);
}
@@ -145,7 +142,7 @@
{
throw new WrongStateException();
}
- catch (com.arjuna.wsc.NoActivityException ex)
+ catch (com.arjuna.wsc.CannotRegisterException ex)
{
throw new UnknownTransactionException();
}
@@ -174,7 +171,7 @@
}
private final W3CEndpointReference registerParticipant (final W3CEndpointReference participant, final String protocol)
- throws InvalidProtocolException, InvalidStateException, NoActivityException, SystemException
+ throws InvalidProtocolException, InvalidStateException, CannotRegisterException, SystemException
{
TxContextImple currentTx = null;
@@ -183,7 +180,7 @@
currentTx = (TxContextImple) _ctxManager.suspend();
if (currentTx == null)
- throw new NoActivityException();
+ throw new CannotRegisterException();
final CoordinationContextType coordinationContext = currentTx.context().getCoordinationContext() ;
final String messageId = MessageId.getMessageId() ;
@@ -194,9 +191,9 @@
{
throw new SystemException(sf.getMessage());
}
- catch (final NoActivityException nae)
+ catch (final CannotRegisterException cre)
{
- throw nae ;
+ throw cre ;
}
catch (final InvalidStateException ise)
{
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WSTX/classes11/com/arjuna/mwlabs/wst11/at/remote/UserTransactionImple.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WSTX/classes11/com/arjuna/mwlabs/wst11/at/remote/UserTransactionImple.java 2010-05-11 08:36:50 UTC (rev 32812)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WSTX/classes11/com/arjuna/mwlabs/wst11/at/remote/UserTransactionImple.java 2010-05-11 08:49:19 UTC (rev 32813)
@@ -215,20 +215,13 @@
throws WrongStateException, UnknownTransactionException,
SystemException
{
- try
- {
- TransactionManagerImple tm = (TransactionManagerImple) TransactionManager.getTransactionManager();
+ TransactionManagerImple tm = (TransactionManagerImple) TransactionManager.getTransactionManager();
- final TxContextImple txContext = (TxContextImple) tm.currentTransaction();
- final String id = txContext.identifier();
- final W3CEndpointReference completionCoordinator = tm.enlistForCompletion(getCompletionParticipant(id, txContext.isSecure()));
+ final TxContextImple txContext = (TxContextImple) tm.currentTransaction();
+ final String id = txContext.identifier();
+ final W3CEndpointReference completionCoordinator = tm.enlistForCompletion(getCompletionParticipant(id, txContext.isSecure()));
- _completionCoordinators.put(id, completionCoordinator);
- }
- catch (com.arjuna.wsc.AlreadyRegisteredException ex)
- {
- throw new SystemException(ex.toString());
- }
+ _completionCoordinators.put(id, completionCoordinator);
}
/**
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WSTX/classes11/com/arjuna/mwlabs/wst11/ba/remote/BusinessActivityManagerImple.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WSTX/classes11/com/arjuna/mwlabs/wst11/ba/remote/BusinessActivityManagerImple.java 2010-05-11 08:36:50 UTC (rev 32812)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/WSTX/classes11/com/arjuna/mwlabs/wst11/ba/remote/BusinessActivityManagerImple.java 2010-05-11 08:49:19 UTC (rev 32813)
@@ -42,6 +42,7 @@
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.wsc.AlreadyRegisteredException;
+import com.arjuna.wsc.CannotRegisterException;
import com.arjuna.wsc11.RegistrationCoordinator;
import com.arjuna.wsc11.messaging.MessageId;
import com.arjuna.wst.*;
@@ -70,7 +71,7 @@
}
public BAParticipantManager enlistForBusinessAgreementWithParticipantCompletion (BusinessAgreementWithParticipantCompletionParticipant bap, String id)
- throws WrongStateException, UnknownTransactionException, AlreadyRegisteredException, SystemException
+ throws WrongStateException, UnknownTransactionException, SystemException
{
final QName service = BusinessActivityConstants.PARTICIPANT_COMPLETION_PARTICIPANT_SERVICE_QNAME;
final QName endpoint = BusinessActivityConstants.PARTICIPANT_COMPLETION_PARTICIPANT_PORT_QNAME;
@@ -93,7 +94,7 @@
{
throw new WrongStateException();
}
- catch (com.arjuna.wsc.NoActivityException ex)
+ catch (com.arjuna.wsc.CannotRegisterException ex)
{
throw new UnknownTransactionException();
}
@@ -105,7 +106,8 @@
}
}
- public com.arjuna.wst11.BAParticipantManager enlistForBusinessAgreementWithCoordinatorCompletion (BusinessAgreementWithCoordinatorCompletionParticipant bawcp, String id) throws WrongStateException, UnknownTransactionException, AlreadyRegisteredException, SystemException
+ public com.arjuna.wst11.BAParticipantManager enlistForBusinessAgreementWithCoordinatorCompletion (BusinessAgreementWithCoordinatorCompletionParticipant bawcp, String id)
+ throws WrongStateException, UnknownTransactionException, SystemException
{
final QName service = BusinessActivityConstants.COORDINATOR_COMPLETION_PARTICIPANT_SERVICE_QNAME;
final QName endpoint = BusinessActivityConstants.COORDINATOR_COMPLETION_PARTICIPANT_PORT_QNAME;
@@ -128,7 +130,7 @@
{
throw new WrongStateException();
}
- catch (com.arjuna.wsc.NoActivityException ex)
+ catch (com.arjuna.wsc.CannotRegisterException ex)
{
ex.printStackTrace();
@@ -160,7 +162,7 @@
}
private final W3CEndpointReference registerParticipant(final W3CEndpointReference participant, final String protocol)
- throws com.arjuna.wsc.InvalidProtocolException, com.arjuna.wsc.InvalidStateException, com.arjuna.wsc.NoActivityException, SystemException
+ throws com.arjuna.wsc.InvalidProtocolException, com.arjuna.wsc.InvalidStateException, com.arjuna.wsc.CannotRegisterException, SystemException
{
TxContextImple currentTx = null;
@@ -179,7 +181,7 @@
{
throw new SystemException(sf.getMessage());
}
- catch (com.arjuna.wsc.NoActivityException ex)
+ catch (com.arjuna.wsc.CannotRegisterException ex)
{
throw ex;
}
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/docs/ProgrammersGuide.odt
===================================================================
(Binary files differ)
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/XTS/docs/ProgrammersGuide.pdf
===================================================================
(Binary files differ)
More information about the jboss-svn-commits
mailing list