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 ga...@apache.org on 2007/02/08 14:41:15 UTC
svn commit: r504889 - in
/webservices/sandesha/trunk/java/src/org/apache/sandesha2:
client/SandeshaClient.java i18n/SandeshaMessageKeys.java
i18n/resource.properties security/dummy/DummySecurityManager.java
util/AcknowledgementManager.java
Author: gatfora
Date: Thu Feb 8 05:41:15 2007
New Revision: 504889
URL: http://svn.apache.org/viewvc?view=rev&rev=504889
Log:
Removed unused messages
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/resource.properties
webservices/sandesha/trunk/java/src/org/apache/sandesha2/security/dummy/DummySecurityManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java?view=diff&rev=504889&r1=504888&r2=504889
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java Thu Feb 8 05:41:15 2007
@@ -52,7 +52,6 @@
import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
import org.apache.sandesha2.storage.beans.RMSBean;
import org.apache.sandesha2.storage.beans.RMDBean;
-import org.apache.sandesha2.util.AcknowledgementManager;
import org.apache.sandesha2.util.SandeshaUtil;
import org.apache.sandesha2.util.SpecSpecificConstants;
import org.apache.sandesha2.workers.Invoker;
@@ -185,13 +184,10 @@
}
private static void fillOutgoingSequenceInfo(SequenceReport report, RMSBean rmsBean,
- StorageManager storageManager) throws SandeshaException {
+ StorageManager storageManager) {
report.setSequenceID(rmsBean.getSequenceID());
- List completedMessageList = AcknowledgementManager.
- getClientCompletedMessageRanges(rmsBean.getInternalSequenceID(),
- rmsBean.getSequenceID(),
- storageManager).getContainedElementsAsNumbersList();
+ List completedMessageList = rmsBean.getClientCompletedMessages().getContainedElementsAsNumbersList();
Iterator iter = completedMessageList.iterator();
while (iter.hasNext()) {
@@ -987,10 +983,9 @@
SequenceReport sequenceReport = new SequenceReport();
- List completedMessageList = AcknowledgementManager.
- getServerCompletedMessageRanges(
- sequenceID,
- storageManager).getContainedElementsAsNumbersList();
+ RMDBean rmdBean = SandeshaUtil.getRMDBeanFromSequenceId(storageManager, sequenceID);
+
+ List completedMessageList = rmdBean.getServerCompletedMessages().getContainedElementsAsNumbersList();
Iterator iter = completedMessageList.iterator();
while (iter.hasNext()) {
@@ -1005,7 +1000,6 @@
sequenceReport.setSequenceStatus(getServerSequenceStatus(sequenceID, storageManager));
- RMDBean rmdBean = SandeshaUtil.getRMDBeanFromSequenceId(storageManager, sequenceID);
if(rmdBean.getSecurityTokenData() != null) sequenceReport.setSecureSequence(true);
return sequenceReport;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java?view=diff&rev=504889&r1=504888&r2=504889
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java Thu Feb 8 05:41:15 2007
@@ -38,13 +38,11 @@
public static final String inMsgError="inMsgError";
public static final String outMsgError="outMsgError";
public static final String invokeMsgError="invokeMsgError";
- public static final String msgError="msgError";
public static final String sendMsgError="sendMsgError";
public static final String cannotSendMsgAsSequenceClosed="cannotSendMsgAsSequenceClosed";
public static final String cannotSendMsgAsSequenceTerminated="cannotSendMsgAsSequenceTerminated";
public static final String cannotSendMsgAsSequenceTimedout="cannotSendMsgAsSequenceTimedout";
public static final String noValidSyncResponse="noValidSyncResponse";
- public static final String generalError="generalError";
public static final String classLoaderNotFound="classLoaderNotFound";
public static final String defaultPropertyBeanNotSet="defaultPropertyBeanNotSet";
@@ -57,97 +55,53 @@
public static final String soapBodyNotPresent="soapBodyNotPresent";
public static final String unknownSoapVersion="unknownSoapVersion";
public static final String axisServiceIsNull="axisServiceIsNull";
- public static final String msgContextNotSetInbound="msgContextNotSetInbound";
- public static final String msgContextNotSetOutbound="msgContextNotSetOutbound";
public static final String msgContextNotSet="msgContextNotSet";
public static final String requestMsgContextNull="requestMsgContextNull";
- public static final String axisOperationError="axisOperationError";
- public static final String axisOperationRegisterError="axisOperationRegisterError";
public static final String transportOutNotPresent="transportOutNotPresent";
- public static final String storedKeyNotPresent="storedKeyNotPresent";
- public static final String invalidQName="invalidQName";
- public static final String couldNotFindPropertyKey="couldNotFindPropertyKey";
public static final String couldNotFindOperation="couldNotFindOperation";
- public static final String dummyCallback="dummyCallback";
- public static final String cannotFindSequenceID="cannotFindSequenceID";
- public static final String dummyCallbackError="dummyCallbackError";
public static final String setAValidMsgNumber="setAValidMsgNumber";
- public final static String processTokenMethodError="processTokenMethodError";
- public final static String policyProcessingException="policyProcessingException";
- public static final String errorOnTokenStack="errorOnTokenStack";
- public static final String unknownTokenAbortTran="unknownTokenAbortTran";
- public static final String commitingUnknownToken="commitingUnknownToken";
public static final String cannotStartTransportListenerDueToError="cannotStartTransportListener";
public static final String cannotStartListenerForIncommingMsgs="cannotStartListenerForIncommingMsgs";
- public static final String selectRSNotSupported="selectRSNotSupported";
public static final String nonUniqueResult="nonUniqueResult";
public static final String invalidStringArray="invalidStringArray";
- public static final String nextMsgNotSetCorrectly="nextMsgNotSetCorrectly";
- public static final String invalidNextMsgNumber="invalidNextMsgNumber";
public static final String cannotCointinueSender="cannotCointinueSender";
- public static final String msgContextNotPresentInStorage="msgContextNotPresentInStorage";
public static final String sendHasUnavailableMsgEntry="sendHasUnavailableMsgEntry";
- public static final String cannotInnitMessage="cannotInnitMessage";
public static final String propertyInvalidValue="propertyInvalidValue";
- public static final String couldNotCopyParameters="couldNotCopyParameters";
public static final String invalidRange="invalidRange";
- public static final String senderBeanNotFound="senderBeanNotFound";
public static final String workAlreadyAssigned="workAlreadyAssigned";
- public static final String workNotPresent="workNotPresent";
- public static final String cannotSendToTheAddress="cannotSendToTheAddress";
-
public static final String rmNamespaceNotMatchSequence="rmNamespaceNotMatchSequence";
- public static final String wsaNamespaceNotMatchSequence="wsaNamespaceNotMatchSequence";
public static final String unknownWSAVersion="unknownWSAVersion";
- public static final String rmNamespaceMismatch="rmNamespaceMismatch";
public static final String emptyAckRequestSpecLevel="emptyAckRequestSpecLevel";
public static final String closeSequenceSpecLevel="closeSequenceSpecLevel";
public static final String unknownSpec="unknownSpec";
public static final String unknownRMNamespace="unknownRMNamespace";
public static final String unknownNamespace="unknownNamespace";
public static final String cannotDecideRMVersion="cannotDecideRMVersion";
- public static final String specVersionPropertyNotAvailable="specVersionPropertyNotAvailable";
- public static final String specVersionNotSet="specVersionNotSet";
public static final String specDoesNotSupportElement="specDoesNotSupportElement";
public static final String couldNotSendTerminate="couldNotSendTerminate";
public static final String couldNotSendClose="couldNotSendClose";
- public static final String couldNotSendAck="couldNotSendAck";
public static final String couldNotSendTerminateResponse="couldNotSendTerminateResponse";
public static final String couldNotSendTerminateSeqNotFound="couldNotSendTerminateSeqNotFound";
- public static final String couldNotSendFault="couldNotSendFault";
- public static final String cannotSendAckRequestNotActive="cannotSendAckRequestNotActive";
public static final String cannotSendAckRequestException="cannotSendAckRequestException";
public static final String ackRequestMultipleParts="ackRequestMultipleParts";
public static final String noAckRequestPartFound="noAckRequestPartFound";
- public static final String cannotCloseSequenceNotActive="cannotCloseSequenceNotActive";
public static final String noSequenceEstablished="noSequenceEstablished";
public static final String invalidInternalSequenceID="invalidInternalSequenceID";
- public static final String tempNotSetOnReceivedMsg="tempNotSetOnReceivedMsg";
- public static final String completedMsgBeanIsNull="completedMsgBeanIsNull";
- public static final String internalSeqBeanNotAvailableOnSequence="internalSeqBeanNotAvailableOnSequence";
public static final String createSeqEntryNotFound="createSeqEntryNotFound";
public static final String toEPRNotValid="toEPRNotValid";
- public static final String noWSAACtionValue="noWSAACtionValue";
public static final String cannotFindSequence="cannotFindSequence";
- public static final String notValidTerminate="notValidTerminate";
- public static final String notValidTimeOut="notValidTimeOut";
- public static final String cannotFindAcksTo="cannotFindAcksTo";
- public static final String droppingDuplicate="droppingDuplicate";
public static final String cannotAcceptMsgAsSequenceClosed="cannotAcceptMsgAsSequenceClosed";
public static final String msgNumberMustBeLargerThanZero="msgNumberMustBeLargerThanZero";
public static final String msgNumberLargerThanLastMsg="msgNumberLargerThanLastMsg";
public static final String msgNumberNotLargerThanLastMsg="msgNumberNotLargerThanLastMsg";
- public static final String outMsgHasNoEnvelope="outMsgHasNoEnvelope";
- public static final String msgNumberExceededLastMsgNo="msgNumberExceededLastMsgNo";
public static final String ackInvalid="ackInvalid";
public static final String ackInvalidHighMsg="ackInvalidHighMsg";
public static final String ackInvalidNotSent="ackInvalidNotSent";
- public static final String highestMsgIdNotStored="highestMsgIdNotStored";
public static final String cannotHaveFinalWithNack="cannotHaveFinalWithNack";
public static final String accptButNoSequenceOffered="accptButNoSequenceOffered";
public static final String relatesToNotAvailable="relatesToNotAvailable";
@@ -160,8 +114,6 @@
public static final String tempSeqIdNotSet="tempSeqIdNotSet";
public static final String ackRandDoesNotHaveCorrectValues="ackRandDoesNotHaveCorrectValues";
public static final String cannotSetAckRangeNullElement="cannotSetAckRangeNullElement";
- public static final String completedMessagesNull="completedMessagesNull";
- public static final String emptyLastMsg="emptyLastMsg";
public static final String acksToStrNotSet="acksToStrNotSet";
public static final String invalidSequenceID="invalidsequenceID";
public static final String cantSendMakeConnectionNoTransportOut="cantSendMakeConnectionNoTransportOut";
@@ -171,10 +123,7 @@
public static final String noTerminateSeqPart="noTerminateSeqPart";
public static final String noNackInSeqAckPart="noNackInSeqAckPart";
public static final String nackDoesNotContainValidLongValue="nackDoesNotContainValidLongValue";
- public static final String cannotSetNackElemnt="cannotSetNackElemnt";
public static final String seqAckPartIsNull="seqAckPartIsNull";
- public static final String cannotAddSequencePartNullMsgNumber="cannotAddSequencePartNullMsgNumber";
- public static final String cannotSetSeqAck="cannotSetSeqAck";
public static final String noneNotAllowedNamespace="noneNotAllowedNamespace";
public static final String noneNotAllowedAckRangesPresent="noneNotAllowedAckRangesPresent";
public static final String noneNotAllowedNackPresent="noneNotAllowedNackPresent";
@@ -182,7 +131,6 @@
public static final String noFaultCodeNullElement="noFaultCodeNullElement";
public static final String noSeqFaultInElement="noSeqFaultInElement";
public static final String noSeqOfferInElement="noSeqOfferInElement";
- public static final String noCreateSeqInElement="noCreateSeqInElement";
public static final String noTerminateSeqInElement="noTerminateSeqInElement";
public static final String noTerminateSeqResponseInElement="noTerminateSeqResponseInElement";
public static final String noAcceptPartInElement="noAcceptPartInElement";
@@ -196,17 +144,14 @@
public static final String noCloseSeqResponsePartInElement="noCloseSeqResponsePartInElement";
public static final String noExpiresPartInElement="noExpiresPartInElement";
public static final String noCreateSeqPartInElement="noCreateSeqPartInElement";
- public static final String noAckRequestedPartInElement="noAckRequestedPartInElement";
public static final String noCreateSeqResponsePartInElement="noCreateSeqResponsePartInElement";
public static final String noFaultCodePart="noFaultCodePart";
public static final String cannotFindAddressElement="cannotFindAddressElement";
public static final String cannotFindAddressText="cannotFindAddressText";
public static final String nullPassedElement="nullPassedElement";
- public static final String noAckRequestedElement="noAckRequestedElement";
public static final String invalidAckMessageEntry="invalidAckMessageEntry";
public static final String seqPartIsNull="seqPartIsNull";
public static final String incomingSequenceNotValidID="incomingSequenceNotValidID";
- public static final String noMakeConnectionPartInElement="noCloseSequencePartInElement";
public static final String seqFaultCannotBeExtractedToNonHeader="seqFaultCannotBeExtractedToNonHeader";
public static final String seqElementCannotBeAddedToNonHeader="seqElementCannotBeAddedToNonHeader";
@@ -214,14 +159,9 @@
public static final String terminateSeqCannotBeAddedToNonBody="terminateSeqCannotBeAddedToNonBody";
public static final String terminateSeqResponseCannotBeAddedToNonBody="terminateSeqResponseCannotBeAddedToNonBody";
public static final String closeSeqCannotBeAddedToNonBody="closeSeqCannotBeAddedToNonBody";
- public static final String closeSeqCannotBeExtractedFromNonBody="closeSeqCannotBeExtractedFromNonBody";
public static final String closeSeqResponseCannotBeAddedToNonBody="closeSeqResponseCannotBeAddedToNonBody";
public static final String createSeqCannotBeAddedToNonBody="createSeqCannotBeAddedToNonBody";
public static final String createSeqResponseCannotBeAddedToNonBody="createSeqResponseCannotBeAddedToNonBody";
- public static final String seqOfferNullID="seqOfferNullID";
- public static final String terminateSequence="terminateSequence";
- public static final String terminateSeqResponseNullID="terminateSeqResponseNullID";
- public static final String sequencePartNullID="sequencePartNullID";
public static final String closeSeqPartNullID="closeSeqPartNullID";
public static final String invalidIdentifier="invalidIdentifier";
public static final String closeSeqResponsePartNullID="closeSeqResponsePartNullID";
@@ -229,11 +169,8 @@
public static final String createSeqNullAcksTo="createSeqNullAcksTo";
public static final String acceptNullAcksTo="acceptNullAcksTo";
public static final String noAcksToPart="noAcksToPart";
- public static final String noElementPart="noElementPart";
public static final String cannotProcessExpires="cannotProcessExpires";
public static final String noFaultCode="noFaultCode";
- public static final String seqAckNonHeader="seqAckNonHeader";
- public static final String makeConnectionCannotBeAddedToNonBody="makeConnectionCannotBeAddedToNonBody";
public static final String cannotSetAcksTo="cannotSetAcksTo";
public static final String cannotSetEndpoint="cannotSetEndpoint";
@@ -241,24 +178,19 @@
public static final String addressNotValid="addressNotValid";
public static final String incommingSequenceReportNotFound="incommingSequenceReportNotFound";
- public static final String cannotGenerateReport="cannotGenerateReport";
public static final String cannotFindReportForGivenData="cannotFindReportForGivenData";
- public static final String cannotGenerateReportNonUniqueSequence="cannotGenerateReportNonUniqueSequence";
public static final String outSeqIDIsNull="outSeqIDIsNull";
public static final String requestMsgNotPresent="requestMsgNotPresent";
public static final String requestSeqIsNull="requestSeqIsNull";
public static final String newSeqIdIsNull="newSeqIdIsNull";
- public static final String unavailableAppMsg="unavailableAppMsg";
public static final String terminateAddedPreviously="terminateAddedPreviously";
- public static final String maximumRetransmissionCountProcessor="maximumRetransmissionCountProcessor";
public static final String nullMsgId="nullMsgId";
public static final String storageMapNotPresent="storageMapNotPresent";
public static final String failedToStoreMessage="failedToStoreMessage";
public static final String failedToLoadMessage="failedToLoadMessage";
public static final String entryNotPresentForUpdating="entryNotPresentForUpdating";
public static final String appMsgIsNull="appMsgIsNull";
- public static final String invalidMsgNumberList="invalidMsgNumberList";
public static final String cannotFindReqMsgFromOpContext="cannotFindReqMsgFromOpContext";
public static final String secureDummyNoProof="secureDummyNoProof";
@@ -268,24 +200,19 @@
public static final String cannotFindTransportInDesc = "cannotFindTransportInDesc";
public static final String toEPRNotSet = "toEPRNotSet";
public static final String toBeanNotSet = "toBeanNotSet";
- public static final String replyToBeanNotSet = "replyToBeanNotSet";
public final static String errorRetrievingSecurityToken = "errorRetrievingSecurityToken";
public final static String proofOfPossessionNotVerified = "proofOfPossessionNotVerified";
public final static String noSecurityResults = "noSecurityResults";
public final static String noSecConvTokenInPolicy = "noSecConvTokenInPolicy";
- public final static String noServicePolicy = "noServicePolicy";
public final static String elementMustForSpec = "elementMustForSpec";
- public final static String addressingNamespaceNotSet = "addressingNamespaceNotSet";
public final static String couldNotSendCreateSeqResponse = "couldNotSendCreateSeqResponse";
public final static String invalidElementFoundWithinElement = "invalidElementFoundWithinElement";
public final static String invokerNotFound="invokerNotFound";
- public final static String couldNotSendAckRequestSeqNotFound="couldNotSendAckRequestSeqNotFound";
public final static String couldNotSendCloseResponse="couldNotSendCloseResponse";
- public final static String couldNotSendCloseSeqNotFound="couldNotSendCloseSeqNotFound";
public final static String couldNotLoadModulePolicies = "couldNotLoadModulePolicies";
public final static String modulePoliciesLoaded = "modulePoliciesLoaded";
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/resource.properties
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/resource.properties?view=diff&rev=504889&r1=504888&r2=504889
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/resource.properties (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/resource.properties Thu Feb 8 05:41:15 2007
@@ -38,13 +38,11 @@
inMsgError=Sandesha2 got an exception when processing an in message: {0}
outMsgError=Sandesha2 got an exception when processing an out message: {0}
invokeMsgError=Sandesha2 got an exception when invoking message: {0}
-msgError=Sandesha2 got an exception when processing a message: {0}
sendMsgError=Sandesha2 got an exception when sending a message: {0}
cannotSendMsgAsSequenceClosed=Sandesha2 could not send the message on sequence {0} as the sequence has been closed.
cannotSendMsgAsSequenceTerminated=Sandesha2 could not send the message on sequence {0} as the sequence has been terminated.
cannotSendMsgAsSequenceTimedout=Sandesha2 could not send the message on sequence {0} as the sequence has timed out.
noValidSyncResponse=Sandesha2 sender thread has not received a valid synchronous response...
-generalError=Sandesha2 Internal Error: sandesha2 encountered the following exception {0}
classLoaderNotFound=Module class loader not found.
defaultPropertyBeanNotSet=Sandesha2 Internal Error: ''DefaultPropertyBean'' is not set.
@@ -57,43 +55,20 @@
soapBodyNotPresent=Invalid SOAP message: the body is not present.
unknownSoapVersion=Unknown SOAP version {0}
axisServiceIsNull=Sandesha2 Internal Error: ''AxisService'' is null
-msgContextNotSetInbound=Sandesha2 Internal Error: ''MessageContext'' is null on the inbound message.
-msgContextNotSetOutbound=Sandesha2 Internal Error: ''MessageContext'' is null on the outbound message.
msgContextNotSet=Sandesha2 Internal Error: ''MessageContext'' is null.
requestMsgContextNull=Request message context is null: cannot find out the request side sequenceID.
-axisOperationError=Sandesha2 Internal Error: could not create the ''AxisOperation'' due to an error {0}
-axisOperationRegisterError=Sandesha2 Internal Error: could not register an ''OutInAxisOperation'' due to exception {0}
transportOutNotPresent=Sandesha2 Internal Error: original transport sender is not present
-storedKeyNotPresent=Sandesha2 Internal Error: stored key not present in the retransmittable message
-invalidQName=Invalid QName string: {0}
-senderBeanNotFound=SenderBean was not found
workAlreadyAssigned=Work ''{0}'' is already assigned to a different Worker. Will try the next one
-workNotPresent=SenderWorker has been assigned an unexisting work with the Id ''{0}''
-cannotSendToTheAddress=Message cannot be sent to the address ''{0}''
-couldNotFindPropertyKey=Could not determine the PropertyKey of the {0} message from the available information
couldNotFindOperation=Could not find operation for message type {0} and spec level {1}.
-dummyCallback=Sandesha2 Internal Error: dummy callback was called but this should never happen.
-dummyCallbackError=Sandesha2 Internal Error: dummy callback received an error but this should never happen.
invalidMsgNumber=Sandesha2 Internal Error: invalid message number {0}
-processTokenMethodError=Exception occured when invoking processTokenMethod: {0}
-policyProcessingException=Exception {0} occured when processing policy {1}
-errorOnTokenStack=Sandesha2 Internal Error: error on token stack - no current token.
-unknownTokenAbortTran=Aborting transaction because of unknown token: {0}
-commitingUnknownToken=Sandesha2 Internal error: token stack commiting an unknown token: {0}
cannotStartTransportListenerDueToError=Sandesha2 Internal error: could not start the transport listener due to error {0}.
cannotStartListenerForIncommingMsgs=Sandesha2 Internal error: cannot start the listner for incoming messages. You must set the ''transport in'' protocol in order to get async acknowledgement messages.
-selectRSNotSupported=Sandesha2 Internal error: selectRS() methods are not currently supported
nonUniqueResult=Sandesha2 Internal error: A search for a unique object resulted in several matches. Match 1 {0}, Match 2 {1}.
invalidStringArray=Sandesha2 Internal error: invalid String array : {0}.
-nextMsgNotSetCorrectly=Sandesha2 Internal error: next message not set correctly. Removing the invalid entry: {0}.
-invalidNextMsgNumber=Sandesha2 Internal error: message number {0} is not valid as the Next Message Number.
cannotCointinueSender=Sandesha2 Internal error: cannot continue the Sender due to exception: {0}
-msgContextNotPresentInStorage=Sandesha2 Internal error: message context {0} is not present in the store.
sendHasUnavailableMsgEntry=Sandesha2 Internal error: sender has an unavailable message entry {0}.
-cannotInnitMessage=Sandesha2 Internal error: cannot initialize the message.
propertyInvalidValue=Sandesha2 Internal error: property {0} contains an invalid value.
-couldNotCopyParameters=Could not copy parameters when creating the new RM Message. See the following exception for more details: {0}.
invalidRange=The specified range was invalid: {0}, {1}
policyBeanNotFound=Cant find a Sandesha2 policy bean
@@ -110,60 +85,37 @@
#-------------------------------------
rmNamespaceNotMatchSequence=Validation failed. The RM namespace value {0} of the message does not match {1} for sequence {2}.
-wsaNamespaceNotMatchSequence=Validation failed. The WS-Addressing namespace value {0} of the message does not match {1} for sequence {2}.
unknownWSAVersion=Unknown WS-Addressing version {0}
-rmNamespaceMismatch=Cannot process message as the rm namespace value {0} is different from the reqistered namespace value {1} for the sequence {2}.
emptyAckRequestSpecLevel=Empty AckRequest messages can only be sent with the v1_1 spec. You are using spec version {0}.
closeSequenceSpecLevel=Close sequence messages can only be sent with the v1_1 spec. You are using spec version {0}.
unknownSpec=Unknown specification version {0}.
unknownRMNamespace=Unknown rm namespace value {0}.
unknownNamespace=Unsupported namespace {0}.
cannotDecideRMVersion=Message does not has a valid RM namespace value - cannot decide the RM version.
-specVersionPropertyNotAvailable=''SpecVersion'' sequence property is not available for the incoming sequence {0}: cannot find the RM version for outgoing side.
-specVersionNotSet=Error: 'SpecVersion'' is not set.
specDoesNotSupportElement=Spec ''{0}'' does not support the element {1}
-addressingNamespaceNotSet=Internal error. Addressing namespace not set.
couldNotSendCreateSeqResponse=Could not send a CreateSequenceResponse message due to exception {0}.
couldNotSendTerminate=Could not send the terminate message due to error {0}.
couldNotSendClose=Could not send the close sequence message due to error {0}.
-couldNotSendAck=Could not send the ack message on sequence {0} due to an exception: {1}
couldNotSendTerminateResponse=Could not send the terminate sequence response. Check linked exception for details.
couldNotSendCloseResponse=Could not send the CloseSequenceResponse due to exception {0}.
couldNotSendTerminateSeqNotFound=Internal sequenceID {0} was not found: cannot send the terminate message.
-couldNotSendCloseSeqNotFound=Internal sequenceID {0} was not found: cannot send the CloseSequence message.
-couldNotSendAckRequestSeqNotFound=Internal sequenceID {0} was not found: cannot send the AckRequest message.
-couldNotSendFault=Could not send the fault message due to an exception: {0}
-cannotSendAckRequestNotActive=Cannot send the ackRequest message since the sequence with internal ID {0} is not active.
cannotSendAckRequestException=Could not send the ackRequest message on sequence {0} due to an exception: {1}
ackRequestMultipleParts=Passed message has more than one AckRequest. You can have only one.
noAckRequestPartFound=No AckRequested part was present in the message.
-cannotCloseSequenceNotActive=Cannot close the sequence with internal ID {0} since it is not active.
noSequenceEstablished=A sequence with the given sequence ID {0} has not been established, has been terminated or could not be found.
invalidInternalSequenceID=Sandesha2 Internal Error: The internal sequence ID {0} is not valid.
-tempNotSetOnReceivedMsg=''TempSequenceId'' is not set correctly in the received message.
-completedMsgBeanIsNull=Completed messages bean is null for the sequence {0}.
-internalSeqBeanNotAvailableOnSequence=Error: ''InternalSequenceBean'' is not available for the sequence with internal ID {0}.
createSeqEntryNotFound=''Create Sequence'' entry is not found.
toEPRNotValid=The ''To'' endpoint reference address is not set correctly: {0}
-noWSAACtionValue=Create sequence message does not have the ''WSA:Action'' value set correctly.
cannotFindSequence=Cannot find the sequence with ID {0}.
-cannotFindSequenceID=Cannot find the sequence ID for the sequenceID bean {0}.
-notValidTerminate=Not a valid terminated sequence: ''InternalSequenceBean'' is not available for the sequence with interal ID {0}
-notValidTimeOut= Not a valid timedOut sequence: ''InternalSequenceBean'' is not available for the sequence with internal ID {0}
-cannotFindAcksTo=Could not find the stored ''acksTo'' property for the specified sequence.
-droppingDuplicate=Dropping a duplicate RM message.
cannotAcceptMsgAsSequenceClosed=Cannot accept message as sequence {0} has been closed.
msgNumberMustBeLargerThanZero=Message number {0} is invalid: this value has to be larger than zero.
msgNumberNotLargerThanLastMsg=The message number {0} is not larger than the last message sent on this sequence {1}.
msgNumberLargerThanLastMsg=The message number {0} is larger than the value {1}, which was previously declared as the last message.
-outMsgHasNoEnvelope=Out message does not have a envelope: {0}
-msgNumberExceededLastMsgNo=The received message number {0} on sequence {1} exceeds the message number {1} which was declared as last in a previosly received application message.
ackInvalid=The SequenceAcknowledgement received is invalid as the lower value {0} is larger than upper value {1}.
ackInvalidHighMsg=The SequenceAcknowledgement received is invalid as the upper value {0} is greater than the highest message sent {1}.
ackInvalidNotSent=The SequenceAcknowledgement received is invalid as the acknowledgement contains messages that have not been sent.
-highestMsgIdNotStored=The MessageId of the highest message number has not been stored for sequence {0}
cannotHaveFinalWithNack=The ''Final'' element cannot be present when there are Nack elements under the SequenceAcknowledgement.
accptButNoSequenceOffered=Error: An ''accept'' was received but there was no offered sequence entry.
relatesToNotAvailable: Invalid create sequence message: ''RelatesTo'' part is not available.
@@ -176,8 +128,6 @@
tempSeqIdNotSet=Error: ''TempSequenceId'' is not set.
ackRandDoesNotHaveCorrectValues=The ack range {0} does not have correct values for Upper and Lower attributes.
cannotSetAckRangeNullElement=Cannot set Ack Range part since element is null.
-completedMessagesNull=Completed messages bean is null for the sequence {0}
-emptyLastMsg=Received empty body for LastMessage part.
acksToStrNotSet=acksToStr Seqeunce property is not set correctly
invalidSequenceID=invalid sequence ID: {0}
cantSendMakeConnectionNoTransportOut=Can''t send the MakeConnection reply since the message does not has a TransportOutDescription
@@ -187,18 +137,12 @@
noTerminateSeqPart=''Terminate Sequence'' part is not available.
noNackInSeqAckPart=Passed ''sequence ack'' element does not contain a ''nack'' part. {0}
nackDoesNotContainValidLongValue=''Nack'' element does not contain a valid long value {0}.
-cannotSetNackElemnt=Cannot set the ''nack'' part since the ''sequence ack'' element is null.
-seqAckPartIsNull=''Sequence acknowledgement'' part is null.
-cannotAddSequencePartNullMsgNumber=Cannot add ''Sequence'' part since ''MessageNumber'' is null.
-cannotSetSeqAck=Cannot set ''sequence acknowledgement'' since the element is null.
noneNotAllowedNamespace=The given namespace {0} does not allow the ''None'' part to be added to the ''sequenceAcknowledgement'' element.
noneNotAllowedAckRangesPresent=The ''None'' element cannot be present when there are acknowledgement range elements under the ''sequenceAcknowledgement'' element.
noneNotAllowedNackPresent=The ''None'' element cannot be present when there are Nack elements under the ''sequenceAcknowledgement'' element.
finalNotAllowedNamespace=The given namespace {0} does not allow the 'Final' part to be added to the ''sequenceAcknowledgement'' element.
-noFaultCodeNullElement=Cannot add ''Fault Code'' part since the passed element is null
noSeqFaultInElement=The passed element {0} does not contain a ''Sequence Fault'' element.
noSeqOfferInElement=The passed element {0} does not contain a ''SequenceOffer'' part.
-noCreateSeqInElement=The passed message {0} does not have a ''CreateSequence'' part.
noTerminateSeqInElement=The passed element {0} does not contain a ''terminate sequence'' part.
noTerminateSeqResponseInElement=The passed element {0} does not contain a ''terminate sequence response'' part.
noAcceptPartInElement=The passed element {0} does not contain an ''Accept'' part.
@@ -212,13 +156,11 @@
noCloseSeqResponsePartInElement=The passed element {0} does not contain a ''close sequence response'' part.
noExpiresPartInElement=The passed elemenet {0} does not contain an ''Expires'' part.
noCreateSeqPartInElement=The passed element {0} does not contain a ''create sequence'' part.
-noAckRequestedPartInElement=The passed element {0} does not contain an ''ack requested'' part.
noCreateSeqResponsePartInElement=The passed element {0} does not contain a ''create seqence response'' part.
noFaultCodePart=The passed element {0} does not contain a ''Fault Code'' part.
cannotFindAddressElement=Cannot find an ''Address'' part in the given element {0}
cannotFindAddressText=The passed element {0} does not have a valid address text.
nullPassedElement=The passed element is null.
-noAckRequestedElement=Message identified as of type ''AckRequested'' but it does not have an ''AckRequeted'' element.
invalidAckMessageEntry=Invalid ack message entry: {0}
seqPartIsNull=Sequence part is null.
incomingSequenceNotValidID=The ID for the incoming sequence is not valid: ''{0}''.
@@ -229,14 +171,9 @@
terminateSeqCannotBeAddedToNonBody=Cannot add ''terminate sequence'' to a non-body element.
terminateSeqResponseCannotBeAddedToNonBody=Cannot add ''terminate sequence response'' to a non-body element.
closeSeqCannotBeAddedToNonBody=Cannot add ''close sequence'' to a non-body element.
-closeSeqCannotBeExtractedFromNonBody=Cannot extract ''close sequence'' from a non-body element.
closeSeqResponseCannotBeAddedToNonBody=Cannot add ''close sequence response'' to a non-body element.
createSeqCannotBeAddedToNonBody=Cannot add ''create sequence'' part to a non-body element.
createSeqResponseCannotBeAddedToNonBody=Cannot get ''create sequnce response'' from a non-body element.
-seqOfferNullID=Cannot add ''SequnceOffer'' parts since identifier is not set.
-terminateSequence=Cannot add ''terminate sequence'' part since identifier is not set.
-terminateSeqResponseNullID=Cannot add ''terminate sequence response'' part since identifier is not set.
-sequencePartNullID=Cannot add ''Sequence'' part since identifier is not set.
closeSeqPartNullID=Cannot add ''close sequence'' part since identifier is not set
closeSeqResponsePartNullID=Cannot add ''close sequence response'' part since identifier is not set
invalidIdentifier=The passed element {0} does not contain a valid identifier part.
@@ -244,10 +181,8 @@
createSeqNullAcksTo=Cannot add a ''create seqeunce part'' since ''acksTo'' is not set.
acceptNullAcksTo=Cannot add ''Accept'' part since ''acksTo'' is not set.
noAcksToPart=The passed element {0} does not contain an ''acksTo'' part.
-noElementPart=The passed element {0} does not contain an ''Ele,'' part.
cannotProcessExpires=Cannot process ''Expires'' since the duration value is not valid.
noFaultCode=Cannot add ''Fault Code'' since the the value is not set correctly.
-seqAckNonHeader=Cannot get sequence acknowlegement from a non-header element
cannotSetACksTo=Cannot set the of the AcksTo element address as the value is not valid {0}
cannotSetEndpoint=Cannot set the address of the Elndpoint element as the value is not valid {0}
@@ -263,28 +198,22 @@
#-------------------------------------
incommingSequenceReportNotFound=An incoming sequence report is not present for the given sequenceID {0}
-cannotGenerateReport=Cannot generate the sequence report for the given ''internalSequenceID'' {0}
cannotFindReportForGivenData=Cannnot find a sequence report for the given data {0}.
-cannotGenerateReportNonUniqueSequence=Sequence data {0} is not unique. Cannot generate report.
outSeqIDIsNull=''OutSequenceId'' is null
requestMsgNotPresent=Request message is not present
requestSeqIsNull=Error: ''RequestSequence'' is null
newSeqIdIsNull=New sequence Id is null
-unavailableAppMsg=Error: unavailable application message
terminateAddedPreviously=Terminate was added previously.
-maximumRetransmissionCountProcessor=MaximumRetransmissionCountProcessor:doAcknowledgementInterval
nullMsgId=Key (MessageId) is null. Cannot insert.
storageMapNotPresent=Error: storage Map not present
failedToStoreMessage=Failed to store message due to exception {0}.
failedToLoadMessage=Failed to load message due to exception {0}.
entryNotPresentForUpdating=Entry is not present for updating
appMsgIsNull=Application message is null
-invalidMsgNumberList=Invalid msg number list
cannotFindReqMsgFromOpContext=Cannot find the request message from the operation context
toEPRNotSet=To EPR has not been set in the given message
toBeanNotSet=The 'To' Sequence Property Bean has not been set for the sequence.
-replyToBeanNotSet=The 'ReplyTo' Sequence Property Bean has not been set for the sequence.
cannotFindTransportInDesc=Cannot find the transport in description {0} in the ConfigurationContext
invalidElementFoundWithinElement=Found invalid ''{0}'' element within ''{1}'' element
invokerNotFound=An invoker thread was not found to dispatch messages on the inbound sequence {0}.
@@ -301,7 +230,6 @@
proofOfPossessionNotVerified = Proof of possession not verified
noSecurityResults = No Security results
noSecConvTokenInPolicy = No SecureConversationToken in policy
-noServicePolicy=Service policy missing
couldNotLoadModulePolicies=Could not load module policies. Using default values.
modulePoliciesLoaded=Module policies were successfully loaded
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/security/dummy/DummySecurityManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/security/dummy/DummySecurityManager.java?view=diff&rev=504889&r1=504888&r2=504889
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/security/dummy/DummySecurityManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/security/dummy/DummySecurityManager.java Thu Feb 8 05:41:15 2007
@@ -23,6 +23,7 @@
import org.apache.axis2.description.AxisModule;
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
import org.apache.sandesha2.security.SecurityManager;
import org.apache.sandesha2.security.SecurityToken;
@@ -42,7 +43,7 @@
public void checkProofOfPossession(SecurityToken token, OMElement messagePart, MessageContext message)
throws SandeshaException
{
- String msg = SandeshaMessageHelper.getMessage("secureDummyNoProof");
+ String msg = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.secureDummyNoProof);
throw new SandeshaException(msg);
}
@@ -54,7 +55,7 @@
public String getTokenRecoveryData(SecurityToken token)
throws SandeshaException
{
- String msg = SandeshaMessageHelper.getMessage("secureDummyNoToken");
+ String msg = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.secureDummyNoToken);
throw new SandeshaException(msg);
}
@@ -69,17 +70,17 @@
public SecurityToken getSecurityToken(OMElement theSTR, MessageContext message)
throws SandeshaException
{
- String msg = SandeshaMessageHelper.getMessage("secureDummyNoSTR");
+ String msg = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.secureDummyNoSTR);
throw new SandeshaException(msg);
}
public OMElement createSecurityTokenReference(SecurityToken token, MessageContext message) throws SandeshaException {
- String msg = SandeshaMessageHelper.getMessage("secureDummyNoSTR");
+ String msg = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.secureDummyNoSTR);
throw new SandeshaException(msg);
}
public void applySecurityToken(SecurityToken token, MessageContext outboundMessage) throws SandeshaException {
- String msg = SandeshaMessageHelper.getMessage("secureDummyNoSTR");
+ String msg = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.secureDummyNoSTR);
throw new SandeshaException(msg);
}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java?view=diff&rev=504889&r1=504888&r2=504889
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java Thu Feb 8 05:41:15 2007
@@ -160,56 +160,6 @@
}
/**
- * this is used to get the acked messages of a sequence. If this is an
- * outgoing message the sequenceIdentifier should be the internal
- * sequenceID.
- *
- * @param sequenceIdentifier
- * @param outGoingMessage
- * @return
- */
- public static RangeString getClientCompletedMessageRanges(String internalSequenceID, String sequenceID, StorageManager storageManager)
- throws SandeshaException {
- if (log.isDebugEnabled())
- log.debug("Enter: AcknowledgementManager::getClientCompletedMessageRanges " + internalSequenceID + ", " + sequenceID);
-
- RMSBean rmsBean = SandeshaUtil.getRMSBeanFromSequenceId(storageManager, sequenceID);
-
- if (rmsBean == null) {
- String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.completedMsgBeanIsNull, sequenceID);
- SandeshaException e = new SandeshaException(message);
- if(log.isDebugEnabled()) log.debug("Throwing exception", e);
- throw e;
- }
-
- RangeString completedMsgRanges = rmsBean.getClientCompletedMessages();
-
- if (log.isDebugEnabled())
- log.debug("Exit: AcknowledgementManager::getClientCompletedMessageRanges");
- return completedMsgRanges;
- }
-
- public static RangeString getServerCompletedMessageRanges(String sequenceID, StorageManager storageManager)
- throws SandeshaException {
- if (log.isDebugEnabled())
- log.debug("Enter: AcknowledgementManager::getServerCompletedMessageRanges " + sequenceID);
-
- RMDBean rmdBean = SandeshaUtil.getRMDBeanFromSequenceId(storageManager, sequenceID);
-
- if (rmdBean.getServerCompletedMessages() == null) {
- String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.completedMsgBeanIsNull, sequenceID);
- SandeshaException e = new SandeshaException(message);
- if(log.isDebugEnabled()) log.debug("Throwing exception", e);
- throw e;
- }
-
- if (log.isDebugEnabled())
- log.debug("Exit: AcknowledgementManager::getServerCompletedMessageRanges");
- return rmdBean.getServerCompletedMessages();
- }
-
-
- /**
*
* @param referenceRMMessage
* @param sequencePropertyKey
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org