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 da...@apache.org on 2008/12/08 18:45:56 UTC
svn commit: r724423 - in /webservices/sandesha/trunk/java/modules:
core/src/main/java/org/apache/sandesha2/
core/src/main/java/org/apache/sandesha2/msgprocessors/
core/src/main/java/org/apache/sandesha2/util/
core/src/main/java/org/apache/sandesha2/wor...
Author: davidillsley
Date: Mon Dec 8 09:45:55 2008
New Revision: 724423
URL: http://svn.apache.org/viewvc?rev=724423&view=rev
Log:
More IDE warning cleanup
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/PropertyManager.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/workers/SenderWorker.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/RMInteropServiceSkeletonImpl.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_1.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_2.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_3.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_4.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_1.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_2.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_3.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_3_1.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_1.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_2.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/securerm/SecRMServiceImpl.java
webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentInvokerBeanMgr.java
webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentRMDBeanMgr.java
webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentRMSBeanMgr.java
webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentSenderBeanMgr.java
webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentStorageManager.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaClientTest.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/SandeshaUtilTest.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/faulttests/InvalidAcknowledgementTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/SequenceTerminatedFaultTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/SequenceTimedOutTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/mtom/MTOMRMTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/OptionalReliabilityTest.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/security/UnitTestSecurityManager.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/modules/tests/src/test/java/org/apache/sandesha2/wsrm/SequenceAcknowledgementTest.java
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java Mon Dec 8 09:45:55 2008
@@ -155,8 +155,8 @@
//checking weather the module is engaged at the System level
AxisConfiguration axisConfiguration = messageContext.getConfigurationContext().getAxisConfiguration();
if (axisConfiguration!=null) {
- Collection modules = axisConfiguration.getEngagedModules();
- for (Iterator iter = modules.iterator();iter.hasNext();) {
+ Collection<AxisModule> modules = axisConfiguration.getEngagedModules();
+ for (Iterator<AxisModule> iter = modules.iterator();iter.hasNext();) {
AxisModule module = (AxisModule) iter.next();
String moduleName = module.getName();
if (moduleName!=null && moduleName.startsWith (Sandesha2Constants.MODULE_NAME)) {
@@ -168,8 +168,8 @@
//checking weather the module is engaged at the Service level
AxisService service = messageContext.getAxisService();
if (service!=null) {
- Collection modules = service.getEngagedModules();
- for (Iterator iter = modules.iterator();iter.hasNext();) {
+ Collection<AxisModule> modules = service.getEngagedModules();
+ for (Iterator<AxisModule> iter = modules.iterator();iter.hasNext();) {
AxisModule module = (AxisModule) iter.next();
String name = module.getName();
if (name!=null && name.startsWith (Sandesha2Constants.MODULE_NAME)) {
@@ -181,8 +181,8 @@
//checking weather the module is engaged at the Operation level
AxisOperation operation = messageContext.getAxisOperation();
if (operation!=null) {
- Collection modules = operation.getEngagedModules();
- for (Iterator iter = modules.iterator();iter.hasNext();) {
+ Collection<AxisModule> modules = operation.getEngagedModules();
+ for (Iterator<AxisModule> iter = modules.iterator();iter.hasNext();) {
AxisModule module = (AxisModule) iter.next();
String name = module.getName();
if (name!=null && name.startsWith (Sandesha2Constants.MODULE_NAME)) {
@@ -261,7 +261,7 @@
// well, and and we only want to consider the user's operations.
if(axisDescription instanceof AxisService) {
AxisService service = (AxisService) axisDescription;
- Iterator ops = service.getOperations();
+ Iterator<AxisOperation> ops = service.getOperations();
while(ops.hasNext()) {
AxisOperation op = (AxisOperation) ops.next();
if (log.isDebugEnabled()) log.debug("Examining operation " + op.getName() + ", mep " + op.getMessageExchangePattern());
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java Mon Dec 8 09:45:55 2008
@@ -19,6 +19,7 @@
package org.apache.sandesha2.msgprocessors;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
@@ -101,7 +102,7 @@
SecurityToken token = secManager.getSecurityToken(rmMsgCtx.getMessageContext());
//we want to find valid sender beans
- List possibleBeans = null;
+ List<RMSequenceBean> possibleBeans = new ArrayList<RMSequenceBean>();
int possibleBeanIndex = -10;
SenderBean findSenderBean = new SenderBean();
boolean secured = false;
@@ -114,13 +115,14 @@
RMSBean finderRMS = new RMSBean();
finderRMS.setSecurityTokenData(data);
finderRMS.setToEPR(address);
- possibleBeans = storageManager.getRMSBeanMgr().find(finderRMS);
+ List<RMSBean> tempList2 = storageManager.getRMSBeanMgr().find(finderRMS);
+ possibleBeans.addAll(tempList2);
//try looking for RMD beans too
RMDBean finderRMD = new RMDBean();
finderRMD.setSecurityTokenData(data);
finderRMD.setToAddress(address);
- List tempList = storageManager.getRMDBeanMgr().find(finderRMD);
+ List<RMDBean> tempList = storageManager.getRMDBeanMgr().find(finderRMD);
//combine these two into one list
possibleBeans.addAll(tempList);
@@ -173,10 +175,10 @@
//finding the beans that go with the criteria of the passed SenderBean
//The reSend flag is ignored for this selection, so there is no need to
//set it.
- Collection collection = senderBeanMgr.find(findSenderBean);
+ Collection<SenderBean> collection = senderBeanMgr.find(findSenderBean);
//removing beans that does not pass the resend test
- for (Iterator it=collection.iterator();it.hasNext();) {
+ for (Iterator<SenderBean> it=collection.iterator();it.hasNext();) {
SenderBean bean = (SenderBean) it.next();
if (!bean.isReSend() && bean.getSentCount()>0)
it.remove();
@@ -196,7 +198,7 @@
pending = true; //there are more than one message to be delivered using the makeConnection.
//So the MessagePending header should have value true;
- Iterator it = collection.iterator();
+ Iterator<SenderBean> it = collection.iterator();
senderBean = null;
for (int item=0;item<size;item++) {
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/PropertyManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/PropertyManager.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/PropertyManager.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/PropertyManager.java Mon Dec 8 09:45:55 2008
@@ -156,17 +156,17 @@
if (policySubject == null) {
return null;
}
- Collection policyComponents = policySubject.getAttachedPolicyComponents();
+ Collection<Policy> policyComponents = policySubject.getAttachedPolicyComponents();
if (policyComponents == null) {
return null;
}
- Iterator policies = policyComponents.iterator();
+ Iterator<Policy> policies = policyComponents.iterator();
while (!found && policies.hasNext()) {
Policy policy = (Policy) policies.next();
- Iterator iterator = policy.getAlternatives();
+ Iterator<List<Assertion>> iterator = policy.getAlternatives();
while (!found && iterator.hasNext()) {
- List assertionList = (List) iterator.next();
- Iterator assertions = assertionList.iterator();
+ List<Assertion> assertionList = (List<Assertion>) iterator.next();
+ Iterator<Assertion> assertions = assertionList.iterator();
while (!found && assertions.hasNext()) {
assertion = (Assertion) assertions.next();
if (assertion instanceof SandeshaPolicyBean) {
@@ -197,17 +197,17 @@
return null; // no pilicy is available in the module description
}
- Iterator iterator = policy.getAlternatives();
+ Iterator<List<Assertion>> iterator = policy.getAlternatives();
if (! iterator.hasNext()) {
throw new SandeshaException("No Policy Alternative found");
}
- List assertionList = (List) iterator.next();
+ List<Assertion> assertionList = (List<Assertion>) iterator.next();
Assertion assertion = null;
boolean found = false;
- for (Iterator assertions = assertionList.iterator(); assertions.hasNext();) {
+ for (Iterator<Assertion> assertions = assertionList.iterator(); assertions.hasNext();) {
assertion = (Assertion) assertions.next();
if (assertion instanceof SandeshaPolicyBean) {
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=724423&r1=724422&r2=724423&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 Mon Dec 8 09:45:55 2008
@@ -321,15 +321,7 @@
Parameter classLoaderParam = config.getParameter(Sandesha2Constants.MODULE_CLASS_LOADER);
if(classLoaderParam != null) classLoader = (ClassLoader) classLoaderParam.getValue();
- if (classLoader==null)
- throw new SandeshaException (SandeshaMessageHelper.getMessage(
- SandeshaMessageKeys.classLoaderNotFound));
-
- Class c = classLoader.loadClass(className);
- Class configContextClass = context.getClass();
-
- Constructor constructor = c.getConstructor(new Class[] { configContextClass });
- Object obj = constructor.newInstance(new Object[] {context});
+ Object obj = newInstance(classLoader, className, context);
if (obj == null || !(obj instanceof StorageManager))
throw new SandeshaException(SandeshaMessageHelper.getMessage(
@@ -348,6 +340,20 @@
}
}
+ private static Object newInstance(ClassLoader classLoader, String className, Object constructorParam) throws Exception{
+ if (classLoader==null)
+ throw new SandeshaException (SandeshaMessageHelper.getMessage(
+ SandeshaMessageKeys.classLoaderNotFound));
+
+ Class<?> c = classLoader.loadClass(className);
+ Class<?> configContextClass = constructorParam.getClass();
+
+ Constructor<?> constructor = c.getConstructor(new Class[] { configContextClass });
+ Object obj = constructor.newInstance(new Object[] {constructorParam});
+
+ return obj;
+ }
+
public static int getSOAPVersion(SOAPEnvelope envelope) throws SandeshaException {
String namespaceName = envelope.getNamespace().getNamespaceURI();
if (namespaceName.equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI))
@@ -661,7 +667,7 @@
}
public static boolean hasReferenceParameters(EndpointReference epr){
- Map refParams = epr.getAllReferenceParameters();
+ Map<QName, OMElement> refParams = epr.getAllReferenceParameters();
if(refParams!=null){
if(!refParams.isEmpty()){
return true;
@@ -808,15 +814,10 @@
AxisConfiguration config = context.getAxisConfiguration();
Parameter classLoaderParam = config.getParameter(Sandesha2Constants.MODULE_CLASS_LOADER);
if(classLoaderParam != null) classLoader = (ClassLoader) classLoaderParam.getValue();
- if (classLoader==null)
- throw new SandeshaException (SandeshaMessageHelper.getMessage(SandeshaMessageKeys.classLoaderNotFound));
-
- Class c = classLoader.loadClass(className);
- Class configContextClass = context.getClass();
-
- Constructor constructor = c.getConstructor(new Class[] { configContextClass });
- Object obj = constructor.newInstance(new Object[] {context});
- if (!(obj instanceof EPRDecorator)) {
+
+ Object obj = newInstance(classLoader, className, context);
+
+ if (!(obj instanceof EPRDecorator)) {
String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.eprDecoratorMustImplement, className);
throw new SandeshaException(message);
}
@@ -834,16 +835,8 @@
AxisConfiguration config = context.getAxisConfiguration();
Parameter classLoaderParam = config.getParameter(Sandesha2Constants.MODULE_CLASS_LOADER);
if(classLoaderParam != null) classLoader = (ClassLoader) classLoaderParam.getValue();
-
- if (classLoader==null)
- throw new SandeshaException (SandeshaMessageHelper.getMessage(SandeshaMessageKeys.classLoaderNotFound));
-
- Class c = classLoader.loadClass(className);
- Class configContextClass = context.getClass();
-
- Constructor constructor = c.getConstructor(new Class[] { configContextClass });
- Object obj = constructor.newInstance(new Object[] {context});
+ Object obj = newInstance(classLoader, className, context);
if (!(obj instanceof SecurityManager)) {
String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.securityManagerMustImplement, className);
@@ -885,14 +878,7 @@
Parameter classLoaderParam = config.getParameter(Sandesha2Constants.MODULE_CLASS_LOADER);
if(classLoaderParam != null) classLoader = (ClassLoader) classLoaderParam.getValue();
- if (classLoader==null)
- throw new SandeshaException (SandeshaMessageHelper.getMessage(SandeshaMessageKeys.classLoaderNotFound));
-
- Class c = classLoader.loadClass(className);
- Class configContextClass = context.getClass();
-
- Constructor constructor = c.getConstructor(new Class[] { configContextClass });
- Object obj = constructor.newInstance(new Object[] {context});
+ Object obj = newInstance(classLoader, className, context);
if (!(obj instanceof ContextManager)) {
String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.contextManagerMustImplement, className);
@@ -1102,12 +1088,12 @@
public static EndpointReference cloneEPR (EndpointReference epr) {
EndpointReference newEPR = new EndpointReference (epr.getAddress());
- Map referenceParams = epr.getAllReferenceParameters();
+ Map<QName, OMElement> referenceParams = epr.getAllReferenceParameters();
if (referenceParams != null) {
- for (Iterator entries = referenceParams.entrySet().iterator(); entries
+ for (Iterator<Entry<QName, OMElement>> entries = referenceParams.entrySet().iterator(); entries
.hasNext();) {
- Entry entry = (Entry)entries.next();
+ Entry<QName, OMElement> entry = entries.next();
Object referenceParam = entry.getValue();
if (referenceParam instanceof OMElement) {
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=724423&r1=724422&r2=724423&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 Mon Dec 8 09:45:55 2008
@@ -36,6 +36,7 @@
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.OutOnlyAxisOperation;
import org.apache.axis2.engine.AxisEngine;
+import org.apache.axis2.engine.Handler;
import org.apache.axis2.engine.Handler.InvocationResponse;
import org.apache.axis2.transport.RequestResponseTransport;
import org.apache.axis2.transport.TransportUtils;
@@ -320,11 +321,11 @@
}
} else {
- ArrayList retransmittablePhases = (ArrayList) msgCtx.getProperty(Sandesha2Constants.RETRANSMITTABLE_PHASES);
+ ArrayList<Handler> retransmittablePhases = (ArrayList<Handler>) msgCtx.getProperty(Sandesha2Constants.RETRANSMITTABLE_PHASES);
if (retransmittablePhases!=null) {
msgCtx.setExecutionChain(retransmittablePhases);
} else {
- ArrayList emptyExecutionChain = new ArrayList ();
+ ArrayList<Handler> emptyExecutionChain = new ArrayList<Handler>();
msgCtx.setExecutionChain(emptyExecutionChain);
}
Modified: webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/RMInteropServiceSkeletonImpl.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/RMInteropServiceSkeletonImpl.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/RMInteropServiceSkeletonImpl.java (original)
+++ webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/RMInteropServiceSkeletonImpl.java Mon Dec 8 09:45:55 2008
@@ -23,7 +23,7 @@
public class RMInteropServiceSkeletonImpl extends RMInteropServiceSkeleton {
- HashMap sequenceTextMap = new HashMap();
+ HashMap<String, String> sequenceTextMap = new HashMap<String, String>();
public EchoStringResponse EchoString(org.tempuri.EchoString echoString) {
Modified: webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_1.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_1.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_1.java (original)
+++ webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_1.java Mon Dec 8 09:45:55 2008
@@ -17,32 +17,25 @@
package org.apache.sandesha2.interop.rm1_1_clients;
import java.io.File;
-import java.io.IOException;
import java.io.InputStream;
-import java.rmi.RemoteException;
import java.util.Properties;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.context.MessageContextConstants;
-import org.apache.axis2.engine.AxisError;
import org.apache.sandesha2.Sandesha2Constants;
-import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.client.SandeshaClient;
import org.apache.sandesha2.client.SandeshaClientConstants;
import org.apache.sandesha2.client.SequenceReport;
import org.apache.sandesha2.interop.RMInteropServiceStub;
-import org.apache.sandesha2.util.SandeshaUtil;
import org.tempuri.Ping;
public class Scenario_1_1 {
@@ -203,7 +196,7 @@
}
private void setUpOptions (Options clientOptions) {
- clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportToEPR);
+ clientOptions.setProperty(Constants.Configuration.TRANSPORT_URL,transportToEPR);
// clientOptions.setProperty(Options.COPY_PROPERTIES, new Boolean (true));
clientOptions.setTo(new EndpointReference (toEPR));
Modified: webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_2.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_2.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_2.java (original)
+++ webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_2.java Mon Dec 8 09:45:55 2008
@@ -17,7 +17,6 @@
package org.apache.sandesha2.interop.rm1_1_clients;
import java.io.File;
-import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
@@ -26,16 +25,13 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAP11Constants;
-import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.context.MessageContextConstants;
import org.apache.sandesha2.Sandesha2Constants;
-import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.client.SandeshaClient;
import org.apache.sandesha2.client.SandeshaClientConstants;
import org.apache.sandesha2.client.SequenceReport;
@@ -209,7 +205,7 @@
}
private void setUpOptions (Options clientOptions) {
- clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportToEPR);
+ clientOptions.setProperty(Constants.Configuration.TRANSPORT_URL,transportToEPR);
clientOptions.setTo(new EndpointReference (toEPR));
String sequenceKey = "sequence1";
Modified: webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_3.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_3.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_3.java (original)
+++ webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_3.java Mon Dec 8 09:45:55 2008
@@ -17,7 +17,6 @@
package org.apache.sandesha2.interop.rm1_1_clients;
import java.io.File;
-import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
@@ -26,13 +25,12 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.context.MessageContextConstants;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.client.SandeshaClient;
import org.apache.sandesha2.client.SandeshaClientConstants;
@@ -215,7 +213,7 @@
}
private void setUpOptions (Options clientOptions) {
- clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportToEPR);
+ clientOptions.setProperty(Constants.Configuration.TRANSPORT_URL,transportToEPR);
// clientOptions.setProperty(Options.COPY_PROPERTIES, new Boolean (true));
clientOptions.setTo(new EndpointReference (toEPR));
Modified: webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_4.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_4.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_4.java (original)
+++ webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_4.java Mon Dec 8 09:45:55 2008
@@ -17,7 +17,6 @@
package org.apache.sandesha2.interop.rm1_1_clients;
import java.io.File;
-import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
@@ -26,14 +25,12 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.context.MessageContextConstants;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.client.SandeshaClient;
import org.apache.sandesha2.client.SandeshaClientConstants;
@@ -206,7 +203,7 @@
}
private void setUpOptions (Options clientOptions, String acksTo) {
- clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportToEPR);
+ clientOptions.setProperty(Constants.Configuration.TRANSPORT_URL,transportToEPR);
// clientOptions.setProperty(Options.COPY_PROPERTIES, new Boolean (true));
clientOptions.setTo(new EndpointReference (toEPR));
Modified: webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_1.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_1.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_1.java (original)
+++ webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_1.java Mon Dec 8 09:45:55 2008
@@ -38,17 +38,12 @@
import org.apache.axis2.client.async.Callback;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.context.MessageContextConstants;
import org.apache.sandesha2.Sandesha2Constants;
-import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.client.SandeshaClient;
import org.apache.sandesha2.client.SandeshaClientConstants;
import org.apache.sandesha2.client.SequenceReport;
-import org.apache.sandesha2.interop.RMInteropServiceCallbackHandler;
import org.apache.sandesha2.interop.RMInteropServiceCallbackHandlerImpl;
import org.apache.sandesha2.interop.RMInteropServiceStub;
-import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
-import org.apache.sandesha2.storage.inmemory.InMemorySenderBeanMgr;
import org.apache.sandesha2.util.SandeshaUtil;
import org.tempuri.EchoString;
import org.tempuri.EchoStringRequestBodyType;
@@ -213,7 +208,7 @@
EndpointReference toEPR = new EndpointReference (toAddress);
clientOptions.setTo(toEPR);
clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey);
- clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportToEPR);
+ clientOptions.setProperty(Constants.Configuration.TRANSPORT_URL,transportToEPR);
clientOptions.setAction("urn:wsrm:EchoString");
clientOptions.setProperty(SandeshaClientConstants.AcksTo,acksTo);
Modified: webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_2.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_2.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_2.java (original)
+++ webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_2.java Mon Dec 8 09:45:55 2008
@@ -38,14 +38,12 @@
import org.apache.axis2.client.async.Callback;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.context.MessageContextConstants;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.client.SandeshaClient;
import org.apache.sandesha2.client.SandeshaClientConstants;
import org.apache.sandesha2.client.SequenceReport;
import org.apache.sandesha2.interop.RMInteropServiceCallbackHandlerImpl;
import org.apache.sandesha2.interop.RMInteropServiceStub;
-import org.apache.sandesha2.util.SandeshaUtil;
import org.tempuri.EchoString;
import org.tempuri.EchoStringRequestBodyType;
@@ -119,7 +117,7 @@
String sequenceKey = "sequence4";
clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey);
- clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportToAddress);
+ clientOptions.setProperty(Constants.Configuration.TRANSPORT_URL,transportToAddress);
// clientOptions.setProperty(MessageContextConstants.CHUNKED,Constants.VALUE_FALSE); //uncomment this to send messages without chunking.
@@ -228,7 +226,7 @@
EndpointReference toEPR = new EndpointReference (toAddress);
clientOptions.setTo(toEPR);
clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey);
- clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportToAddress);
+ clientOptions.setProperty(Constants.Configuration.TRANSPORT_URL,transportToAddress);
clientOptions.setAction("urn:wsrm:EchoString");
clientOptions.setProperty(SandeshaClientConstants.AcksTo,acksTo);
Modified: webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_3.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_3.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_3.java (original)
+++ webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_3.java Mon Dec 8 09:45:55 2008
@@ -37,7 +37,6 @@
import org.apache.axis2.client.async.Callback;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.context.MessageContextConstants;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.client.SandeshaClient;
import org.apache.sandesha2.client.SandeshaClientConstants;
@@ -126,7 +125,7 @@
String sequenceKey = "sequence4";
clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey);
- clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportToEPR);
+ clientOptions.setProperty(Constants.Configuration.TRANSPORT_URL,transportToEPR);
// clientOptions.setProperty(MessageContextConstants.CHUNKED,Constants.VALUE_FALSE); //uncomment this to send messages without chunking.
// clientOptions.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI); //uncomment this to send messages in SOAP 1.2
@@ -227,7 +226,7 @@
EndpointReference toEPR = new EndpointReference (toAddress);
clientOptions.setTo(toEPR);
clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey);
- clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportToEPR);
+ clientOptions.setProperty(Constants.Configuration.TRANSPORT_URL,transportToEPR);
clientOptions.setAction("urn:wsrm:EchoString");
clientOptions.setProperty(SandeshaClientConstants.AcksTo,acksTo);
Modified: webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_3_1.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_3_1.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_3_1.java (original)
+++ webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_3_1.java Mon Dec 8 09:45:55 2008
@@ -39,18 +39,11 @@
import org.apache.axis2.client.async.Callback;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.context.MessageContextConstants;
-import org.apache.axis2.description.OutInAxisOperation;
import org.apache.sandesha2.Sandesha2Constants;
-import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.client.SandeshaClient;
import org.apache.sandesha2.client.SandeshaClientConstants;
-import org.apache.sandesha2.client.SequenceReport;
-import org.apache.sandesha2.interop.RMInteropServiceCallbackHandler;
import org.apache.sandesha2.interop.RMInteropServiceCallbackHandlerImpl;
import org.apache.sandesha2.interop.RMInteropServiceStub;
-import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
-import org.apache.sandesha2.storage.inmemory.InMemorySenderBeanMgr;
import org.apache.sandesha2.util.SandeshaUtil;
import org.tempuri.EchoString;
import org.tempuri.EchoStringRequestBodyType;
@@ -220,7 +213,7 @@
EndpointReference toEPR = new EndpointReference (toAddress);
clientOptions.setTo(toEPR);
clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey);
- clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportToEPR);
+ clientOptions.setProperty(Constants.Configuration.TRANSPORT_URL,transportToEPR);
clientOptions.setAction("urn:wsrm:EchoString");
// clientOptions.setProperty(MessageContextConstants.CHUNKED,Constants.VALUE_FALSE); //uncomment this to send messages without chunking.
Modified: webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_1.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_1.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_1.java (original)
+++ webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_1.java Mon Dec 8 09:45:55 2008
@@ -16,6 +16,12 @@
package org.apache.sandesha2.interop.rm1_1_clients;
+import java.io.File;
+import java.io.InputStream;
+import java.util.Properties;
+
+import javax.xml.namespace.QName;
+
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -24,17 +30,12 @@
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.context.MessageContextConstants;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.OutInAxisOperation;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
-import org.apache.rahas.RahasConstants;
import org.apache.rampart.RampartMessageData;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
@@ -44,18 +45,12 @@
import org.apache.sandesha2.interop.RMInteropServiceStub;
import org.tempuri.Ping;
-import javax.xml.namespace.QName;
-
-import java.io.File;
-import java.io.InputStream;
-import java.util.Properties;
-
public class Scenario_4_1 {
private static final String applicationNamespaceName = "http://tempuri.org/";
- private static final String PingRequest = "PingRequest";
+// private static final String PingRequest = "PingRequest";
private static final String Text = "Text";
private static String toIP = "127.0.0.1";
@@ -107,7 +102,7 @@
ServiceClient serviceClient = new ServiceClient (configurationContext,null);
// engage Rampart
- serviceClient.engageModule(new QName("rampart"));
+ serviceClient.engageModule("rampart");
serviceClient.setOptions(clientOptions);
@@ -205,7 +200,7 @@
}
private void setUpOptions (Options clientOptions) throws Exception {
- clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportToEPR);
+ clientOptions.setProperty(Constants.Configuration.TRANSPORT_URL,transportToEPR);
// clientOptions.setProperty(Options.COPY_PROPERTIES, new Boolean (true));
clientOptions.setTo(new EndpointReference (toEPR));
Modified: webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_2.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_2.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_2.java (original)
+++ webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_2.java Mon Dec 8 09:45:55 2008
@@ -36,18 +36,14 @@
import org.apache.axis2.client.async.Callback;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.context.MessageContextConstants;
-import org.apache.axis2.description.OutInAxisOperation;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.rampart.RampartMessageData;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.client.SandeshaClient;
import org.apache.sandesha2.client.SandeshaClientConstants;
-import org.apache.sandesha2.client.SequenceReport;
import org.apache.sandesha2.interop.RMInteropServiceCallbackHandlerImpl;
import org.apache.sandesha2.interop.RMInteropServiceStub;
-import org.apache.sandesha2.interop.rm1_1_clients.Scenario_2_1.TestCallback;
import org.apache.sandesha2.util.SandeshaUtil;
import org.tempuri.EchoString;
import org.tempuri.EchoStringRequestBodyType;
@@ -108,7 +104,7 @@
Options clientOptions = new Options ();
- serviceClient.engageModule(new QName("rampart"));
+ serviceClient.engageModule("rampart");
String sequenceKey = "sequence4";
String acksTo = serviceClient.getMyEPR(Constants.TRANSPORT_HTTP).getAddress();
@@ -221,7 +217,7 @@
EndpointReference toEPR = new EndpointReference (toAddress);
clientOptions.setTo(toEPR);
clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey);
- clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportToEPR);
+ clientOptions.setProperty(Constants.Configuration.TRANSPORT_URL,transportToEPR);
clientOptions.setAction("urn:wsrm:EchoString");
// clientOptions.setProperty(MessageContextConstants.CHUNKED,Constants.VALUE_FALSE); //uncomment this to send messages without chunking.
Modified: webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/securerm/SecRMServiceImpl.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/securerm/SecRMServiceImpl.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/securerm/SecRMServiceImpl.java (original)
+++ webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/securerm/SecRMServiceImpl.java Mon Dec 8 09:45:55 2008
@@ -24,7 +24,7 @@
public class SecRMServiceImpl {
- HashMap sequenceTextMap = new HashMap();
+ HashMap<String, String> sequenceTextMap = new HashMap<String, String>();
String namespaceValue = "http://tempuri.org/";
String Ping = "Ping";
String Text = "Text";
Modified: webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentInvokerBeanMgr.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentInvokerBeanMgr.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentInvokerBeanMgr.java (original)
+++ webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentInvokerBeanMgr.java Mon Dec 8 09:45:55 2008
@@ -90,7 +90,7 @@
return true;
}
- public List find(InvokerBean bean)
+ public List<InvokerBean> find(InvokerBean bean)
throws SandeshaStorageException {
String sql = requestForModel(bean);
ArrayList<InvokerBean> lst = new ArrayList<InvokerBean>();
Modified: webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentRMDBeanMgr.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentRMDBeanMgr.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentRMDBeanMgr.java (original)
+++ webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentRMDBeanMgr.java Mon Dec 8 09:45:55 2008
@@ -254,7 +254,7 @@
return true;
}
- public List find(RMDBean bean)
+ public List<RMDBean> find(RMDBean bean)
throws SandeshaStorageException {
String sql = requestForModel(bean);
ArrayList<RMDBean> lst = new ArrayList<RMDBean>();
@@ -345,7 +345,7 @@
return bean;
}
- public Collection retrieveAll()
+ public Collection<RMDBean> retrieveAll()
throws SandeshaStorageException {
return find(null);
}
Modified: webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentRMSBeanMgr.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentRMSBeanMgr.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentRMSBeanMgr.java (original)
+++ webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentRMSBeanMgr.java Mon Dec 8 09:45:55 2008
@@ -331,7 +331,7 @@
return true;
}
- public List find(RMSBean bean)
+ public List<RMSBean> find(RMSBean bean)
throws SandeshaStorageException {
String sql = requestForModel(bean);
ArrayList<RMSBean> lst = new ArrayList<RMSBean>();
Modified: webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentSenderBeanMgr.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentSenderBeanMgr.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentSenderBeanMgr.java (original)
+++ webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentSenderBeanMgr.java Mon Dec 8 09:45:55 2008
@@ -190,7 +190,7 @@
return true;
}
- public List find(SenderBean bean)
+ public List<SenderBean> find(SenderBean bean)
throws SandeshaStorageException {
String sql = requestForModel(bean);
ArrayList<SenderBean> lst = new ArrayList<SenderBean>();
@@ -209,7 +209,7 @@
}
- public List find(String internalSequenceId)
+ public List<SenderBean> find(String internalSequenceId)
throws SandeshaStorageException {
ArrayList<SenderBean> lst = new ArrayList<SenderBean>();
try {
Modified: webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentStorageManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentStorageManager.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentStorageManager.java (original)
+++ webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentStorageManager.java Mon Dec 8 09:45:55 2008
@@ -79,7 +79,7 @@
private PollingManager pollingManager = null;
private boolean useSerialization = false;
private HashMap<String, MessageContext> storageMap = null;
- private static ThreadLocal threadTransaction = null;
+ private static ThreadLocal<Transaction> threadTransaction = null;
private static final Log log = LogFactory.getLog(PersistentStorageManager.class);
private TransactionLock transactionLock;
@@ -101,8 +101,8 @@
throws SandeshaException {
super(context);
log.info("create PersistentStorageManager");
- storageMap = new HashMap();
- threadTransaction = new ThreadLocal();
+ storageMap = new HashMap<String, MessageContext>();
+ threadTransaction = new ThreadLocal<Transaction>();
pRMSBeanMgr = new PersistentRMSBeanMgr(this);
pRMDBeanMgr = new PersistentRMDBeanMgr(this);
pSenderBeanMgr = new PersistentSenderBeanMgr(this);
Modified: webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaClientTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaClientTest.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaClientTest.java (original)
+++ webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaClientTest.java Mon Dec 8 09:45:55 2008
@@ -378,7 +378,7 @@
senderBean.setReSend(false);
// Find any sender beans for the to address.
- List beans = senderManager.find(senderBean);
+ List<SenderBean> beans = senderManager.find(senderBean);
assertTrue("SenderBeans found when the list should be empty", beans.isEmpty());
SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
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=724423&r1=724422&r2=724423&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 Mon Dec 8 09:45:55 2008
@@ -110,7 +110,7 @@
assertEquals(sequenceReport.getSequenceDirection(),SequenceReport.SEQUENCE_DIRECTION_OUT);
//testing incoming sequence reports
- List incomingSequenceReports = SandeshaClient.getIncomingSequenceReports(configContext);
+ List<SequenceReport> incomingSequenceReports = SandeshaClient.getIncomingSequenceReports(configContext);
assertEquals(incomingSequenceReports.size(),1);
SequenceReport incomingSequenceReport = (SequenceReport) incomingSequenceReports.get(0);
assertEquals(incomingSequenceReport.getCompletedMessages().size(),2);
@@ -183,7 +183,7 @@
SequenceReport sequence1Report = null;
SequenceReport sequence2Report = null;
- Iterator iterator = rmReport.getOutgoingSequenceList().iterator();
+ Iterator<String> iterator = rmReport.getOutgoingSequenceList().iterator();
while (iterator.hasNext()) {
String sequenceID = (String) iterator.next();
Modified: webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaUtilTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaUtilTest.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaUtilTest.java (original)
+++ webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaUtilTest.java Mon Dec 8 09:45:55 2008
@@ -75,11 +75,11 @@
rangeString.addRange(new Range(8));
rangeString.addRange(new Range(2));
- ArrayList list = SandeshaUtil.getAckRangeArrayList(rangeString,Sandesha2Constants.SPEC_2005_02.NS_URI);
+ ArrayList<Range> list = SandeshaUtil.getAckRangeArrayList(rangeString,Sandesha2Constants.SPEC_2005_02.NS_URI);
assertNotNull(list);
assertEquals(list.size(),3);
- Iterator it = list.iterator();
+ Iterator<Range> it = list.iterator();
Range ackRange = null;
ackRange = (Range) it.next();
@@ -112,12 +112,12 @@
//insert a gap - 7 and 8 are missing
rangeString.addRange(new Range(9, 10));
- ArrayList list = SandeshaUtil.getAckRangeArrayList(rangeString,Sandesha2Constants.SPEC_2005_02.NS_URI);
+ ArrayList<Range> list = SandeshaUtil.getAckRangeArrayList(rangeString,Sandesha2Constants.SPEC_2005_02.NS_URI);
assertNotNull(list);
//we expect 3 ranges: [1-4] [6] [9-10]
assertEquals(list.size(),3);
- Iterator it = list.iterator();
+ Iterator<Range> it = list.iterator();
Range ackRange = null;
ackRange = (Range) it.next();
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=724423&r1=724422&r2=724423&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 Mon Dec 8 09:45:55 2008
@@ -101,7 +101,7 @@
//checking weather the incomingSequenceReport has the offered sequence ID
SandeshaReport rmReport = SandeshaClient.getSandeshaReport(configContext);
- List incomingSeqList = rmReport.getIncomingSequenceList();
+ List<String> incomingSeqList = rmReport.getIncomingSequenceList();
assertEquals(incomingSeqList.size(),1);
assertEquals(incomingSeqList.get(0),offeredSequenceID);
Modified: webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/InvalidAcknowledgementTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/InvalidAcknowledgementTest.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/InvalidAcknowledgementTest.java (original)
+++ webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/InvalidAcknowledgementTest.java Mon Dec 8 09:45:55 2008
@@ -21,14 +21,10 @@
import java.io.OutputStream;
import java.net.HttpURLConnection;
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.impl.llom.soap12.SOAP12Factory;
import org.apache.axiom.soap.impl.llom.soap11.SOAP11Factory;
+import org.apache.axiom.soap.impl.llom.soap12.SOAP12Factory;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
@@ -252,7 +248,6 @@
StorageManager storageManager =
SandeshaUtil.getSandeshaStorageManager(serverConfigContext, serverConfigContext.getAxisConfiguration());
- RMSBeanMgr rmsBeanMgr = storageManager.getRMSBeanMgr();
SenderBeanMgr senderMgr = storageManager.getSenderBeanMgr();
// Create an RMS on the service.
Modified: webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/SequenceTerminatedFaultTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/SequenceTerminatedFaultTest.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/SequenceTerminatedFaultTest.java (original)
+++ webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/SequenceTerminatedFaultTest.java Mon Dec 8 09:45:55 2008
@@ -345,7 +345,7 @@
RMDBean finderBean = new RMDBean();
finderBean.setTerminated(false);
- List rmdBeans = storageManager.getRMDBeanMgr().find(finderBean);
+ List<RMDBean> rmdBeans = storageManager.getRMDBeanMgr().find(finderBean);
tran.commit();
Modified: webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/SequenceTimedOutTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/SequenceTimedOutTest.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/SequenceTimedOutTest.java (original)
+++ webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/SequenceTimedOutTest.java Mon Dec 8 09:45:55 2008
@@ -80,15 +80,15 @@
ServiceClient serviceClient = new ServiceClient (configContext,null);
- HashMap axisServices = configContext.getAxisConfiguration().getServices();
+ HashMap<String, AxisService> axisServices = configContext.getAxisConfiguration().getServices();
AxisService service = null;
- Iterator values = axisServices.values().iterator();
+ Iterator<AxisService> values = axisServices.values().iterator();
while(values.hasNext())
service = (AxisService)values.next();
// Set the Sequence timout property to 1 second.
- Iterator operations = service.getOperations();
+ Iterator<AxisOperation> operations = service.getOperations();
while (operations.hasNext())
{
@@ -164,15 +164,15 @@
ServiceClient serviceClient = new ServiceClient (configContext,null);
- HashMap axisServices = configContext.getAxisConfiguration().getServices();
+ HashMap<String, AxisService> axisServices = configContext.getAxisConfiguration().getServices();
AxisService service = null;
- Iterator values = axisServices.values().iterator();
+ Iterator<AxisService> values = axisServices.values().iterator();
while(values.hasNext())
service = (AxisService)values.next();
// Set the Sequence timout property to 1 second.
- Iterator operations = service.getOperations();
+ Iterator<AxisOperation> operations = service.getOperations();
while (operations.hasNext())
{
@@ -233,7 +233,7 @@
Transaction tran = storageManager.getTransaction();
RMSBean finderBean = new RMSBean();
- List rmsBeans = storageManager.getRMSBeanMgr().find(finderBean);
+ List<RMSBean> rmsBeans = storageManager.getRMSBeanMgr().find(finderBean);
tran.commit();
@@ -280,15 +280,15 @@
ServiceClient serviceClient = new ServiceClient (configContext,null);
serviceClient.setOptions(clientOptions);
- HashMap axisServices = serverConfigContext.getAxisConfiguration().getServices();
+ HashMap<String, AxisService> axisServices = serverConfigContext.getAxisConfiguration().getServices();
AxisService service = null;
- Iterator values = axisServices.values().iterator();
+ Iterator<AxisService> values = axisServices.values().iterator();
while(values.hasNext())
service = (AxisService)values.next();
// Set the Sequence timout property to 1 second.
- Iterator operations = service.getOperations();
+ Iterator<AxisOperation> operations = service.getOperations();
while (operations.hasNext())
{
@@ -319,7 +319,7 @@
Transaction tran = storageManager.getTransaction();
RMDBean finderBean = new RMDBean();
- List rmdBeans = storageManager.getRMDBeanMgr().find(finderBean);
+ List<RMDBean> rmdBeans = storageManager.getRMDBeanMgr().find(finderBean);
tran.commit();
@@ -348,7 +348,7 @@
Transaction tran = storageManager.getTransaction();
RMDBean finderBean = new RMDBean();
- List rmdBeans = storageManager.getRMDBeanMgr().find(finderBean);
+ List<RMDBean> rmdBeans = storageManager.getRMDBeanMgr().find(finderBean);
tran.commit();
Modified: webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/mtom/MTOMRMTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/mtom/MTOMRMTest.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/mtom/MTOMRMTest.java (original)
+++ webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/mtom/MTOMRMTest.java Mon Dec 8 09:45:55 2008
@@ -21,14 +21,9 @@
import java.io.InputStream;
import javax.activation.DataHandler;
-import javax.activation.DataSource;
-import javax.activation.FileDataSource;
import javax.xml.namespace.QName;
-import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMText;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -58,7 +53,7 @@
private final String Attachment = "Attachment";
- private final String SOURCE_IMAGE_FILE = "modules"+File.separator+"tests" + "mtom-image.jpg";
+// private final String SOURCE_IMAGE_FILE = "modules"+File.separator+"tests" + "mtom-image.jpg";
private final String DESTINATION_IMAGE_FILE = "target" + File.separator + "mtom-image1.jpg";
@@ -157,29 +152,29 @@
// serviceClient.cleanup();
}
-
- private OMElement getMTOMPingOMBlock() throws AxisFault {
- OMFactory fac = OMAbstractFactory.getOMFactory();
- OMNamespace namespace = fac.createOMNamespace(applicationNamespaceName, "ns1");
- OMElement pingElem = fac.createOMElement(MTOMping, namespace);
-
- OMElement attachElem = fac.createOMElement(Attachment, namespace);
-
- File file = new File(SOURCE_IMAGE_FILE);
- assertTrue(file.exists());
-
- sourceLength = file.length();
-
- DataSource dataSource = new FileDataSource(file);
- assertNotNull(dataSource);
- DataHandler dataHandler = new DataHandler(dataSource);
-
- OMText textData = fac.createOMText(dataHandler, true);
- attachElem.addChild(textData);
- pingElem.addChild(attachElem);
-
- return pingElem;
- }
+//
+// private OMElement getMTOMPingOMBlock() throws AxisFault {
+// OMFactory fac = OMAbstractFactory.getOMFactory();
+// OMNamespace namespace = fac.createOMNamespace(applicationNamespaceName, "ns1");
+// OMElement pingElem = fac.createOMElement(MTOMping, namespace);
+//
+// OMElement attachElem = fac.createOMElement(Attachment, namespace);
+//
+// File file = new File(SOURCE_IMAGE_FILE);
+// assertTrue(file.exists());
+//
+// sourceLength = file.length();
+//
+// DataSource dataSource = new FileDataSource(file);
+// assertNotNull(dataSource);
+// DataHandler dataHandler = new DataHandler(dataSource);
+//
+// OMText textData = fac.createOMText(dataHandler, true);
+// attachElem.addChild(textData);
+// pingElem.addChild(attachElem);
+//
+// return pingElem;
+// }
private class MTOMTestMessageReceiver extends RawXMLINOnlyMessageReceiver {
Modified: webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/OptionalReliabilityTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/OptionalReliabilityTest.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/OptionalReliabilityTest.java (original)
+++ webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/OptionalReliabilityTest.java Mon Dec 8 09:45:55 2008
@@ -69,7 +69,7 @@
assertTrue(sequenceReport.getCompletedMessages().isEmpty());
//assertions for the in sequence
- List inboundReports = SandeshaClient.getIncomingSequenceReports(configContext);
+ List<SequenceReport> inboundReports = SandeshaClient.getIncomingSequenceReports(configContext);
assertTrue(inboundReports.isEmpty());
configContext.getListenerManager().stop();
@@ -102,7 +102,7 @@
assertTrue(sequenceReport.getCompletedMessages().isEmpty());
//assertions for the in sequence
- List inboundReports = SandeshaClient.getIncomingSequenceReports(configContext);
+ List<SequenceReport> inboundReports = SandeshaClient.getIncomingSequenceReports(configContext);
assertTrue(inboundReports.isEmpty());
configContext.getListenerManager().stop();
@@ -143,7 +143,7 @@
assertEquals(callback1.getResult(),"echo1");
//assertions for the in sequence
- List inboundReports = SandeshaClient.getIncomingSequenceReports(configContext);
+ List<SequenceReport> inboundReports = SandeshaClient.getIncomingSequenceReports(configContext);
assertTrue(inboundReports.isEmpty());
lastError = null;
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=724423&r1=724422&r2=724423&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 Mon Dec 8 09:45:55 2008
@@ -17,7 +17,6 @@
package org.apache.sandesha2.scenarios;
import java.io.File;
-import java.net.URL;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -216,7 +215,7 @@
}
// Establish a baseline count for inbound sequences
- List oldIncomingReports = SandeshaClient.getIncomingSequenceReports(configContext);
+ List<SequenceReport> oldIncomingReports = SandeshaClient.getIncomingSequenceReports(configContext);
TestCallback callback1 = new TestCallback ("Callback 1");
serviceClient.sendReceiveNonBlocking (getEchoOMBlock("echo1",sequenceKey),callback1);
@@ -257,7 +256,7 @@
//assertions for the inbound sequence. The one we care about is a new sequence,
//so it will not exist in the oldSequences list.
- List incomingSequences = SandeshaClient.getIncomingSequenceReports(configContext);
+ List<SequenceReport> incomingSequences = SandeshaClient.getIncomingSequenceReports(configContext);
SequenceReport incomingSequenceReport = getNewReport(incomingSequences, oldIncomingReports);
System.out.println("Checking Inbound Sequence: " + incomingSequenceReport.getSequenceID());
String offer = (String) clientOptions.getProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID);
@@ -298,13 +297,13 @@
// Scan through lists of old and new incoming sequences, to find the sequence that
// was established by this test. Note that some of the old sequences may have timed out.
- private SequenceReport getNewReport(List incomingSequences, List oldIncomingReports) {
- HashSet sequenceIds = new HashSet();
- for(Iterator oldSequences = oldIncomingReports.iterator(); oldSequences.hasNext(); ) {
+ private SequenceReport getNewReport(List<SequenceReport> incomingSequences, List<SequenceReport> oldIncomingReports) {
+ HashSet<String> sequenceIds = new HashSet<String>();
+ for(Iterator<SequenceReport> oldSequences = oldIncomingReports.iterator(); oldSequences.hasNext(); ) {
SequenceReport report = (SequenceReport) oldSequences.next();
sequenceIds.add(report.getSequenceID());
}
- for(Iterator currentSequences = incomingSequences.iterator(); currentSequences.hasNext(); ) {
+ for(Iterator<SequenceReport> currentSequences = incomingSequences.iterator(); currentSequences.hasNext(); ) {
SequenceReport report = (SequenceReport) currentSequences.next();
if(!sequenceIds.contains(report.getSequenceID())) {
Modified: webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/security/UnitTestSecurityManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/security/UnitTestSecurityManager.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/security/UnitTestSecurityManager.java (original)
+++ webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/security/UnitTestSecurityManager.java Mon Dec 8 09:45:55 2008
@@ -40,7 +40,7 @@
public class UnitTestSecurityManager extends SecurityManager {
private static Log log = LogFactory.getLog(UnitTestSecurityManager.class);
- private static HashMap tokens = new HashMap();
+ private static HashMap<String, UnitTestSecurityToken> tokens = new HashMap<String, UnitTestSecurityToken>();
private static String secNamespace = Sandesha2Constants.SPEC_2005_02.SEC_NS_URI;
private static QName unitTestHeader = new QName("http://unit.test.security", "tokenId");
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=724423&r1=724422&r2=724423&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 Mon Dec 8 09:45:55 2008
@@ -73,7 +73,7 @@
InvokerBean bean = new InvokerBean();
bean.setSequenceID("SeqId2");
- Iterator iter = mgr.find(bean).iterator();
+ Iterator<InvokerBean> iter = mgr.find(bean).iterator();
InvokerBean tmp = (InvokerBean) iter.next();
if (tmp.getMessageContextRefKey().equals("Key2")) {
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=724423&r1=724422&r2=724423&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 Mon Dec 8 09:45:55 2008
@@ -74,7 +74,7 @@
RMDBean target = new RMDBean();
target.setNextMsgNoToProcess(1002);
- Iterator iterator = mgr.find(target).iterator();
+ Iterator<RMDBean> iterator = mgr.find(target).iterator();
RMDBean tmp = (RMDBean) iterator.next();
if (tmp.getSequenceID().equals("SeqId2")) {
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=724423&r1=724422&r2=724423&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 Mon Dec 8 09:45:55 2008
@@ -91,7 +91,7 @@
RMSBean target = new RMSBean();
target.setSequenceID("SeqId1");
- Iterator iter = mgr.find(target).iterator();
+ Iterator<RMSBean> iter = mgr.find(target).iterator();
RMSBean tmp = (RMSBean) iter.next();
assertTrue(tmp.getCreateSeqMsgID().equals("CreateSeqMsgId1"));
}
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=724423&r1=724422&r2=724423&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 Mon Dec 8 09:45:55 2008
@@ -80,7 +80,7 @@
SenderBean target = new SenderBean();
target.setInternalSequenceID("TmpSeqId2");
- Iterator iterator = mgr.find(target).iterator();
+ Iterator<SenderBean> iterator = mgr.find(target).iterator();
SenderBean tmp = (SenderBean) iterator.next();
if (tmp.getMessageID().equals("MsgId2")) {
Modified: webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/wsrm/SequenceAcknowledgementTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/wsrm/SequenceAcknowledgementTest.java?rev=724423&r1=724422&r2=724423&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/wsrm/SequenceAcknowledgementTest.java (original)
+++ webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/wsrm/SequenceAcknowledgementTest.java Mon Dec 8 09:45:55 2008
@@ -48,7 +48,7 @@
Identifier identifier = sequenceAck.getIdentifier();
assertEquals("uuid:897ee740-1624-11da-a28e-b3b9c4e71445", identifier.getIdentifier());
- Iterator iterator = sequenceAck.getAcknowledgementRanges().iterator();
+ Iterator<Range> iterator = sequenceAck.getAcknowledgementRanges().iterator();
while (iterator.hasNext()) {
Range ackRange = (Range) iterator.next();
if (ackRange.lowerValue == 1){
@@ -62,9 +62,9 @@
}
}
- iterator = sequenceAck.getNackList().iterator();
- while (iterator.hasNext()) {
- Long nack = (Long) iterator.next();
+ Iterator<Long> iterator2 = sequenceAck.getNackList().iterator();
+ while (iterator2.hasNext()) {
+ Long nack = (Long) iterator2.next();
if (nack.longValue() == 3) {
} else if (nack.longValue() == 7) {
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org