Author: gatfora
Date: Tue Sep 11 02:53:04 2007
New Revision: 574534
URL: http://svn.apache.org/viewvc?rev=574534&view=rev
Log:
Enable SEQUENCE_KEY property to be set on the ConfigurationContext. Remove
several unused imports
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/WSRMMessageSender.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaReportsTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SquenceOfferTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/RMScenariosTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/InvokerBeanMgrTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/RMDBeanMgrTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/RMSBeanMgrTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/SenderBeanMgrTest.java
webservices/sandesha/trunk/java/project.properties
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?rev=574534&r1=574533&r2=574534&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
Tue Sep 11 02:53:04 2007
@@ -148,6 +148,9 @@
String to = toEPR.getAddress();
String sequenceKey = (String)
msgContext.getProperty(SandeshaClientConstants.SEQUENCE_KEY);
+ if (sequenceKey == null)
+ sequenceKey =
(String)configContext.getAxisConfiguration().getParameterValue(SandeshaClientConstants.SEQUENCE_KEY);
+
internalSequenceId =
SandeshaUtil.getInternalSequenceID(to, sequenceKey);
String lastAppMessage = (String)
msgContext.getProperty(SandeshaClientConstants.LAST_MESSAGE);
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java?rev=574534&r1=574533&r2=574534&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
Tue Sep 11 02:53:04 2007
@@ -891,8 +891,7 @@
MessageContext msgContext = rmMsgContext.getMessageContext();
ConfigurationContext configurationContext =
msgContext.getConfigurationContext();
- SandeshaPolicyBean policy =
getPropertyBean(msgContext.getAxisOperation());
- if(manager.requiresMessageSerialization()) {
+ if(manager.requiresMessageSerialization()) {
msgContext.setProperty(Sandesha2Constants.QUALIFIED_FOR_SENDING,
Sandesha2Constants.VALUE_TRUE);
StorageManager store =
getSandeshaStorageManager(configurationContext,
configurationContext.getAxisConfiguration());
@@ -929,7 +928,6 @@
}
public static void modifyExecutionChainForStoring (MessageContext
message, StorageManager manager)
- throws SandeshaException
{
Object property =
message.getProperty(Sandesha2Constants.RETRANSMITTABLE_PHASES);
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/WSRMMessageSender.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/WSRMMessageSender.java?rev=574534&r1=574533&r2=574534&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/WSRMMessageSender.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/WSRMMessageSender.java
Tue Sep 11 02:53:04 2007
@@ -72,7 +72,10 @@
toAddress = rmMsgCtx.getTo().getAddress();
sequenceKey = (String)
options.getProperty(SandeshaClientConstants.SEQUENCE_KEY);
-
+
+ if (sequenceKey == null)
+ sequenceKey =
(String)configurationContext.getAxisConfiguration().getParameterValue(SandeshaClientConstants.SEQUENCE_KEY);
+
if(internalSequenceID==null)
{
internalSequenceID =
SandeshaUtil.getInternalSequenceID(toAddress, sequenceKey);
@@ -167,7 +170,7 @@
SenderBeanMgr retramsmitterMgr =
storageManager.getSenderBeanMgr();
- SandeshaUtil.executeAndStore(rmMsgCtx, key, storageManager);
+ SandeshaUtil.executeAndStore(rmMsgCtx, key, storageManager);
retramsmitterMgr.insert(senderBean);
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java?rev=574534&r1=574533&r2=574534&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
Tue Sep 11 02:53:04 2007
@@ -31,7 +31,6 @@
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
import org.apache.sandesha2.i18n.SandeshaMessageKeys;
-import org.apache.sandesha2.policy.SandeshaPolicyBean;
import org.apache.sandesha2.storage.SandeshaStorageException;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.Transaction;
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaReportsTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaReportsTest.java?rev=574534&r1=574533&r2=574534&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaReportsTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaReportsTest.java
Tue Sep 11 02:53:04 2007
@@ -17,7 +17,6 @@
package org.apache.sandesha2;
import java.io.File;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SquenceOfferTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SquenceOfferTest.java?rev=574534&r1=574533&r2=574534&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SquenceOfferTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SquenceOfferTest.java
Tue Sep 11 02:53:04 2007
@@ -17,7 +17,6 @@
package org.apache.sandesha2;
import java.io.File;
-import java.util.ArrayList;
import java.util.List;
import org.apache.axis2.Constants;
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/RMScenariosTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/RMScenariosTest.java?rev=574534&r1=574533&r2=574534&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/RMScenariosTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/RMScenariosTest.java
Tue Sep 11 02:53:04 2007
@@ -17,7 +17,6 @@
package org.apache.sandesha2.scenarios;
import java.io.File;
-import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/InvokerBeanMgrTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/InvokerBeanMgrTest.java?rev=574534&r1=574533&r2=574534&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/InvokerBeanMgrTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/InvokerBeanMgrTest.java
Tue Sep 11 02:53:04 2007
@@ -19,7 +19,6 @@
import org.apache.sandesha2.policy.SandeshaPolicyBean;
import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
import org.apache.sandesha2.storage.beans.InvokerBean;
-import org.apache.sandesha2.util.PropertyManager;
import org.apache.sandesha2.util.SandeshaUtil;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaTestCase;
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/RMDBeanMgrTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/RMDBeanMgrTest.java?rev=574534&r1=574533&r2=574534&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/RMDBeanMgrTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/RMDBeanMgrTest.java
Tue Sep 11 02:53:04 2007
@@ -19,7 +19,6 @@
import org.apache.sandesha2.policy.SandeshaPolicyBean;
import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beans.RMDBean;
-import org.apache.sandesha2.util.PropertyManager;
import org.apache.sandesha2.util.SandeshaUtil;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaTestCase;
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/RMSBeanMgrTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/RMSBeanMgrTest.java?rev=574534&r1=574533&r2=574534&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/RMSBeanMgrTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/RMSBeanMgrTest.java
Tue Sep 11 02:53:04 2007
@@ -19,7 +19,6 @@
import org.apache.sandesha2.policy.SandeshaPolicyBean;
import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
import org.apache.sandesha2.storage.beans.RMSBean;
-import org.apache.sandesha2.util.PropertyManager;
import org.apache.sandesha2.util.SandeshaUtil;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaTestCase;
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/SenderBeanMgrTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/SenderBeanMgrTest.java?rev=574534&r1=574533&r2=574534&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/SenderBeanMgrTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/SenderBeanMgrTest.java
Tue Sep 11 02:53:04 2007
@@ -22,7 +22,6 @@
import org.apache.sandesha2.policy.SandeshaPolicyBean;
import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beans.SenderBean;
-import org.apache.sandesha2.util.PropertyManager;
import org.apache.sandesha2.util.SandeshaUtil;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisConfiguration;
Modified: webservices/sandesha/trunk/java/project.properties
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/project.properties?rev=574534&r1=574533&r2=574534&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/project.properties (original)
+++ webservices/sandesha/trunk/java/project.properties Tue Sep 11 02:53:04 2007
@@ -27,7 +27,7 @@
sandesha2.module.version=SNAPSHOT
axis2.version=SNAPSHOT
-axiom.version=1.2.4
+axiom.version=SNAPSHOT
addressing.version=${axis2.version}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
