You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by ch...@apache.org on 2006/07/19 04:58:35 UTC
svn commit: r423350 [8/8] - in /webservices/sandesha/trunk/java: ./
src/org/apache/sandesha2/ src/org/apache/sandesha2/client/
src/org/apache/sandesha2/handlers/ src/org/apache/sandesha2/i18n/
src/org/apache/sandesha2/msgprocessors/ src/org/apache/sand...
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Sender.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Sender.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Sender.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Sender.java Tue Jul 18 19:58:31 2006
@@ -35,6 +35,8 @@
import org.apache.sandesha2.RMMsgContext;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.Transaction;
import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
@@ -142,7 +144,7 @@
storageManager = SandeshaUtil.getSandeshaStorageManager(context, context.getAxisConfiguration());
} catch (SandeshaException e2) {
// TODO Auto-generated catch block
- log.debug("ERROR: Could not start sender", e2);
+ log.debug(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotCointinueSender, e2.toString()), e2);
e2.printStackTrace();
return;
}
@@ -163,7 +165,8 @@
try {
if (context == null) {
- String message = "Can't continue the Sender. Context is null";
+ String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.configContextNotSet);
+ message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotCointinueSender, message);
log.debug(message);
throw new SandeshaException(message);
}
@@ -206,7 +209,7 @@
}
if (msgCtx == null) {
- log.debug("ERROR: Sender has an Unavailable Message entry");
+ log.debug(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.sendHasUnavailableMsgEntry));
break;
}
@@ -263,7 +266,8 @@
successfullySent = true;
} catch (Exception e) {
// TODO Auto-generated catch block
- String message = "Sandesha2 got an exception when trying to send the message";
+ String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.sendMsgError, e
+ .toString());
log.debug(message, e);
} finally {
transaction = storageManager.getTransaction();
@@ -317,19 +321,22 @@
transaction.rollback();
rolebacked = true;
} catch (Exception e1) {
- String message = "Exception thrown when trying to roleback the transaction.";
+ String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.rollbackError, e1
+ .toString());
log.debug(message, e1);
}
}
- String message = "An Exception was throws in sending";
+ String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.sendMsgError, e.toString());
+
log.debug(message, e);
} finally {
if (transaction != null && !rolebacked) {
try {
transaction.commit();
} catch (Exception e) {
- String message = "Exception thrown when trying to commit the transaction.";
+ String message = SandeshaMessageHelper
+ .getMessage(SandeshaMessageKeys.commitError, e.toString());
log.debug(message, e);
}
}
@@ -408,7 +415,7 @@
} catch (AxisFault e) {
// TODO Auto-generated catch block
- log.debug("Valid SOAP envelope not found");
+ log.debug(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.soapEnvNotSet));
log.debug(e.getStackTrace().toString());
}
@@ -430,7 +437,7 @@
}
} catch (Exception e) {
- String message = "No valid Sync response...";
+ String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.noValidSyncResponse);
log.debug(message, e);
throw new SandeshaException(message, e);
}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Accept.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Accept.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Accept.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Accept.java Tue Jul 18 19:58:31 2006
@@ -25,6 +25,8 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
/**
* Represents the RM Accept element which may come within the
@@ -44,7 +46,9 @@
public Accept(OMFactory factory, String rmNamespaceValue, String addressingNamespaceValue) throws SandeshaException {
if (!isNamespaceSupported(rmNamespaceValue))
- throw new SandeshaException ("Unsupported namespace");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.unknownNamespace,
+ rmNamespaceValue));
this.defaultFactory = factory;
this.addressingNamespaceValue = addressingNamespaceValue;
@@ -64,7 +68,9 @@
OMElement acceptPart = element.getFirstChildWithName(new QName(
rmNamespaceValue, Sandesha2Constants.WSRM_COMMON.ACCEPT));
if (acceptPart == null)
- throw new OMException("Passed element does not contain an Accept part");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noAcceptPartInElement,
+ element.toString()));
acksTo = new AcksTo(defaultFactory,rmNamespaceValue,addressingNamespaceValue);
acksTo.fromOMElement(acceptPart);
@@ -79,7 +85,8 @@
factory = defaultFactory;
if (acksTo == null)
- throw new OMException("Cant add Accept part since AcksTo object is null");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.acceptNullAcksTo));
OMNamespace rmNamespace = factory.createOMNamespace(rmNamespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
OMElement acceptElement = factory.createOMElement(Sandesha2Constants.WSRM_COMMON.ACCEPT, rmNamespace);
@@ -107,4 +114,4 @@
return false;
}
-}
\ No newline at end of file
+}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckFinal.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckFinal.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckFinal.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckFinal.java Tue Jul 18 19:58:31 2006
@@ -25,6 +25,8 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
/**
* This represent the wsrm:final element that may be present withing a sequence acknowledgement.
@@ -37,7 +39,9 @@
public AckFinal(OMFactory factory,String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
- throw new SandeshaException ("Unsupported namespace");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.unknownSpec,
+ namespaceValue));
this.defaultfactory = factory;
this.namespaceValue = namespaceValue;
@@ -56,7 +60,9 @@
OMElement finalPart = element.getFirstChildWithName(new QName(
namespaceValue, Sandesha2Constants.WSRM_COMMON.FINAL));
if (finalPart == null)
- throw new OMException("The passed element does not contain a 'Final' part");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noFinalPartInElement,
+ element.toString()));
return this;
}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckNone.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckNone.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckNone.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckNone.java Tue Jul 18 19:58:31 2006
@@ -25,6 +25,8 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
/**
@@ -40,7 +42,9 @@
public AckNone(OMFactory factory,String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
- throw new SandeshaException ("Unsupported namespace");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.unknownSpec,
+ namespaceValue));
this.defaultFactory = factory;
this.namespaceValue = namespaceValue;
@@ -55,7 +59,9 @@
OMElement nonePart = element.getFirstChildWithName(new QName(
namespaceValue, Sandesha2Constants.WSRM_COMMON.NONE));
if (nonePart == null)
- throw new OMException("The passed element does not contain a 'None' part");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noNonePartInElement,
+ element.toString()));
return this;
}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckRequested.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckRequested.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckRequested.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckRequested.java Tue Jul 18 19:58:31 2006
@@ -28,6 +28,8 @@
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
/**
* Represent the AckRequested header block.
@@ -47,7 +49,9 @@
public AckRequested(OMFactory factory,String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
- throw new SandeshaException ("Unsupported namespace");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.unknownSpec,
+ namespaceValue));
this.defaultFactory = factory;
this.namespaceValue = namespaceValue;
@@ -60,12 +64,15 @@
public Object fromOMElement(OMElement header) throws OMException,SandeshaException {
if (header == null || !(header instanceof SOAPHeader))
- throw new OMException("Cant add the Ack Requested part to a non-header element");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.ackRequestedCannotBeAddedToNonHeader));
OMElement ackReqPart = header.getFirstChildWithName(new QName(namespaceValue, Sandesha2Constants.WSRM_COMMON.ACK_REQUESTED));
if (ackReqPart == null)
- throw new OMException("the passed element does not contain an ack requested part");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noAckRequestedElement,
+ header.toString()));
identifier = new Identifier(defaultFactory,namespaceValue);
identifier.fromOMElement(ackReqPart);
@@ -85,10 +92,12 @@
if (header == null || !(header instanceof SOAPHeader))
throw new OMException(
- "Cant add the Ack Requested part to a non-header element");
+ SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.ackRequestedCannotBeAddedToNonHeader));
if (identifier == null)
- throw new OMException("Cant add ack Req block since the identifier is null");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.ackRequestNullID));
OMFactory factory = header.getOMFactory();
OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
@@ -151,4 +160,4 @@
return false;
}
-}
\ No newline at end of file
+}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java Tue Jul 18 19:58:31 2006
@@ -26,6 +26,8 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
/**
* Represents and AcknowledgementRange element.
@@ -43,7 +45,9 @@
public AcknowledgementRange(OMFactory factory, String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
- throw new SandeshaException ("Unsupported namespace");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.unknownSpec,
+ namespaceValue));
this.defaultFactory = factory;
this.namespaceValue = namespaceValue;
@@ -56,7 +60,8 @@
public Object fromOMElement(OMElement ackRangePart) throws OMException {
if (ackRangePart == null)
- throw new OMException("The passed element is null");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.nullPassedElement));
OMAttribute lowerAttrib = ackRangePart.getAttribute(new QName(
Sandesha2Constants.WSRM_COMMON.LOWER));
@@ -65,7 +70,9 @@
if (lowerAttrib == null || upperAttrib == null)
throw new OMException(
- "Passed element does not contain upper or lower attributes");
+ SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noUpperOrLowerAttributesInElement,
+ ackRangePart.toString()));
try {
long lower = Long.parseLong(lowerAttrib.getAttributeValue());
@@ -74,7 +81,9 @@
lowerValue = lower;
} catch (Exception ex) {
throw new OMException(
- "The ack range does not have proper long values for Upper and Lower attributes");
+ SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.ackRandDoesNotHaveCorrectValues,
+ ackRangePart.toString()));
}
return this;
@@ -84,11 +93,14 @@
throws OMException {
if (sequenceAckElement == null)
- throw new OMException("Cant set Ack Range part since element is null");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.cannotSetAckRangeNullElement));
if (upperValue <= 0 || lowerValue <= 0 || lowerValue > upperValue)
throw new OMException(
- "Cant set Ack Range part since Upper or Lower is not set to the correct value");
+ SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.ackRandDoesNotHaveCorrectValues,
+ upperValue + ":" + lowerValue));
OMFactory factory = sequenceAckElement.getOMFactory();
if (factory==null)
@@ -134,4 +146,4 @@
return false;
}
-}
\ No newline at end of file
+}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcksTo.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcksTo.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcksTo.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcksTo.java Tue Jul 18 19:58:31 2006
@@ -26,6 +26,8 @@
import org.apache.axiom.soap.SOAPFactory;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
/**
* Represents an AcksTo element which comes within
@@ -44,7 +46,9 @@
public AcksTo(OMFactory factory,String rmNamespaceValue,String addressingNamespaceValue) throws SandeshaException {
if (!isNamespaceSupported(rmNamespaceValue))
- throw new SandeshaException ("Unsupported namespace");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.unknownSpec,
+ rmNamespaceValue));
this.defaultFactory = factory;
this.rmNamespaceValue = rmNamespaceValue;
@@ -65,7 +69,9 @@
rmNamespaceValue, Sandesha2Constants.WSRM_COMMON.ACKS_TO));
if (acksToPart == null)
- throw new OMException("Passed element does not contain an acksTo part");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noAcksToPart,
+ element.toString()));
address = new Address(defaultFactory,addressingNamespaceValue);
address.fromOMElement(acksToPart);
@@ -76,7 +82,9 @@
public OMElement toOMElement(OMElement element) throws OMException {
if (address == null)
- throw new OMException("Cannot set AcksTo. Address is null");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.cannotSetACksTo,
+ null));
OMFactory factory = element.getOMFactory();
if (factory==null)
@@ -108,4 +116,4 @@
return false;
}
-}
\ No newline at end of file
+}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Address.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Address.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Address.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Address.java Tue Jul 18 19:58:31 2006
@@ -15,6 +15,8 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.sandesha2.Sandesha2Constants;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
/**
* Represents an Address element.
@@ -43,11 +45,15 @@
OMElement addressPart = element.getFirstChildWithName(new QName(
addressingNamespaceValue, Sandesha2Constants.WSA.ADDRESS));
if (addressPart == null)
- throw new OMException("Cant find an Address element in the given part");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.cannotFindAddressElement,
+ element.toString()));
String addressText = addressPart.getText();
if (addressText == null || addressText == "")
throw new OMException(
- "Passed element does not have a valid address text");
+ SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.cannotFindAddressText,
+ element.toString()));
epr = new EndpointReference(addressText);
return this;
@@ -60,7 +66,8 @@
public OMElement toOMElement(OMElement element) throws OMException {
if (epr == null || epr.getAddress() == null || epr.getAddress() == "")
- throw new OMException("cant set the address. The address value is not valid");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.addressNotValid));
OMFactory factory = element.getOMFactory();
if (factory==null)
@@ -92,4 +99,4 @@
return false;
}
-}
\ No newline at end of file
+}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequence.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequence.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequence.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequence.java Tue Jul 18 19:58:31 2006
@@ -27,6 +27,8 @@
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
/**
* Adds the Close Sequence body part.
@@ -42,7 +44,9 @@
public CloseSequence(OMFactory factory, String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
- throw new SandeshaException ("Unsupported namespace");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.unknownSpec,
+ namespaceValue));
this.defaultFactory = factory;
this.namespaceValue = namespaceValue;
@@ -55,13 +59,16 @@
public Object fromOMElement(OMElement body) throws OMException,SandeshaException {
if (!(body instanceof SOAPBody))
- throw new OMException("Cant extract 'close sequence' from a non body element");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.closeSeqCannotBeAddedToNonBody));
OMElement closeSeqPart = body.getFirstChildWithName(new QName(
namespaceValue, Sandesha2Constants.WSRM_COMMON.CLOSE_SEQUENCE));
if (closeSeqPart == null)
- throw new OMException("passed element does not contain a close sequence part");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noCloseSequencePartInElement,
+ body.toString()));
identifier = new Identifier(defaultFactory,namespaceValue);
identifier.fromOMElement(closeSeqPart);
@@ -73,10 +80,12 @@
if (body == null || !(body instanceof SOAPBody))
throw new OMException(
- "Cant add close sequence to a nonbody element");
+ SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.closeSeqCannotBeAddedToNonBody));
if (identifier == null)
- throw new OMException("Cant add close sequence since identifier is not set");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.closeSeqPartNullID));
OMFactory factory = body.getOMFactory();
if (factory==null)
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequenceResponse.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequenceResponse.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequenceResponse.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequenceResponse.java Tue Jul 18 19:58:31 2006
@@ -27,6 +27,8 @@
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
/**
* Adds the Close Sequence Response body part.
@@ -41,7 +43,9 @@
public CloseSequenceResponse(OMFactory factory, String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
- throw new SandeshaException ("Unsupported namespace");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.unknownSpec,
+ namespaceValue));
this.defaultFactory = factory;
this.namespaceValue = namespaceValue;
@@ -55,13 +59,16 @@
if (!(body instanceof SOAPBody))
throw new OMException(
- "Cant add 'close sequence response' to a non body element");
+ SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.closeSeqResponseCannotBeAddedToNonBody));
OMElement closeSeqResponsePart = body.getFirstChildWithName(new QName(
namespaceValue, Sandesha2Constants.WSRM_COMMON.CLOSE_SEQUENCE_RESPONSE));
if (closeSeqResponsePart == null)
- throw new OMException("passed element does not contain a 'close sequence response' part");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noCloseSeqResponsePartInElement,
+ body.toString()));
identifier = new Identifier(defaultFactory,namespaceValue);
identifier.fromOMElement(closeSeqResponsePart);
@@ -73,11 +80,13 @@
if (body == null || !(body instanceof SOAPBody))
throw new OMException(
- "Cant add close sequence response to a nonbody element");
+ SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.closeSeqResponseCannotBeAddedToNonBody));
if (identifier == null)
throw new OMException(
- "Cant add close sequence response since identifier is not set");
+ SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.closeSeqResponsePartNullID));
OMFactory factory = body.getOMFactory();
if (factory==null)
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequence.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequence.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequence.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequence.java Tue Jul 18 19:58:31 2006
@@ -28,6 +28,8 @@
import org.apache.axiom.soap.SOAPFactory;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
/**
* Represent the CreateSequence body element.
@@ -49,7 +51,9 @@
public CreateSequence(OMFactory factory,String rmNamespaceValue,String addressingNamespaceValue) throws SandeshaException {
if (!isNamespaceSupported(rmNamespaceValue))
- throw new SandeshaException ("Unsupported namespace");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.unknownSpec,
+ rmNamespaceValue));
this.defaultFactory = factory;
this.rmNamespaceValue = rmNamespaceValue;
@@ -71,7 +75,9 @@
.getFirstChildWithName(new QName(rmNamespaceValue,
Sandesha2Constants.WSRM_COMMON.CREATE_SEQUENCE));
if (createSequencePart == null)
- throw new OMException("Create sequence is not present in the passed element");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noCreateSeqPartInElement,
+ bodyElement.toString()));
acksTo = new AcksTo(defaultFactory,rmNamespaceValue,addressingNamespaceValue);
acksTo.fromOMElement(createSequencePart);
@@ -97,10 +103,12 @@
public OMElement toOMElement(OMElement bodyElement) throws OMException {
if (bodyElement == null || !(bodyElement instanceof SOAPBody))
- throw new OMException("Cant add Create Sequence Part to a non-body element");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.createSeqCannotBeAddedToNonBody));
if (acksTo == null)
- throw new OMException("Cant add create seqeunce part, having acks to as null");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.createSeqNullAcksTo));
SOAPBody soapBody = (SOAPBody) bodyElement;
@@ -162,4 +170,4 @@
return false;
}
-}
\ No newline at end of file
+}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java Tue Jul 18 19:58:31 2006
@@ -27,6 +27,8 @@
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
/**
* Adds the CreateSequenceResponse body part.
@@ -48,7 +50,9 @@
public CreateSequenceResponse(OMFactory factory, String rmNamespaceValue, String addressingNamespaceValue) throws SandeshaException {
if (!isNamespaceSupported(rmNamespaceValue))
- throw new SandeshaException ("Unsupported namespace");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.unknownSpec,
+ rmNamespaceValue));
this.defaultFactory = factory;
this.rmNamespaceValue = rmNamespaceValue;
@@ -62,14 +66,17 @@
public Object fromOMElement(OMElement bodyElement) throws OMException,SandeshaException {
if (bodyElement == null || !(bodyElement instanceof SOAPBody))
- throw new OMException("Cant get create sequnce response from a non-body element");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.createSeqResponseCannotBeAddedToNonBody));
SOAPBody SOAPBody = (SOAPBody) bodyElement;
OMElement createSeqResponsePart = SOAPBody
.getFirstChildWithName(new QName(rmNamespaceValue,Sandesha2Constants.WSRM_COMMON.CREATE_SEQUENCE_RESPONSE));
if (createSeqResponsePart == null)
- throw new OMException("The passed element does not contain a create seqence response part");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noCreateSeqResponsePartInElement,
+ bodyElement.toString()));
identifier = new Identifier(defaultFactory,rmNamespaceValue);
identifier.fromOMElement(createSeqResponsePart);
@@ -97,12 +104,15 @@
if (bodyElement == null || !(bodyElement instanceof SOAPBody))
throw new OMException(
- "Cant get create sequnce response from a non-body element");
+ SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.createSeqResponseCannotBeAddedToNonBody));
SOAPBody SOAPBody = (SOAPBody) bodyElement;
if (identifier == null)
- throw new OMException("cant set create sequnce response since the Identifier is not set");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.invalidIdentifier,
+ bodyElement.toString()));
OMFactory factory = bodyElement.getOMFactory();
if (factory==null)
@@ -177,4 +187,4 @@
return false;
}
-}
\ No newline at end of file
+}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Expires.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Expires.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Expires.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Expires.java Tue Jul 18 19:58:31 2006
@@ -25,6 +25,8 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
/**
* Represents an Expires element.
@@ -40,7 +42,9 @@
public Expires(OMFactory factory,String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
- throw new SandeshaException ("Unsupported namespace");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.unknownSpec,
+ namespaceValue));
this.defaultFactory = factory;
this.namespaceValue = namespaceValue;
@@ -50,10 +54,13 @@
OMElement expiresPart = element.getFirstChildWithName(new QName(
namespaceValue, Sandesha2Constants.WSRM_COMMON.EXPIRES));
if (expiresPart == null)
- throw new OMException("Passed elemenet does not have a Expires part");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noExpiresPartInElement,
+ element.toString()));
String expiresText = expiresPart.getText();
if (expiresText == null || expiresText == "")
- throw new OMException("The duration value is not valid");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.cannotProcessExpires));
duration = expiresText;
return element;
@@ -67,7 +74,8 @@
public OMElement toOMElement(OMElement element) throws OMException {
if (duration == null || duration == "")
- throw new OMException("Cant set Expires. The duration value is not set");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.cannotProcessExpires));
OMFactory factory = element.getOMFactory();
if (factory==null)
@@ -100,4 +108,4 @@
return false;
}
-}
\ No newline at end of file
+}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/FaultCode.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/FaultCode.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/FaultCode.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/FaultCode.java Tue Jul 18 19:58:31 2006
@@ -26,6 +26,8 @@
import org.apache.axiom.soap.SOAPFactory;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
/**
* Represents an FaultCode element.
@@ -41,7 +43,9 @@
public FaultCode(SOAPFactory factory, String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
- throw new SandeshaException ("Unsupported namespace");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.unknownSpec,
+ namespaceValue));
this.defaultFactory = factory;
this.namespaceValue = namespaceValue;
@@ -54,14 +58,18 @@
public Object fromOMElement(OMElement sequenceFault) throws OMException {
if (sequenceFault == null)
- throw new OMException("Can't add Fault Code part since the passed element is null");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noFaultCodePart,
+ null));
OMElement faultCodePart = sequenceFault
.getFirstChildWithName(new QName(namespaceValue,
Sandesha2Constants.WSRM_COMMON.FAULT_CODE));
if (faultCodePart == null)
- throw new OMException("Passed element does not contain a Fauld Code part");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noFaultCode,
+ sequenceFault.toString()));
this.faultCode = faultCodePart.getText();
@@ -73,11 +81,13 @@
if (sequenceFault == null)
throw new OMException(
- "Can't add Fault Code part since the passed element is null");
+ SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.nullPassedElement));
if (faultCode == null || faultCode == "")
throw new OMException(
- "Cant add fault code since the the value is not set correctly.");
+ SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noFaultCode));
OMFactory factory = sequenceFault.getOMFactory();
if (factory==null)
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Identifier.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Identifier.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Identifier.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Identifier.java Tue Jul 18 19:58:31 2006
@@ -29,6 +29,8 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
public class Identifier implements Sandesha2Constants, IOMRMElement {
@@ -40,7 +42,9 @@
public Identifier(OMFactory defaultFactory, String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
- throw new SandeshaException ("Unsupported namespace");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.unknownSpec,
+ namespaceValue));
this.defaultFactory = defaultFactory;
this.namespaceValue = namespaceValue;
@@ -67,11 +71,15 @@
OMElement identifierPart = element.getFirstChildWithName(new QName(
namespaceValue, Sandesha2Constants.WSRM_COMMON.IDENTIFIER));
if (identifierPart == null)
- throw new OMException("The parsed element does not contain an identifier part");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.invalidIdentifier,
+ element.toString()));
String identifierText = identifierPart.getText();
if (identifierText == null || identifierText == "")
- throw new OMException("The identifier value is not valid");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.invalidIdentifier,
+ element.toString()));
identifier = identifierText;
return this;
@@ -80,7 +88,9 @@
public OMElement toOMElement(OMElement element) throws OMException {
if (identifier == null || identifier == "") {
- throw new OMException("identifier is not set .. ");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.invalidIdentifier,
+ element.toString()));
}
OMFactory factory = element.getOMFactory();
@@ -113,4 +123,4 @@
return false;
}
-}
\ No newline at end of file
+}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/LastMessage.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/LastMessage.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/LastMessage.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/LastMessage.java Tue Jul 18 19:58:31 2006
@@ -26,6 +26,8 @@
import org.apache.axiom.soap.SOAPFactory;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
/**
* Represent the LastMessage element defined by the WSRM 1.0 epecification.
@@ -39,7 +41,9 @@
public LastMessage(SOAPFactory factory,String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
- throw new SandeshaException ("Unsupported namespace");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.unknownSpec,
+ namespaceValue));
this.defaultFactory = factory;
this.namespaceValue = namespaceValue;
@@ -53,7 +57,9 @@
OMElement lastMessagePart = element.getFirstChildWithName(new QName(
namespaceValue, Sandesha2Constants.WSRM_COMMON.LAST_MSG));
if (lastMessagePart == null)
- throw new OMException("The passed element does not contain a Last Message part");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noLastMessagePartInElement,
+ element.toString()));
return this;
}
@@ -82,4 +88,4 @@
return false;
}
-}
\ No newline at end of file
+}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessageNumber.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessageNumber.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessageNumber.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessageNumber.java Tue Jul 18 19:58:31 2006
@@ -25,6 +25,8 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
/**
* Represents an MessageNumber element.
@@ -40,7 +42,9 @@
public MessageNumber(OMFactory factory,String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
- throw new SandeshaException ("Unsupported namespace");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.unknownSpec,
+ namespaceValue));
this.defaultFactory = factory;
this.namespaceValue = namespaceValue;
@@ -53,11 +57,13 @@
this.messageNumber = messageNumber;
}
- public Object fromOMElement(OMElement seqenceElement) throws OMException {
- OMElement msgNumberPart = seqenceElement.getFirstChildWithName(
+ public Object fromOMElement(OMElement sequenceElement) throws OMException {
+ OMElement msgNumberPart = sequenceElement.getFirstChildWithName(
new QName (namespaceValue,Sandesha2Constants.WSRM_COMMON.MSG_NUMBER));
if (msgNumberPart==null)
- throw new OMException ("The passed sequnce element does not contain a message number part");
+ throw new OMException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noMessageNumberPartInElement,
+ sequenceElement.toString()));
String msgNoStr = msgNumberPart.getText();
messageNumber = Long.parseLong(msgNoStr);
@@ -66,7 +72,9 @@
public OMElement toOMElement(OMElement element) throws OMException {
if (messageNumber <= 0 ){
- throw new OMException("Set A Valid Message Number");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.setAValidMsgNumber,
+ Long.toString(messageNumber)));
}
OMFactory factory = element.getOMFactory();
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Nack.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Nack.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Nack.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Nack.java Tue Jul 18 19:58:31 2006
@@ -24,6 +24,8 @@
import org.apache.axiom.soap.SOAPFactory;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
/**
* Represents an Nack element.
@@ -39,7 +41,9 @@
public Nack(SOAPFactory factory,String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
- throw new SandeshaException ("Unsupported namespace");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.unknownSpec,
+ namespaceValue));
this.defaultFactory = factory;
this.namespaceValue = namespaceValue;
@@ -53,12 +57,14 @@
public Object fromOMElement(OMElement nackElement) throws OMException{
if (nackElement==null)
- throw new OMException ("Passed seq ack element does not contain a nack part");
+ throw new OMException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.nullPassedElement));
try {
nackNumber = Long.parseLong(nackElement.getText());
}catch (Exception ex ) {
- throw new OMException ("Nack element does not contain a valid long value");
+ throw new OMException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.nackDoesNotContainValidLongValue));
}
return this;
@@ -66,10 +72,12 @@
public OMElement toOMElement(OMElement sequenceAckElement) throws OMException {
if (sequenceAckElement==null)
- throw new OMException ("Cant set the nack part since the seq ack element is null");
+ throw new OMException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noNackInSeqAckPart));
if (nackNumber<=0)
- throw new OMException ("Cant set the nack part since the nack number does not have a valid value");
+ throw new OMException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.nackDoesNotContainValidLongValue));
OMFactory factory = sequenceAckElement.getOMFactory();
if (factory==null)
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/RMElements.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/RMElements.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/RMElements.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/RMElements.java Tue Jul 18 19:58:31 2006
@@ -30,6 +30,8 @@
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
import org.apache.sandesha2.util.SOAPAbstractFactory;
/**
@@ -64,7 +66,8 @@
public void fromSOAPEnvelope(SOAPEnvelope envelope, String action) throws SandeshaException {
if (envelope == null)
- throw new OMException("The passed envelope is null");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.nullPassedElement));
SOAPFactory factory;
@@ -87,7 +90,8 @@
}
if (addressingNamespaceValue==null) {
- String message = "Cant find the addressing version";
+ String message = SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.unknownWSAVersion);
throw new SandeshaException (message);
// return;
}
@@ -345,4 +349,4 @@
public String getAddressingNamespaceValue() {
return addressingNamespaceValue;
}
-}
\ No newline at end of file
+}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Sequence.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Sequence.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Sequence.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Sequence.java Tue Jul 18 19:58:31 2006
@@ -29,6 +29,8 @@
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
/**
* Represents a Sequence element which get carried within a RM application
@@ -46,7 +48,9 @@
public Sequence(SOAPFactory factory,String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
- throw new SandeshaException ("Unsupported namespace");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.unknownSpec,
+ namespaceValue));
this.defaultFactory = factory;
this.namespaceValue = namespaceValue;
@@ -61,12 +65,15 @@
SOAPHeader header = (SOAPHeader) headerElement;
if (header == null)
throw new OMException(
- "Sequence element cannot be added to non-header element");
+ SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.seqElementCannotBeAddedToNonHeader));
OMElement sequencePart = headerElement.getFirstChildWithName(new QName(namespaceValue,
Sandesha2Constants.WSRM_COMMON.SEQUENCE));
if (sequencePart == null)
- throw new OMException("Cannot find Sequence element in the given element");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noSequencePartInElement,
+ headerElement.toString()));
identifier = new Identifier(defaultFactory,namespaceValue);
messageNumber = new MessageNumber(defaultFactory,namespaceValue);
@@ -87,14 +94,17 @@
public OMElement toOMElement(OMElement headerElement) throws OMException {
if (headerElement == null || !(headerElement instanceof SOAPHeader))
- throw new OMException("Cant add Sequence Part to a non-header element");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.seqElementCannotBeAddedToNonHeader));
SOAPHeader soapHeader = (SOAPHeader) headerElement;
if (identifier == null)
- throw new OMException("Cant add Sequence part since identifier is null");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.nullMsgId));
if (messageNumber == null)
- throw new OMException("Cant add Sequence part since MessageNumber is null");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.seqPartIsNull));
OMFactory factory = headerElement.getOMFactory();
if (factory==null)
@@ -168,4 +178,4 @@
return false;
}
-}
\ No newline at end of file
+}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java Tue Jul 18 19:58:31 2006
@@ -33,6 +33,8 @@
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
import org.apache.sandesha2.util.SpecSpecificConstants;
/**
@@ -52,7 +54,9 @@
public SequenceAcknowledgement(SOAPFactory factory,String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
- throw new SandeshaException ("Unsupported namespace");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.unknownSpec,
+ namespaceValue));
this.namespaceValue = namespaceValue;
this.defaultFactory = factory;
@@ -67,14 +71,16 @@
public Object fromOMElement(OMElement element) throws OMException,SandeshaException {
if (element == null || !(element instanceof SOAPHeader))
- throw new OMException("Cant get sequence acknowlegement from a non-header element");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.seqAckNonHeader));
SOAPHeader header = (SOAPHeader) element;
OMElement sequenceAckPart = header.getFirstChildWithName(new QName(
namespaceValue, Sandesha2Constants.WSRM_COMMON.SEQUENCE_ACK));
if (sequenceAckPart == null)
- throw new OMException("The passed element does not contain a seqence ackknowledgement Part");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.seqAckPartIsNull));
OMFactory factory = element.getOMFactory();
if (factory==null)
@@ -145,7 +151,9 @@
if (identifier == null)
throw new OMException(
- "Cant set the sequence since Identifier is null");
+ SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.invalidIdentifier,
+ header.toString()));
sequenceAcknowledgementHeaderBlock.setMustUnderstand(isMustUnderstand());
identifier.toOMElement(sequenceAcknowledgementHeaderBlock);
@@ -172,15 +180,19 @@
if (ackNone!=null) {
if (!SpecSpecificConstants.isAckNoneAllowed(rmSpecVersion)) {
- throw new SandeshaException ("The given namespace does not allow the 'None' part to be added to the sequenceAcknowledgement element");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noneNotAllowedNamespace,
+ rmSpecVersion));
}
if (acknowledgementRangeList.size()>0) {
- throw new SandeshaException ("The 'None' element cannot be present when there are acknowledgement range elements under the sequenceAcknowledgement");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noneNotAllowedAckRangesPresent));
}
if (nackList.size()>0) {
- throw new SandeshaException ("The 'None' element cannot be present when there are Nack elements under the sequenceAcknowledgement");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noneNotAllowedNackPresent));
}
ackNone.toOMElement(sequenceAcknowledgementHeaderBlock);
@@ -188,11 +200,13 @@
if (ackFinal!=null) {
if (!SpecSpecificConstants.isAckFinalAllowed(rmSpecVersion)) {
- throw new SandeshaException ("The given namespace does not allow the 'Final' part to be added to the sequenceAcknowledgement element");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.finalNotAllowedNamespace));
}
if (nackList.size()>0) {
- throw new SandeshaException ("The 'Final' element cannot be present when there are Nack elements under the sequenceAcknowledgement");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.cannotHaveFinalWithNack));
}
ackFinal.toOMElement(sequenceAcknowledgementHeaderBlock);
@@ -283,4 +297,4 @@
public void setAckNone(AckNone ackNone) {
this.ackNone = ackNone;
}
-}
\ No newline at end of file
+}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceFault.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceFault.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceFault.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceFault.java Tue Jul 18 19:58:31 2006
@@ -27,6 +27,8 @@
import org.apache.axiom.soap.SOAPFactory;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
/**
* Adds the SequenceFault header block.
@@ -42,7 +44,9 @@
public SequenceFault(SOAPFactory factory,String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
- throw new SandeshaException ("Unsupported namespace");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.unknownSpec,
+ namespaceValue));
this.defaultFactory = factory;
this.namespaceValue = namespaceValue;
@@ -56,13 +60,16 @@
if (body == null || !(body instanceof SOAPBody))
throw new OMException(
- "Cant get Sequence Fault part from a non-header element");
+ SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.seqFaultCannotBeExtractedToNonHeader));
OMElement sequenceFaultPart = body.getFirstChildWithName(new QName(
namespaceValue, Sandesha2Constants.WSRM_COMMON.SEQUENCE_FAULT));
if (sequenceFaultPart == null)
- throw new OMException("The passed element does not contain a Sequence Fault element");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noSeqFaultInElement,
+ body.toString()));
OMElement faultCodePart = sequenceFaultPart
.getFirstChildWithName(new QName(namespaceValue,Sandesha2Constants.WSRM_COMMON.FAULT_CODE));
@@ -78,7 +85,8 @@
public OMElement toOMElement(OMElement body) throws OMException {
if (body == null || !(body instanceof SOAPBody))
- throw new OMException("Cant get Sequence Fault part from a non-header element");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.seqFaultCannotBeExtractedToNonHeader));
OMFactory factory = body.getOMFactory();
if (factory==null)
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceOffer.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceOffer.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceOffer.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceOffer.java Tue Jul 18 19:58:31 2006
@@ -25,6 +25,8 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
/**
* Represents an SequenceOffer element which may be present within a
@@ -43,7 +45,9 @@
public SequenceOffer(OMFactory factory,String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
- throw new SandeshaException ("Unsupported namespace");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.unknownSpec,
+ namespaceValue));
this.defaultFactory = factory;
this.namespaceValue = namespaceValue;
@@ -59,7 +63,9 @@
OMElement sequenceOfferPart = createSequenceElement
.getFirstChildWithName(new QName(namespaceValue,Sandesha2Constants.WSRM_COMMON.SEQUENCE_OFFER));
if (sequenceOfferPart == null)
- throw new OMException("The passed element does not contain a SequenceOffer part");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noSeqOfferInElement,
+ createSequenceElement.toString()));
identifier = new Identifier(defaultFactory,namespaceValue);
identifier.fromOMElement(sequenceOfferPart);
@@ -78,7 +84,8 @@
throws OMException {
if (identifier == null)
- throw new OMException("Cant set sequnceOffer since identifier is null");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.nullMsgId));
OMFactory factory = createSequenceElement.getOMFactory();
if (factory==null)
@@ -116,4 +123,4 @@
return false;
}
-}
\ No newline at end of file
+}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequence.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequence.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequence.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequence.java Tue Jul 18 19:58:31 2006
@@ -28,6 +28,8 @@
import org.apache.axiom.soap.SOAPFactory;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
/**
* Adds the Terminate Sequence body part.
@@ -43,7 +45,9 @@
public TerminateSequence(SOAPFactory factory, String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
- throw new SandeshaException ("Unsupported namespace");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.unknownSpec,
+ namespaceValue));
this.defaultFactory = factory;
this.namespaceValue = namespaceValue;
@@ -56,13 +60,16 @@
public Object fromOMElement(OMElement body) throws OMException,SandeshaException {
if (!(body instanceof SOAPBody))
- throw new OMException("Cant add terminate sequence to a non body element");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.terminateSeqCannotBeAddedToNonBody));
OMElement terminateSeqPart = body.getFirstChildWithName(new QName(
namespaceValue, Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE));
if (terminateSeqPart == null)
- throw new OMException("passed element does not contain a terminate sequence part");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noTerminateSeqInElement,
+ body.toString()));
identifier = new Identifier(defaultFactory,namespaceValue);
identifier.fromOMElement(terminateSeqPart);
@@ -73,10 +80,12 @@
public OMElement toOMElement(OMElement body) throws OMException {
if (body == null || !(body instanceof SOAPBody))
- throw new OMException("Cant add terminate sequence to a nonbody element");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.terminateSeqCannotBeAddedToNonBody));
if (identifier == null)
- throw new OMException("Cant add terminate sequence since identifier is not set");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.nullMsgId));
OMFactory factory= body.getOMFactory();
if (factory==null)
@@ -121,4 +130,4 @@
return false;
}
-}
\ No newline at end of file
+}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequenceResponse.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequenceResponse.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequenceResponse.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequenceResponse.java Tue Jul 18 19:58:31 2006
@@ -21,6 +21,8 @@
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
@@ -44,7 +46,9 @@
public TerminateSequenceResponse(SOAPFactory factory, String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
- throw new SandeshaException ("Unsupported namespace");
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.unknownSpec,
+ namespaceValue));
this.defaultFactory = factory;
this.namespaceValue = namespaceValue;
@@ -58,14 +62,17 @@
if (!(body instanceof SOAPBody))
throw new OMException(
- "Cant add terminate sequence response to a non body element");
+ SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.terminateSeqResponseCannotBeAddedToNonBody));
OMElement terminateSeqResponsePart = body.getFirstChildWithName(new QName(
namespaceValue, Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE_RESPONSE));
if (terminateSeqResponsePart == null)
throw new OMException(
- "passed element does not contain a terminate sequence response part");
+ SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.noTerminateSeqResponseInElement,
+ body.toString()));
identifier = new Identifier(defaultFactory,namespaceValue);
identifier.fromOMElement(terminateSeqResponsePart);
@@ -76,10 +83,12 @@
public OMElement toOMElement(OMElement body) throws OMException {
if (body == null || !(body instanceof SOAPBody))
- throw new OMException("Cant add terminate sequence response to a nonbody element");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.terminateSeqResponseCannotBeAddedToNonBody));
if (identifier == null)
- throw new OMException("Cant add terminate sequence response since identifier is not set");
+ throw new OMException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.nullMsgId));
OMFactory factory = body.getOMFactory();
if (factory==null)
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org