You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by ch...@apache.org on 2006/12/10 18:14:45 UTC
svn commit: r485219 [1/2] - in /webservices/sandesha/trunk/java: ./
src/org/apache/sandesha2/ src/org/apache/sandesha2/client/
src/org/apache/sandesha2/handlers/ src/org/apache/sandesha2/msgprocessors/
src/org/apache/sandesha2/polling/ src/org/apache/s...
Author: chamikara
Date: Sun Dec 10 09:14:40 2006
New Revision: 485219
URL: http://svn.apache.org/viewvc?view=rev&rev=485219
Log:
More changes from 1.1.
- Storage Manager refacturing.
- Bug fixes
- Document updates
Modified:
webservices/sandesha/trunk/java/README.txt
webservices/sandesha/trunk/java/release-notes.html
webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/SandeshaModule.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/security/rampart/RampartBasedSecurityManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/StorageManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/WSRMMessageSender.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Invoker.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/InvokerWorker.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Sender.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaClientTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/InvokerBeanMgrTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/RMDBeanMgrTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/RMSBeanMgrTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/SenderBeanMgrTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/workers/ForceInboundDispatchTest.java
webservices/sandesha/trunk/java/xdocs/architectureGuide.html
webservices/sandesha/trunk/java/xdocs/download.html
webservices/sandesha/trunk/java/xdocs/images/storage.jpg
webservices/sandesha/trunk/java/xdocs/userGuide.html
Modified: webservices/sandesha/trunk/java/README.txt
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/README.txt?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/README.txt (original)
+++ webservices/sandesha/trunk/java/README.txt Sun Dec 10 09:14:40 2006
@@ -1,5 +1,5 @@
==========================================================================
-Apache Sandesha2 1.0 build
+Apache Sandesha2 @VERSION@ build
http://ws.apache.org/sandesha/sandesha2
---------------------------------------------------------------------------
@@ -17,9 +17,10 @@
details).
Add a user phase named RMPhase to the all four flows of the axis2.xml.
Get the binary distribution of Sandesha2 and extract it. You will find the
-sandesha2-1.0.mar file inside that. This is the current Sandesha2 module
+sandesha2-@VERSION@.mar file inside that. This is the current Sandesha2 module
file.
Put Sandesha2 module file to <Axis2_webapp>/WEB-INF/modules directory.
+Put sandesha2-policy-@VERSION@.jar file that comes with the distribution to the <Axis2_webapp>/WEB-INF/lib directory.
Using Sandesha2 in the server side
===================================
@@ -37,8 +38,9 @@
Engage sandesha2 and addressing modules to the ServiceClient object before
doing any invocation. If you are not using any advance features add the
-sandesha2-client-1.0.jar to your classpath. Otherwise you will have to add
-the sandesha2-1.0.jar file to the classpath.
+sandesha2-client-@VERSION@.jar to your classpath. Otherwise you will have to add
+the sandesha2-@VERSION@.jar file to the classpath. Add the sandesha2-policy-@VERSION@.jar
+to your classpath.
Please see Sandesha2 user guide for more details and sample code on using
Sandesha2.
@@ -56,4 +58,4 @@
prefix. Your comments are highly appreciated and really needed to make this distribution
a successful one.
-Apache Sandesha2 team.
\ No newline at end of file
+Apache Sandesha2 team.
Modified: webservices/sandesha/trunk/java/release-notes.html
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/release-notes.html?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/release-notes.html (original)
+++ webservices/sandesha/trunk/java/release-notes.html Sun Dec 10 09:14:40 2006
@@ -12,15 +12,16 @@
<body>
<h1>Apache Sandesha2 Release Notes</h1>
-<p>This is the 1.0 release of Apache Sandesha2.</p>
+<p>This is the @VERSION@ release of Apache Sandesha2.</p>
<h2>What is in this release</h2>
-<p>Features available on this release of Sandesha2.</p>
+<p>Features available in this release of Sandesha2.</p>
<ol>
<li>Support for WS-ReliableMessaging in both client side and server side of
Axis2. (according the the WS-ReliableMessaging specification February
2005).</li>
+ <li>Support upto the CD4 of the WSRM 1.1 specification being developed under OASIS.</li>
<li>Pluggable storage framework.</li>
<li>Configurable delivery assurances. In-order exactly once delivery
assurance is guaranteed. Users can also instruct the system to stop
@@ -36,6 +37,7 @@
(for example when a fault is retrieved or when a sequence times out).</li>
<li>Support for the WSRM specification being developed under OASIS WSRX
technical committee.</li>
+ <li>Support for SecureConversation+RM</li>
<li>Test cases to test RM scenarios.</li>
<li>Documentation</li>
</ol>
@@ -46,16 +48,5 @@
<p>Apache Sandesha2 team</p>
-<p></p>
-
-<p></p>
-
-<p></p>
-
-<p></p>
-
-<p></p>
-
-<p></p>
</body>
</html>
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java Sun Dec 10 09:14:40 2006
@@ -560,6 +560,10 @@
String RETRANSMITTABLE_PHASES = "RMRetransmittablePhases";
+ String propertiesToCopyFromReferenceMessage = "propertiesToCopyFromReferenceMessage";
+
+ String propertiesToCopyFromReferenceRequestMessage = "propertiesToCopyFromReferenceRequestMessage";
+
String [] SPEC_NS_URIS = {
SPEC_2005_02.NS_URI,
SPEC_2006_08.NS_URI
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/SandeshaModule.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/SandeshaModule.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/SandeshaModule.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/SandeshaModule.java Sun Dec 10 09:14:40 2006
@@ -57,6 +57,9 @@
//init the i18n messages
SandeshaMessageHelper.innit();
+ //storing the module as a static variable
+ SandeshaUtil.setAxisModule(module);
+
// continueUncompletedSequences (storageManager,configCtx);
SandeshaPolicyBean constantPropertyBean = PropertyManager.loadPropertiesFromDefaultValues();
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=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java Sun Dec 10 09:14:40 2006
@@ -110,7 +110,7 @@
StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(configurationContext,configurationContext.getAxisConfiguration());
SequencePropertyBeanMgr seqPropMgr = storageManager.getSequencePropertyBeanMgr();
- RMSBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
+ RMSBeanMgr createSeqMgr = storageManager.getRMSBeanMgr();
String withinTransactionStr = (String) configurationContext.getProperty(Sandesha2Constants.WITHIN_TRANSACTION);
boolean withinTransaction = false;
@@ -303,38 +303,14 @@
}
/**
- * Clients can use this to create a sequence sequence.
+ * This could be used to create sequences with a given sequence key.
*
* @param serviceClient - A configured ServiceClient to be used to invoke RM messages. This need to have Sandesha2 engaged.
* @param offer - Weather a sequence should be offered for obtaining response messages.
- * @return The sequenceKey of the newly generated sequence.
+ * @param sequenceKey The sequenceKey of the newly generated sequence.
* @throws SandeshaException
*/
- public static String createSequence(ServiceClient serviceClient, boolean offer) throws SandeshaException {
-
- // Generate a new sequence key to be used for creating the sequence
- String newSequenceKey = SandeshaUtil.getUUID();
-
- // Create the sequence
- createSequence(serviceClient, offer, newSequenceKey);
-
- // Return the new sequence key
- return newSequenceKey;
- }
-
- /**
- * Creates a sequence with the specified sequenceKey.
- *
- * @param serviceClient
- * @param offer
- * @param sequenceKey
- * @throws SandeshaException
- */
- public static void createSequence(ServiceClient serviceClient, boolean offer, String sequenceKey)
- throws SandeshaException {
-
- if (log.isDebugEnabled())
- log.debug("Enter: SandeshaClient::createSequence " + offer + ", " + sequenceKey);
+ public static void createSequence(ServiceClient serviceClient, boolean offer, String sequenceKey) throws SandeshaException {
setUpServiceClientAnonymousOperations (serviceClient);
@@ -352,7 +328,7 @@
if (to == null)
throw new SandeshaException(SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.toEPRNotValid, null));
-
+
if (offer) {
String offeredSequenceID = SandeshaUtil.getUUID();
options.setProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID, offeredSequenceID);
@@ -367,7 +343,7 @@
if (rmSpecVersion == null)
rmSpecVersion = SpecSpecificConstants.getDefaultSpecVersion();
-
+
//When the message is marked as Dummy the application processor will not actually try to send it.
//But still the create Sequence will be added.
@@ -388,8 +364,29 @@
options.setProperty(SandeshaClientConstants.DUMMY_MESSAGE, Sandesha2Constants.VALUE_FALSE);
options.setProperty(SandeshaClientConstants.SEQUENCE_KEY, oldSequenceKey);
- if (log.isDebugEnabled())
- log.debug("Exit: SandeshaClient::createSequence");
+ }
+
+ /**
+ * Clients can use this to create a sequence sequence.
+ *
+ * @param serviceClient - A configured ServiceClient to be used to invoke RM messages. This need to have Sandesha2 engaged.
+ * @param offer - Weather a sequence should be offered for obtaining response messages.
+ * @return The sequenceKey of the newly generated sequence.
+ * @throws SandeshaException
+ */
+ public static String createSequence(ServiceClient serviceClient, boolean offer)
+ throws SandeshaException {
+
+ Options options = serviceClient.getOptions();
+ if (options == null)
+ throw new SandeshaException(SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.optionsObjectNotSet));
+
+
+ String newSequenceKey = SandeshaUtil.getUUID();
+ createSequence(serviceClient, offer, newSequenceKey);
+
+ return newSequenceKey;
}
/**
@@ -1044,7 +1041,7 @@
return SequenceReport.SEQUENCE_STATUS_TIMED_OUT;
}
- RMDBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
+ RMDBeanMgr nextMsgMgr = storageManager.getRMDBeanMgr();
RMDBean rMDBean = nextMsgMgr.retrieve(sequenceID);
if (rMDBean != null) {
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java Sun Dec 10 09:14:40 2006
@@ -85,40 +85,7 @@
boolean rolebacked = false;
try {
- // processing faults.
- // Had to do this before dispatching. A fault message comes with the
- // relatesTo part. So this will
- // fill the opContext of te req/res message. But RM keeps
- // retransmitting. So RM has to report the
- // error and stop this fault being dispatched as the response
- // message.
-
- SOAPFault faultPart = envelope.getBody().getFault();
-
- if (faultPart != null) {
-
- // constructing the fault
- AxisFault axisFault = getAxisFaultFromFromSOAPFault(faultPart);
-
- //If this is a RM related fault. I.e. one that was defined in the WSRM spec. It will be
- //handled at this point.
- SOAPFaultCode faultCode = axisFault.getFaultCodeElement();
- SOAPFaultSubCode faultSubCode = faultCode!=null?faultCode.getSubCode():null;
- SOAPFaultValue faultSubcodeValue = faultSubCode!=null?faultSubCode.getValue():null;
- String subCodeText = faultSubcodeValue!=null?faultSubcodeValue.getText():null;
-
- if (subCodeText!=null && FaultManager.isRMFault(subCodeText)) {
- //handling the fault here and pausing the message.
-
- FaultManager faultManager = new FaultManager ();
- faultManager.manageIncomingRMFault (axisFault, msgContext);
-
- msgContext.pause();
- returnValue = InvocationResponse.SUSPEND;
- }
-
- }
-
+
// Quitting the message with minimum processing if not intended for
// RM.
boolean isRMGlobalMessage = SandeshaUtil.isRMGlobalMessage(msgContext);
@@ -277,8 +244,6 @@
// TODO correct the syntac into '[received msgs]'
seqPropMgr.update(receivedMsgsBean);
-
- SequenceProcessor.sendAckIfNeeded(rmMsgContext, receivedMsgStr, storageManager);
drop = true;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaInHandler.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaInHandler.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaInHandler.java Sun Dec 10 09:14:40 2006
@@ -35,6 +35,7 @@
import org.apache.sandesha2.msgprocessors.SequenceProcessor;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.Transaction;
+import org.apache.sandesha2.util.FaultManager;
import org.apache.sandesha2.util.MsgInitializer;
import org.apache.sandesha2.util.SandeshaUtil;
@@ -106,6 +107,10 @@
throw new AxisFault(message);
}
+ //processing any incoming faults.
+ //This is responsible for Sandesha2 specific
+ FaultManager.processMessagesForFaults(msgCtx);
+
RMMsgContext rmMsgCtx = null;
try {
rmMsgCtx = MsgInitializer.initializeMessage(msgCtx);
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java Sun Dec 10 09:14:40 2006
@@ -216,7 +216,7 @@
} else {
- SenderBeanMgr retransmitterBeanMgr = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr retransmitterBeanMgr = storageManager.getSenderBeanMgr();
String key = SandeshaUtil.getUUID();
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java Sun Dec 10 09:14:40 2006
@@ -109,7 +109,7 @@
StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(configCtx, configCtx
.getAxisConfiguration());
- SenderBeanMgr retransmitterMgr = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr retransmitterMgr = storageManager.getSenderBeanMgr();
SequencePropertyBeanMgr seqPropMgr = storageManager.getSequencePropertyBeanMgr();
String outSequenceId = sequenceAck.getIdentifier().getIdentifier();
@@ -180,7 +180,7 @@
Sandesha2Constants.SequenceProperties.OFFERED_SEQUENCE, storageManager);
if (offeredSequenceId!=null) {
- RMDBeanMgr rMDBeanMgr = storageManager.getNextMsgBeanMgr();
+ RMDBeanMgr rMDBeanMgr = storageManager.getRMDBeanMgr();
RMDBean rMDBean = rMDBeanMgr.retrieve(outSequenceId);
if (rMDBean!=null && rMDBean.isPollingMode())
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java Sun Dec 10 09:14:40 2006
@@ -503,8 +503,8 @@
.getMessagePart(Sandesha2Constants.MessageParts.CREATE_SEQ);
SequencePropertyBeanMgr seqPropMgr = storageManager.getSequencePropertyBeanMgr();
- RMSBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
- SenderBeanMgr retransmitterMgr = storageManager.getRetransmitterBeanMgr();
+ RMSBeanMgr createSeqMgr = storageManager.getRMSBeanMgr();
+ SenderBeanMgr retransmitterMgr = storageManager.getSenderBeanMgr();
SequenceOffer offer = createSequencePart.getSequenceOffer();
if (offer != null) {
@@ -604,7 +604,7 @@
MessageContext msg = rmMsg.getMessageContext();
SequencePropertyBeanMgr sequencePropertyMgr = storageManager.getSequencePropertyBeanMgr();
- SenderBeanMgr retransmitterMgr = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr retransmitterMgr = storageManager.getSenderBeanMgr();
SequencePropertyBean toBean = sequencePropertyMgr.retrieve(internalSequenceId,
Sandesha2Constants.SequenceProperties.TO_EPR);
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java Sun Dec 10 09:14:40 2006
@@ -163,7 +163,7 @@
String outgoingSideSequencePropertyKey = outgoingSideInternalSequenceId;
- RMSBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
+ RMSBeanMgr createSeqMgr = storageManager.getRMSBeanMgr();
createSeqMgr.insert(rMSBean);
// Setting sequence properties for the outgoing sequence.
@@ -300,7 +300,7 @@
return false;
}
- RMSBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
+ RMSBeanMgr createSeqMgr = storageManager.getRMSBeanMgr();
RMSBean createSeqFindBean = new RMSBean();
createSeqFindBean.setSequenceID(sequenceId);
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java Sun Dec 10 09:14:40 2006
@@ -100,8 +100,8 @@
}
String createSeqMsgId = relatesTo.getValue();
- SenderBeanMgr retransmitterMgr = storageManager.getRetransmitterBeanMgr();
- RMSBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
+ SenderBeanMgr retransmitterMgr = storageManager.getSenderBeanMgr();
+ RMSBeanMgr createSeqMgr = storageManager.getRMSBeanMgr();
RMSBean createSeqBean = createSeqMgr.retrieve(createSeqMsgId);
if (createSeqBean == null) {
@@ -215,7 +215,7 @@
if (pollingMode)
SandeshaUtil.startPollingManager(configCtx);
- RMDBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
+ RMDBeanMgr nextMsgMgr = storageManager.getRMDBeanMgr();
nextMsgMgr.insert(rMDBean);
String rmSpecVersion = createSeqResponseRMMsgCtx.getRMSpecVersion();
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java Sun Dec 10 09:14:40 2006
@@ -47,7 +47,7 @@
ConfigurationContext configurationContext = rmMsgCtx.getConfigurationContext();
StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(configurationContext,configurationContext.getAxisConfiguration());
- SenderBeanMgr senderBeanMgr = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr senderBeanMgr = storageManager.getSenderBeanMgr();
//selecting the set of SenderBeans that suit the given criteria.
SenderBean findSenderBean = new SenderBean ();
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java Sun Dec 10 09:14:40 2006
@@ -217,7 +217,7 @@
}
// Pause the messages bean if not the right message to invoke.
- RMDBeanMgr mgr = storageManager.getNextMsgBeanMgr();
+ RMDBeanMgr mgr = storageManager.getRMDBeanMgr();
RMDBean bean = mgr.retrieve(sequenceId);
if (bean == null) {
@@ -225,7 +225,7 @@
sequenceId));
}
- InvokerBeanMgr storageMapMgr = storageManager.getStorageMapBeanMgr();
+ InvokerBeanMgr storageMapMgr = storageManager.getInvokerBeanMgr();
// inorder invocation is still a global property
boolean inOrderInvocation = SandeshaUtil.getPropertyBean(
@@ -331,7 +331,7 @@
// / Transaction asyncAckTransaction =
// storageManager.getTransaction();
- SenderBeanMgr retransmitterBeanMgr = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr retransmitterBeanMgr = storageManager.getSenderBeanMgr();
String key = SandeshaUtil.getUUID();
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java Sun Dec 10 09:14:40 2006
@@ -79,7 +79,7 @@
Sandesha2Constants.SequenceProperties.OFFERED_SEQUENCE, storageManager);
if (offeredSequenceId!=null) {
- RMDBeanMgr rMDBeanMgr = storageManager.getNextMsgBeanMgr();
+ RMDBeanMgr rMDBeanMgr = storageManager.getRMDBeanMgr();
RMDBean rMDBean = rMDBeanMgr.retrieve(sequenceId);
if (rMDBean!=null && rMDBean.isPollingMode())
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java Sun Dec 10 09:14:40 2006
@@ -66,7 +66,7 @@
try {
- RMDBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
+ RMDBeanMgr nextMsgMgr = storageManager.getRMDBeanMgr();
//geting the sequences to be polled.
//if shedule contains any requests, do the earliest one.
@@ -140,7 +140,7 @@
if (to!=null)
makeConnectionSenderBean.setToAddress(to.getAddress());
- SenderBeanMgr senderBeanMgr = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr senderBeanMgr = storageManager.getSenderBeanMgr();
//this message should not be sent until it is qualified. I.e. till it is sent through the Sandesha2TransportSender.
makeConnectionRMMessage.setProperty(Sandesha2Constants.QUALIFIED_FOR_SENDING, Sandesha2Constants.VALUE_FALSE);
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/security/rampart/RampartBasedSecurityManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/security/rampart/RampartBasedSecurityManager.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/security/rampart/RampartBasedSecurityManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/security/rampart/RampartBasedSecurityManager.java Sun Dec 10 09:14:40 2006
@@ -137,7 +137,9 @@
//Now check signature parts
OMAttribute idattr = messagePart.getAttribute(new QName(WSConstants.WSU_NS, "Id"));
verified = wser.getSignedElements().contains(idattr.getAttributeValue());
- break;
+ if(verified) {
+ break;
+ }
}
}
}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/StorageManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/StorageManager.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/StorageManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/StorageManager.java Sun Dec 10 09:14:40 2006
@@ -57,15 +57,15 @@
public abstract SandeshaThread getInvoker();
- public abstract RMSBeanMgr getCreateSeqBeanMgr();
+ public abstract RMSBeanMgr getRMSBeanMgr();
- public abstract RMDBeanMgr getNextMsgBeanMgr();
+ public abstract RMDBeanMgr getRMDBeanMgr();
- public abstract SenderBeanMgr getRetransmitterBeanMgr();
+ public abstract SenderBeanMgr getSenderBeanMgr();
public abstract SequencePropertyBeanMgr getSequencePropertyBeanMgr();
- public abstract InvokerBeanMgr getStorageMapBeanMgr();
+ public abstract InvokerBeanMgr getInvokerBeanMgr();
public abstract void storeMessageContext (String storageKey,MessageContext msgContext) throws SandeshaStorageException;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java Sun Dec 10 09:14:40 2006
@@ -20,10 +20,14 @@
import java.util.Collection;
import java.util.HashMap;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisModule;
import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
@@ -48,6 +52,7 @@
private static InMemoryStorageManager instance = null;
private final String MESSAGE_MAP_KEY = "Sandesha2MessageMap";
+ private final String ENVELOPE_MAP_KEY = "Sandesha2EnvelopeMap";
private RMSBeanMgr rMSBeanMgr = null;
private RMDBeanMgr rMDBeanMgr = null;
private SequencePropertyBeanMgr sequencePropertyBeanMgr = null;
@@ -128,15 +133,15 @@
t.enlist(bean);
}
- public RMSBeanMgr getCreateSeqBeanMgr() {
+ public RMSBeanMgr getRMSBeanMgr() {
return rMSBeanMgr;
}
- public RMDBeanMgr getNextMsgBeanMgr() {
+ public RMDBeanMgr getRMDBeanMgr() {
return rMDBeanMgr;
}
- public SenderBeanMgr getRetransmitterBeanMgr() {
+ public SenderBeanMgr getSenderBeanMgr() {
return senderBeanMgr;
}
@@ -144,7 +149,7 @@
return sequencePropertyBeanMgr;
}
- public InvokerBeanMgr getStorageMapBeanMgr() {
+ public InvokerBeanMgr getInvokerBeanMgr() {
return invokerBeanMgr;
}
@@ -160,12 +165,34 @@
return instance;
}
- public MessageContext retrieveMessageContext(String key,ConfigurationContext context) {
+ public MessageContext retrieveMessageContext(String key,ConfigurationContext context) throws SandeshaStorageException {
HashMap storageMap = (HashMap) getContext().getProperty(MESSAGE_MAP_KEY);
if (storageMap==null)
return null;
- return (MessageContext) storageMap.get(key);
+ MessageContext messageContext = (MessageContext) storageMap.get(key);
+
+ HashMap envMap = (HashMap) getContext().getProperty(ENVELOPE_MAP_KEY);
+ if(envMap==null) {
+ return null;
+ }
+
+ //Get hold of the original SOAP envelope
+ SOAPEnvelope envelope = (SOAPEnvelope)envMap.get(key);
+
+ //Now clone the env and set it in the message context
+ if (envelope!=null) {
+
+ XMLStreamReader streamReader = envelope.cloneOMElement().getXMLStreamReader();
+ SOAPEnvelope clonedEnvelope = new StAXSOAPModelBuilder(streamReader, null).getSOAPEnvelope();
+ try {
+ messageContext.setEnvelope(clonedEnvelope);
+ } catch (AxisFault e) {
+ throw new SandeshaStorageException (e);
+ }
+ }
+
+ return messageContext;
}
public void storeMessageContext(String key,MessageContext msgContext) {
@@ -180,6 +207,23 @@
key = SandeshaUtil.getUUID();
storageMap.put(key,msgContext);
+
+ //Now get hold of the SOAP envelope and store it in the env map
+ HashMap envMap = (HashMap) getContext().getProperty(ENVELOPE_MAP_KEY);
+
+ if(envMap==null) {
+ envMap = new HashMap ();
+ getContext().setProperty(ENVELOPE_MAP_KEY, envMap);
+ }
+
+ SOAPEnvelope envelope = msgContext.getEnvelope();
+ //storing a cloned version of the envelope in the Map.
+ if (envelope!=null) {
+ XMLStreamReader streamReader = envelope.cloneOMElement().getXMLStreamReader();
+ SOAPEnvelope clonedEnvelope = new StAXSOAPModelBuilder(streamReader, null).getSOAPEnvelope();
+ envMap.put(key, clonedEnvelope);
+ }
+
}
public void updateMessageContext(String key,MessageContext msgContext) throws SandeshaStorageException {
@@ -195,19 +239,26 @@
throw new SandeshaStorageException (SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.entryNotPresentForUpdating));
+ HashMap envMap = (HashMap) getContext().getProperty(ENVELOPE_MAP_KEY);
+
+ storageMap.remove(key);
+ if (envMap!=null)
+ envMap.remove(key);
+
storeMessageContext(key,msgContext);
}
public void removeMessageContext(String key) throws SandeshaStorageException {
HashMap storageMap = (HashMap) getContext().getProperty(MESSAGE_MAP_KEY);
+ HashMap envelopeMap = (HashMap) getContext().getProperty(ENVELOPE_MAP_KEY);
- if (storageMap==null) {
- return;
- }
-
- Object entry = storageMap.get(key);
- if (entry!=null)
+
+ if (storageMap!=null)
storageMap.remove(key);
+
+ if (envelopeMap!=null)
+ envelopeMap.remove(key);
+
}
public void initStorage (AxisModule moduleDesc) {
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=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java Sun Dec 10 09:14:40 2006
@@ -71,7 +71,7 @@
ConfigurationContext configurationContext = rmMessageContext.getConfigurationContext();
- SenderBeanMgr retransmitterBeanMgr = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr retransmitterBeanMgr = storageManager.getSenderBeanMgr();
SenderBean findBean = new SenderBean();
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java Sun Dec 10 09:14:40 2006
@@ -26,7 +26,9 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
+import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultCode;
import org.apache.axiom.soap.SOAPFaultDetail;
import org.apache.axiom.soap.SOAPFaultReason;
@@ -41,6 +43,8 @@
import org.apache.sandesha2.RMMsgContext;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.client.SandeshaClientConstants;
+import org.apache.sandesha2.client.SandeshaListener;
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
import org.apache.sandesha2.i18n.SandeshaMessageKeys;
import org.apache.sandesha2.storage.StorageManager;
@@ -195,7 +199,7 @@
MessageContext messageContext = rmMessageContext.getMessageContext();
- RMSBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
+ RMSBeanMgr createSeqMgr = storageManager.getRMSBeanMgr();
boolean validSequence = false;
@@ -209,7 +213,7 @@
} else {
// Look for an inbound sequence
- RMDBeanMgr mgr = storageManager.getNextMsgBeanMgr();
+ RMDBeanMgr mgr = storageManager.getRMDBeanMgr();
coll = mgr.retrieveAll();
Iterator it = coll.iterator();
@@ -456,12 +460,40 @@
}
- public void manageIncomingRMFault (AxisFault fault, MessageContext msgContext) {
+ private static void manageIncomingFault (AxisFault fault, MessageContext msgContext) {
+
+ if (log.isErrorEnabled())
+ log.error(fault);
+
+ SandeshaListener listner = (SandeshaListener) msgContext.getProperty(SandeshaClientConstants.SANDESHA_LISTENER);
+ if (listner!=null)
+ listner.onError(fault);
- //TODO implement code to handle the rm fault
+ }
+
+ public static void processMessagesForFaults (MessageContext msgContext) {
- log.error(fault);
+ SOAPEnvelope envelope = msgContext.getEnvelope();
+ if (envelope==null)
+ return;
+ SOAPFault faultPart = envelope.getBody().getFault();
+
+ if (faultPart != null) {
+
+ // constructing the fault
+ AxisFault axisFault = getAxisFaultFromFromSOAPFault(faultPart);
+ manageIncomingFault (axisFault, msgContext);
+ }
+
+ }
+
+
+ private static AxisFault getAxisFaultFromFromSOAPFault(SOAPFault faultPart) {
+ AxisFault axisFault = new AxisFault(faultPart.getCode(), faultPart.getReason(), faultPart.getNode(), faultPart
+ .getRole(), faultPart.getDetail());
+
+ return axisFault;
}
}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java Sun Dec 10 09:14:40 2006
@@ -54,6 +54,7 @@
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.context.ServiceGroupContext;
import org.apache.axis2.description.AxisDescription;
+import org.apache.axis2.description.AxisModule;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.description.Parameter;
@@ -96,6 +97,16 @@
// private static Hashtable storedMsgContexts = new Hashtable();
private static Log log = LogFactory.getLog(SandeshaUtil.class);
+
+ private static AxisModule axisModule = null;
+
+ public static AxisModule getAxisModule() {
+ return axisModule;
+ }
+
+ public static void setAxisModule(AxisModule module) {
+ axisModule = module;
+ }
/**
* Create a new UUID.
@@ -579,11 +590,50 @@
newMessageContext.setProperty(MessageContext.TRANSPORT_OUT, referenceMessage
.getProperty(MessageContext.TRANSPORT_OUT));
- //TODO - move these to a property file.
- newMessageContext.setProperty(RampartMessageData.KEY_RAMPART_POLICY, referenceMessage
- .getProperty(RampartMessageData.KEY_RAMPART_POLICY));
- newMessageContext.setProperty(WSHandlerConstants.RECV_RESULTS,
- referenceMessage.getProperty(WSHandlerConstants.RECV_RESULTS));
+
+ //copyint properties as configured in the module.xml properties. Module xml has several
+ //properties which gives comma seperated lists of property names that have to be copited
+ //from various places when creating related messages.
+
+ AxisModule axisModule = SandeshaUtil.getAxisModule();
+
+ Parameter propertiesFromRefMsg = axisModule.getParameter(Sandesha2Constants.propertiesToCopyFromReferenceMessage);
+ if (propertiesFromRefMsg!=null) {
+ String value = (String) propertiesFromRefMsg.getValue();
+ if (value!=null) {
+ value = value.trim();
+ String[] propertyNames = value.split(",");
+ for (int i=0;i<propertyNames.length;i++) {
+ String propertyName = propertyNames[i];
+ Object val = referenceMessage.getProperty(propertyName);
+ if (val!=null) {
+ newMessageContext.setProperty(propertyName,val);
+ }
+ }
+ }
+ }
+
+ Parameter propertiesFromRefReqMsg = axisModule.getParameter(Sandesha2Constants.propertiesToCopyFromReferenceRequestMessage);
+ OperationContext referenceOpCtx = referenceMessage.getOperationContext();
+ MessageContext referenceRequestMessage = null;
+ if (referenceOpCtx!=null)
+ referenceRequestMessage=referenceOpCtx.getMessageContext(OperationContextFactory.MESSAGE_LABEL_IN_VALUE);
+
+ if (propertiesFromRefReqMsg!=null && referenceRequestMessage!=null) {
+ String value = (String) propertiesFromRefReqMsg.getValue();
+ if (value!=null) {
+ value = value.trim();
+ String[] propertyNames = value.split(",");
+ for (int i=0;i<propertyNames.length;i++) {
+ String propertyName = propertyNames[i];
+ Object val = referenceRequestMessage.getProperty(propertyName);
+ if (val!=null) {
+ newMessageContext.setProperty(propertyName,val);
+ }
+ }
+ }
+ }
+
newMessageContext.setExecutionChain(referenceMessage.getExecutionChain());
@@ -707,7 +757,7 @@
RMSBean createSeqFindBean = new RMSBean();
createSeqFindBean.setInternalSequenceID(internalSequenceID);
- RMSBean rMSBean = storageManager.getCreateSeqBeanMgr().findUnique(createSeqFindBean);
+ RMSBean rMSBean = storageManager.getRMSBeanMgr().findUnique(createSeqFindBean);
String sequeunceID = null;
if (rMSBean != null &&
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java Sun Dec 10 09:14:40 2006
@@ -129,7 +129,7 @@
seqPropMgr.insert(tokenBean);
}
- RMDBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
+ RMDBeanMgr nextMsgMgr = storageManager.getRMDBeanMgr();
nextMsgMgr.insert(new RMDBean(sequenceId, 1)); // 1 will be the
// next
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java Sun Dec 10 09:14:40 2006
@@ -106,7 +106,7 @@
*/
public static void cleanReceivingSideAfterInvocation(ConfigurationContext configContext, String sequencePropertyKey ,String sequenceId,
StorageManager storageManager) throws SandeshaException {
- InvokerBeanMgr storageMapBeanMgr = storageManager.getStorageMapBeanMgr();
+ InvokerBeanMgr storageMapBeanMgr = storageManager.getInvokerBeanMgr();
// removing storageMap entries
InvokerBean findStorageMapBean = new InvokerBean();
@@ -146,7 +146,7 @@
removeReceivingSideProperties(configContext, sequencePropertyKey, sequenceId, storageManager);
// removing nextMsgMgr entries
- RMDBeanMgr rMDBeanMgr = storageManager.getNextMsgBeanMgr();
+ RMDBeanMgr rMDBeanMgr = storageManager.getRMDBeanMgr();
RMDBean findNextMsgBean = new RMDBean();
findNextMsgBean.setSequenceID(sequenceId);
Collection collection = rMDBeanMgr.find(findNextMsgBean);
@@ -279,8 +279,8 @@
boolean serverSide, StorageManager storageManager) throws SandeshaException {
SequencePropertyBeanMgr sequencePropertyBeanMgr = storageManager.getSequencePropertyBeanMgr();
- SenderBeanMgr retransmitterBeanMgr = storageManager.getRetransmitterBeanMgr();
- RMSBeanMgr rMSBeanMgr = storageManager.getCreateSeqBeanMgr();
+ SenderBeanMgr retransmitterBeanMgr = storageManager.getSenderBeanMgr();
+ RMSBeanMgr rMSBeanMgr = storageManager.getRMSBeanMgr();
// removing retransmitterMgr entries and corresponding message contexts.
Collection collection = retransmitterBeanMgr.find(internalSequenceId);
@@ -297,7 +297,7 @@
RMSBean createSeqFindBean = new RMSBean();
createSeqFindBean.setInternalSequenceID(internalSequenceId);
- RMSBean rMSBean = storageManager.getCreateSeqBeanMgr().findUnique(createSeqFindBean);
+ RMSBean rMSBean = storageManager.getRMSBeanMgr().findUnique(createSeqFindBean);
rMSBeanMgr.delete(rMSBean.getCreateSeqMsgID());
String outSequenceID = rMSBean.getSequenceID();
@@ -430,7 +430,7 @@
// / addTerminateSeqTransaction.commit();
SandeshaUtil.executeAndStore(terminateRMMessage, key);
- SenderBeanMgr retramsmitterMgr = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr retramsmitterMgr = storageManager.getSenderBeanMgr();
retramsmitterMgr.insert(terminateBean);
if(log.isDebugEnabled())
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/WSRMMessageSender.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/WSRMMessageSender.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/WSRMMessageSender.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/WSRMMessageSender.java Sun Dec 10 09:14:40 2006
@@ -80,7 +80,7 @@
RMSBean createSeqFindBean = new RMSBean();
createSeqFindBean.setInternalSequenceID(internalSequenceID);
- RMSBean rMSBean = storageManager.getCreateSeqBeanMgr().findUnique(createSeqFindBean);
+ RMSBean rMSBean = storageManager.getRMSBeanMgr().findUnique(createSeqFindBean);
if (rMSBean == null)
{
@@ -166,7 +166,7 @@
senderBean.setReSend(false);
- SenderBeanMgr retramsmitterMgr = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr retramsmitterMgr = storageManager.getSenderBeanMgr();
SandeshaUtil.executeAndStore(rmMsgCtx, key);
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Invoker.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Invoker.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Invoker.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Invoker.java Sun Dec 10 09:14:40 2006
@@ -75,8 +75,8 @@
SandeshaUtil.getSandeshaStorageManager(context, context.getAxisConfiguration());
InvokerBeanMgr storageMapMgr = storageManager
- .getStorageMapBeanMgr();
- RMDBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
+ .getInvokerBeanMgr();
+ RMDBeanMgr nextMsgMgr = storageManager.getRMDBeanMgr();
RMDBean rMDBean = nextMsgMgr.retrieve(sequenceID);
if (rMDBean != null) {
@@ -186,7 +186,7 @@
//we now have the set of ranges that can be delivered out of order.
//Look for any invokable message that lies in one of those ranges
Iterator invokerBeansIterator =
- strMgr.getStorageMapBeanMgr().find(
+ strMgr.getInvokerBeanMgr().find(
new InvokerBean(null,
0, //finds all invoker beans
sequenceID)).iterator();
@@ -234,10 +234,10 @@
StorageManager storageManager = SandeshaUtil
.getSandeshaStorageManager(context, context
.getAxisConfiguration());
- RMDBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
+ RMDBeanMgr nextMsgMgr = storageManager.getRMDBeanMgr();
InvokerBeanMgr storageMapMgr = storageManager
- .getStorageMapBeanMgr();
+ .getInvokerBeanMgr();
SequencePropertyBeanMgr sequencePropMgr = storageManager
.getSequencePropertyBeanMgr();
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/InvokerWorker.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/InvokerWorker.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/InvokerWorker.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/InvokerWorker.java Sun Dec 10 09:14:40 2006
@@ -44,8 +44,8 @@
try {
StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(configurationContext,configurationContext.getAxisConfiguration());
- InvokerBeanMgr invokerBeanMgr = storageManager.getStorageMapBeanMgr();
- RMDBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
+ InvokerBeanMgr invokerBeanMgr = storageManager.getInvokerBeanMgr();
+ RMDBeanMgr nextMsgMgr = storageManager.getRMDBeanMgr();
//starting a transaction
transaction = storageManager.getTransaction();
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?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Sender.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Sender.java Sun Dec 10 09:14:40 2006
@@ -89,7 +89,7 @@
// TODO make sure this locks on reads.
transaction = storageManager.getTransaction();
- SenderBeanMgr mgr = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr mgr = storageManager.getSenderBeanMgr();
SenderBean senderBean = mgr.getNextMsgToSend();
if (senderBean == null) {
if (log.isDebugEnabled()) {
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java Sun Dec 10 09:14:40 2006
@@ -60,7 +60,7 @@
try {
StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(configurationContext, configurationContext.getAxisConfiguration());
- SenderBeanMgr senderBeanMgr = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr senderBeanMgr = storageManager.getSenderBeanMgr();
transaction = storageManager.getTransaction();
Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaClientTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaClientTest.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaClientTest.java (original)
+++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaClientTest.java Sun Dec 10 09:14:40 2006
@@ -527,7 +527,7 @@
String sequenceId = SandeshaClient.getSequenceID(serviceClient);
// Get the SenderBeanManager
- SenderBeanMgr senderManager = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr senderManager = storageManager.getSenderBeanMgr();
// Check that there are no sender beans inside the SenderBeanMgr.
SenderBean senderBean = new SenderBean();
Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/InvokerBeanMgrTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/InvokerBeanMgrTest.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/InvokerBeanMgrTest.java (original)
+++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/InvokerBeanMgrTest.java Sun Dec 10 09:14:40 2006
@@ -53,7 +53,7 @@
StorageManager storageManager = SandeshaUtil.getInMemoryStorageManager(configCtx);
transaction = storageManager.getTransaction();
- mgr = storageManager.getStorageMapBeanMgr();
+ mgr = storageManager.getInvokerBeanMgr();
}
public void tearDown() throws Exception {
Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/RMDBeanMgrTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/RMDBeanMgrTest.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/RMDBeanMgrTest.java (original)
+++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/RMDBeanMgrTest.java Sun Dec 10 09:14:40 2006
@@ -54,7 +54,7 @@
StorageManager storageManager = SandeshaUtil.getInMemoryStorageManager(configCtx);
transaction = storageManager.getTransaction();
- mgr = storageManager.getNextMsgBeanMgr();
+ mgr = storageManager.getRMDBeanMgr();
}
Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/RMSBeanMgrTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/RMSBeanMgrTest.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/RMSBeanMgrTest.java (original)
+++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/RMSBeanMgrTest.java Sun Dec 10 09:14:40 2006
@@ -54,7 +54,7 @@
StorageManager storageManager = SandeshaUtil.getInMemoryStorageManager(configCtx);
transaction = storageManager.getTransaction();
- mgr = storageManager.getCreateSeqBeanMgr();
+ mgr = storageManager.getRMSBeanMgr();
}
public void tearDown() throws Exception {
Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/SenderBeanMgrTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/SenderBeanMgrTest.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/SenderBeanMgrTest.java (original)
+++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/SenderBeanMgrTest.java Sun Dec 10 09:14:40 2006
@@ -55,7 +55,7 @@
StorageManager storageManager = SandeshaUtil.getInMemoryStorageManager(configCtx);
transaction = storageManager.getTransaction();
- mgr = storageManager.getRetransmitterBeanMgr();
+ mgr = storageManager.getSenderBeanMgr();
}
public void tearDown() throws Exception {
Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/workers/ForceInboundDispatchTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/workers/ForceInboundDispatchTest.java?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/workers/ForceInboundDispatchTest.java (original)
+++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/workers/ForceInboundDispatchTest.java Sun Dec 10 09:14:40 2006
@@ -77,7 +77,7 @@
StorageManager serverStore = SandeshaUtil.getInMemoryStorageManager(serverConfigCtx);
t = serverStore.getTransaction();
RMDBean rMDBean =
- serverStore.getNextMsgBeanMgr().retrieve(inboundSequenceID);
+ serverStore.getRMDBeanMgr().retrieve(inboundSequenceID);
assertNotNull(rMDBean);
assertEquals(rMDBean.getNextMsgNoToProcess(), 4);
@@ -152,7 +152,7 @@
//check that the server is now expecting msg 4
StorageManager serverMgr = SandeshaUtil.getInMemoryStorageManager(serverConfigCtx);
t = serverMgr.getTransaction();
- RMDBean rMDBean = serverMgr.getNextMsgBeanMgr().retrieve(inboundSequenceID);
+ RMDBean rMDBean = serverMgr.getRMDBeanMgr().retrieve(inboundSequenceID);
assertNotNull(rMDBean);
assertEquals(rMDBean.getNextMsgNoToProcess(), 4);
t.commit();
Modified: webservices/sandesha/trunk/java/xdocs/architectureGuide.html
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/xdocs/architectureGuide.html?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/xdocs/architectureGuide.html (original)
+++ webservices/sandesha/trunk/java/xdocs/architectureGuide.html Sun Dec 10 09:14:40 2006
@@ -204,23 +204,23 @@
<p>Storage framework defines several beans that extend the RMBean abstract
class. They are given below:</p>
<ol>
- <li>CreateSequenceBean (fields - InternalSequenceID, CreateSequenceMsgID,
- SequenceID)</li>
+ <li>RMSBean (fields - internalSequenceID, createSequenceMsgID,
+ sequenceID, createSequenceMsgStoreKey, referenceMsgStoreKey, securityTokenData)</li>
<li>SenderBean (fields - messageContextRefKey, internalSequenceID,
messageNumber, messageID, messageType, send, resent,
sentCount,timeToSend)</li>
- <li>NextMsgBean (fields - sequenceID, nextMsgToProcess)</li>
+ <li>RMDBean (fields - sequenceID, nextMsgToProcess, pollingMode, referenceMessageKey)</li>
<li>InvokerBean (fields - invoked,messageContextRefKey, sequenceID,
msgNo)</li>
- <li>SequencePropertyBean (fields - sequenceID, name, value)</li>
+ <li>SequencePropertyBean (fields - sequencePropertyKey, name, value)</li>
</ol>
<p>There are five bean manager interfaces corresponding to each of above
beans.They are as follows:</p>
<ol>
- <li>CreateSequenceBeanMgr</li>
+ <li>RMSBeanMgr</li>
<li>InvokerBeanMgr</li>
- <li>NextMsgBeanMgr</li>
+ <li>RMDBeanMgr</li>
<li>SenderBeanMgr</li>
<li>SequencePropertyBeanMgr</li>
</ol>
Modified: webservices/sandesha/trunk/java/xdocs/download.html
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/xdocs/download.html?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
--- webservices/sandesha/trunk/java/xdocs/download.html (original)
+++ webservices/sandesha/trunk/java/xdocs/download.html Sun Dec 10 09:14:40 2006
@@ -1,83 +1,98 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-<title>Sandesha2 - Releases</title>
-<head>
-<body class="composite">
-<div align="left">
-<p>Please select the Sandesha2 version you want to download. Latest release is 1.0. You can download both
-the binay distribution and the source distribution.</p>
-</div>
-
-<div align="center">
-<table class="bodyTable"><tbody>
- <tr class="a">
- <td width="45" align="center">Name</td>
- <td width="80" align="center">Type</td>
- <td width="300" align="center">Distribution</td>
- <td width="100" align="center">Date</td>
- <td width="200" align="center">Description</td>
- <td width="200" align="center">Compatible Axis2 version</td>
- </tr>
- <tr class="c"><td align="center" valign="middle"><a name="10"></a>1.0</td><td align="center">Release</td><td>
- Source Distribution
- <a href="[preferred]/ws/sandesha2/1_0/sandesha2-1.0-src.zip" title="[preferred]/ws/sandesha2/1_0/sandesha2-1.0-src.zip">zip</a>
- <a href="http://www.apache.org/dist/ws/sandesha2/1_0/sandesha2-1.0-src.zip.md5" class="externalLink" title="http://www.apache.org/dist/ws/sandesha2/1_0/sandesha2-1.0-src.zip.md5">MD5</a>
- <a href="http://www.apache.org/dist/ws/sandesha2/1_0/sandesha2-1.0-src.zip.asc" class="externalLink" title="http://www.apache.org/dist/ws/sandesha2/1_0/sandesha2-1.0-src.zip.asc">PGP</a>
- <br></br>
- Binary Distribution
- <a href="[preferred]/ws/sandesha2/1_0/sandesha2-1.0-bin.zip" title="[preferred]/ws/sandesha2/1_0/sandesha2-1.0-bin.zip">zip</a>
- <a href="http://www.apache.org/dist/ws/sandesha2/1_0/sandesha2-1.0-bin.zip.md5" class="externalLink" title="http://www.apache.org/dist/ws/sandesha2/1_0/sandesha2-1.0-bin.zip.md5">MD5</a>
- <a href="http://www.apache.org/dist/ws/sandesha2/1_0/sandesha2-1.0-bin.zip.asc" class="externalLink" title="http://www.apache.org/dist/ws/sandesha2/1_0/sandesha2-1.0-bin.zip.asc">PGP</a>
- <br></br>
- </td><td>05 - 08 - 2006</td>
- <td>1.0 Release (Mirrored)</td>
- <td>1.0</td>
- </tr>
- <tr class="b"><td align="center" valign="middle"><a name="09"></a>0.9</td><td align="center">Release</td><td>
- Source Distribution
- <a href="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-src.zip" title="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-src.zip">zip</a>
- <a href="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-src.zip.md5" class="externalLink" title="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-src.zip.md5">MD5</a>
- <a href="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-src.zip.asc" class="externalLink" title="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-src.zip.asc">PGP</a>
- <br></br>
- Binary Distribution
- <a href="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-bin.zip" title="[preferred]/ws/sandesha2/0_9/Sandesha2-0.9-bin.zip">zip</a>
- <a href="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-bin.zip.md5" class="externalLink" title="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-bin.zip.md5">MD5</a>
- <a href="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-bin.zip.asc" class="externalLink" title="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-bin.zip.asc">PGP</a>
- <br></br>
- </td><td>12 - 05 - 2005</td>
- <td>0.9 Release (Mirrored)</td>
- <td>0.93</td>
- </tr>
- </tbody></table>
-</div>
-<div align="left">
-<p>[if-any logo] <a href="[link]"><img align="right" src="[logo]" border="0" alt=""></img></a>[end] The currently selected mirror is <b>[preferred]</b>. If
-you encounter a problem with this mirror, please select another mirror. If
-all mirrors are failing, there are <i>backup</i> mirrors (at the end of the
-mirrors list) that should be available.</p>
-
-<form action="[location]" method="get" id="SelectMirror">
- Other mirrors:
- <select name="Preferred">[if-any http][for http]
- <option value="[http]" selected="selected">[http]</option>[end][end][if-any ftp][for ftp]
- <option value="[ftp]">[ftp]</option>[end][end][if-any backup][for backup]
- <option value="[backup]">[backup] (backup)</option>[end][end]
- </select>
-
- <input type="submit" value="Change"></input></form>
-
-<p>You may also consult the <a href="http://www.apache.org/mirrors/" class="externalLink" title="External Link">complete
-list of mirrors</a>.</p>
-
-<p><strong>Note:</strong> when downloading from a mirror please check the <a href="http://www.apache.org/dev/release-signing#md5" class="externalLink" title="External Link">md5sum</a> and verify
-the <a href="http://www.apache.org/dev/release-signing#openpgp" class="externalLink" title="External Link">OpenPGP</a>
-compatible signature from the main Apache site. These can be downloaded by
-following the links above. This <a href="http://www.apache.org/dist/ws/sandesha2/KEYS" class="externalLink" title="External Link">KEYS</a> file contains the
-public keys used for signing release. It is recommended that (when possible)
-a <a href="http://www.apache.org/dev/release-signing#web-of-trust" class="externalLink" title="External Link">web of
-trust</a> is used to confirm the identity of these keys.</p>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<title>Sandesha2 - Releases</title>
+<head>
+<body class="composite">
+<div align="left">
+<p>Please select the Sandesha2 version you want to download. Latest release is 1.0. You can download both
+the binay distribution and the source distribution.</p>
+</div>
+
+<div align="center">
+<table class="bodyTable"><tbody>
+ <tr class="a">
+ <td width="45" align="center">Name</td>
+ <td width="80" align="center">Type</td>
+ <td width="300" align="center">Distribution</td>
+ <td width="100" align="center">Date</td>
+ <td width="200" align="center">Description</td>
+ <td width="200" align="center">Compatible Axis2 version</td>
+ </tr>
+ <tr class="c"><td align="center" valign="middle"><a name="11"></a>1.1</td><td align="center">Release</td><td>
+ Source Distribution
+ <a href="[preferred]/ws/sandesha2/1_1/sandesha2-1.1-src.zip" title="[preferred]/ws/sandesha2/1_1/sandesha2-1.1-src.zip">zip</a>
+ <a href="http://www.apache.org/dist/ws/sandesha2/1_1/sandesha2-1.1-src.zip.md5" class="externalLink" title="http://www.apache.org/dist/ws/sandesha2/1_1/sandesha2-1.1-src.zip.md5">MD5</a>
+ <a href="http://www.apache.org/dist/ws/sandesha2/1_1/sandesha2-1.1-src.zip.asc" class="externalLink" title="http://www.apache.org/dist/ws/sandesha2/1_1/sandesha2-1.1-src.zip.asc">PGP</a>
+ <br></br>
+ Binary Distribution
+ <a href="[preferred]/ws/sandesha2/1_1/sandesha2-1.1-bin.zip" title="[preferred]/ws/sandesha2/1_1/sandesha2-1.1-bin.zip">zip</a>
+ <a href="http://www.apache.org/dist/ws/sandesha2/1_1/sandesha2-1.1-bin.zip.md5" class="externalLink" title="http://www.apache.org/dist/ws/sandesha2/1_1/sandesha2-1.1-bin.zip.md5">MD5</a>
+ <a href="http://www.apache.org/dist/ws/sandesha2/1_1/sandesha2-1.1-bin.zip.asc" class="externalLink" title="http://www.apache.org/dist/ws/sandesha2/1_1/sandesha2-1.1-bin.zip.asc">PGP</a>
+ <br></br>
+ </td><td>12 - 10 - 2006</td>
+ <td>1.1 Release (Mirrored)</td>
+ <td>1.1</td>
+ </tr>
+ <tr class="c"><td align="center" valign="middle"><a name="10"></a>1.0</td><td align="center">Release</td><td>
+ Source Distribution
+ <a href="[preferred]/ws/sandesha2/1_0/sandesha2-1.0-src.zip" title="[preferred]/ws/sandesha2/1_0/sandesha2-1.0-src.zip">zip</a>
+ <a href="http://www.apache.org/dist/ws/sandesha2/1_0/sandesha2-1.0-src.zip.md5" class="externalLink" title="http://www.apache.org/dist/ws/sandesha2/1_0/sandesha2-1.0-src.zip.md5">MD5</a>
+ <a href="http://www.apache.org/dist/ws/sandesha2/1_0/sandesha2-1.0-src.zip.asc" class="externalLink" title="http://www.apache.org/dist/ws/sandesha2/1_0/sandesha2-1.0-src.zip.asc">PGP</a>
+ <br></br>
+ Binary Distribution
+ <a href="[preferred]/ws/sandesha2/1_0/sandesha2-1.0-bin.zip" title="[preferred]/ws/sandesha2/1_0/sandesha2-1.0-bin.zip">zip</a>
+ <a href="http://www.apache.org/dist/ws/sandesha2/1_0/sandesha2-1.0-bin.zip.md5" class="externalLink" title="http://www.apache.org/dist/ws/sandesha2/1_0/sandesha2-1.0-bin.zip.md5">MD5</a>
+ <a href="http://www.apache.org/dist/ws/sandesha2/1_0/sandesha2-1.0-bin.zip.asc" class="externalLink" title="http://www.apache.org/dist/ws/sandesha2/1_0/sandesha2-1.0-bin.zip.asc">PGP</a>
+ <br></br>
+ </td><td>05 - 08 - 2006</td>
+ <td>1.0 Release (Mirrored)</td>
+ <td>1.0</td>
+ </tr>
+ <tr class="b"><td align="center" valign="middle"><a name="09"></a>0.9</td><td align="center">Release</td><td>
+ Source Distribution
+ <a href="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-src.zip" title="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-src.zip">zip</a>
+ <a href="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-src.zip.md5" class="externalLink" title="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-src.zip.md5">MD5</a>
+ <a href="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-src.zip.asc" class="externalLink" title="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-src.zip.asc">PGP</a>
+ <br></br>
+ Binary Distribution
+ <a href="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-bin.zip" title="[preferred]/ws/sandesha2/0_9/Sandesha2-0.9-bin.zip">zip</a>
+ <a href="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-bin.zip.md5" class="externalLink" title="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-bin.zip.md5">MD5</a>
+ <a href="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-bin.zip.asc" class="externalLink" title="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-bin.zip.asc">PGP</a>
+ <br></br>
+ </td><td>12 - 05 - 2005</td>
+ <td>0.9 Release</td>
+ <td>0.93</td>
+ </tr>
+ </tbody></table>
+</div>
+<div align="left">
+<p>[if-any logo] <a href="[link]"><img align="right" src="[logo]" border="0" alt=""></img></a>[end] The currently selected mirror is <b>[preferred]</b>. If
+you encounter a problem with this mirror, please select another mirror. If
+all mirrors are failing, there are <i>backup</i> mirrors (at the end of the
+mirrors list) that should be available.</p>
+
+<form action="[location]" method="get" id="SelectMirror">
+ Other mirrors:
+ <select name="Preferred">[if-any http][for http]
+ <option value="[http]" selected="selected">[http]</option>[end][end][if-any ftp][for ftp]
+ <option value="[ftp]">[ftp]</option>[end][end][if-any backup][for backup]
+ <option value="[backup]">[backup] (backup)</option>[end][end]
+ </select>
+
+ <input type="submit" value="Change"></input></form>
+
+<p>You may also consult the <a href="http://www.apache.org/mirrors/" class="externalLink" title="External Link">complete
+list of mirrors</a>.</p>
+
+<p><strong>Note:</strong> when downloading from a mirror please check the <a href="http://www.apache.org/dev/release-signing#md5" class="externalLink" title="External Link">md5sum</a> and verify
+the <a href="http://www.apache.org/dev/release-signing#openpgp" class="externalLink" title="External Link">OpenPGP</a>
+compatible signature from the main Apache site. These can be downloaded by
+following the links above. This <a href="http://www.apache.org/dist/ws/sandesha2/KEYS" class="externalLink" title="External Link">KEYS</a> file contains the
+public keys used for signing release. It is recommended that (when possible)
+a <a href="http://www.apache.org/dev/release-signing#web-of-trust" class="externalLink" title="External Link">web of
+trust</a> is used to confirm the identity of these keys.</p>
</div></div></div></div><div class="clear"><hr></hr></div><div id="footer"><div class="xright">© 2005, Apache Web Services</div><div class="clear"><hr></hr></div></div></body></html>
Modified: webservices/sandesha/trunk/java/xdocs/images/storage.jpg
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/xdocs/images/storage.jpg?view=diff&rev=485219&r1=485218&r2=485219
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org