You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by ga...@apache.org on 2006/12/18 12:49:59 UTC
svn commit: r488243 - in
/webservices/sandesha/trunk/java/src/org/apache/sandesha2: ./ client/
handlers/ policy/builders/ storage/inmemory/ util/ wsrm/
Author: gatfora
Date: Mon Dec 18 03:49:56 2006
New Revision: 488243
URL: http://svn.apache.org/viewvc?view=rev&rev=488243
Log:
Remove unused imports and unused code
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/RMMsgContext.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/policy/builders/RMAssertionBuilder.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryRMDBeanMgr.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryRMSBeanMgr.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/MsgInitializer.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/PropertyManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/Range.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RangeString.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Accept.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckFinal.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckNone.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Endpoint.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/FaultCode.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/IOMRMElement.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/IOMRMPart.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Identifier.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/LastMessage.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MakeConnection.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessagePending.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Nack.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceOffer.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequence.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequenceResponse.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/RMMsgContext.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/RMMsgContext.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/RMMsgContext.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/RMMsgContext.java Mon Dec 18 03:49:56 2006
@@ -31,9 +31,7 @@
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
import org.apache.sandesha2.i18n.SandeshaMessageKeys;
import org.apache.sandesha2.util.SOAPAbstractFactory;
-import org.apache.sandesha2.wsrm.IOMRMElement;
import org.apache.sandesha2.wsrm.IOMRMPart;
-import org.apache.sandesha2.wsrm.SequenceAcknowledgement;
/**
* This class is used to hold a MessageContext within Sandesha. This is used to
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=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java Mon Dec 18 03:49:56 2006
@@ -33,8 +33,6 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.client.async.AsyncResult;
-import org.apache.axis2.client.async.Callback;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.AxisOperation;
@@ -339,8 +337,7 @@
// setting a new squenceKey if not already set.
String oldSequenceKey = (String) options.getProperty(SandeshaClientConstants.SEQUENCE_KEY);
- if (sequenceKey != null)
- options.setProperty(SandeshaClientConstants.SEQUENCE_KEY, sequenceKey);
+ options.setProperty(SandeshaClientConstants.SEQUENCE_KEY, sequenceKey);
String rmSpecVersion = (String) options.getProperty(SandeshaClientConstants.RM_SPEC_VERSION);
@@ -1056,23 +1053,6 @@
throw new SandeshaException(SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.cannotFindSequence, sequenceID
));
- }
-
- private class DummyCallback extends Callback {
-
- public void onComplete(AsyncResult result) {
- // TODO Auto-generated method stub
- System.out.println(SandeshaMessageHelper.getMessage(
- SandeshaMessageKeys.dummyCallback));
- }
-
- public void onError(Exception e) {
- // TODO Auto-generated method stub
- System.out.println(SandeshaMessageHelper.getMessage(
- SandeshaMessageKeys.dummyCallbackError));
-
- }
-
}
public static SequenceReport getIncomingSequenceReport(String sequenceID, ConfigurationContext configCtx)
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=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java Mon Dec 18 03:49:56 2006
@@ -22,10 +22,6 @@
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPFault;
-import org.apache.axiom.soap.SOAPFaultCode;
-import org.apache.axiom.soap.SOAPFaultSubCode;
-import org.apache.axiom.soap.SOAPFaultValue;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.RelatesTo;
import org.apache.axis2.context.ConfigurationContext;
@@ -44,7 +40,6 @@
import org.apache.sandesha2.storage.Transaction;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
-import org.apache.sandesha2.util.FaultManager;
import org.apache.sandesha2.util.MsgInitializer;
import org.apache.sandesha2.util.SandeshaUtil;
import org.apache.sandesha2.wsrm.Sequence;
@@ -324,12 +319,4 @@
public String getName() {
return Sandesha2Constants.GLOBAL_IN_HANDLER_NAME;
}
-
- private 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/policy/builders/RMAssertionBuilder.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/policy/builders/RMAssertionBuilder.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/policy/builders/RMAssertionBuilder.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/policy/builders/RMAssertionBuilder.java Mon Dec 18 03:49:56 2006
@@ -16,7 +16,6 @@
package org.apache.sandesha2.policy.builders;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java Mon Dec 18 03:49:56 2006
@@ -20,8 +20,6 @@
import java.util.List;
import org.apache.axis2.context.AbstractContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.storage.SandeshaStorageException;
@@ -30,8 +28,6 @@
import org.apache.sandesha2.storage.beans.RMBean;
public class InMemoryInvokerBeanMgr extends InMemoryBeanMgr implements InvokerBeanMgr {
-
- private static final Log log = LogFactory.getLog(InMemoryInvokerBeanMgr.class);
public InMemoryInvokerBeanMgr(InMemoryStorageManager mgr, AbstractContext context) {
super(mgr, context, Sandesha2Constants.BeanMAPs.STORAGE_MAP);
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryRMDBeanMgr.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryRMDBeanMgr.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryRMDBeanMgr.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryRMDBeanMgr.java Mon Dec 18 03:49:56 2006
@@ -21,8 +21,6 @@
import java.util.List;
import org.apache.axis2.context.AbstractContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.storage.SandeshaStorageException;
@@ -31,8 +29,6 @@
import org.apache.sandesha2.storage.beans.RMBean;
public class InMemoryRMDBeanMgr extends InMemoryBeanMgr implements RMDBeanMgr {
-
- private static final Log log = LogFactory.getLog(InMemoryRMDBeanMgr.class);
public InMemoryRMDBeanMgr(InMemoryStorageManager mgr, AbstractContext context) {
super(mgr, context, Sandesha2Constants.BeanMAPs.NEXT_MESSAGE);
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryRMSBeanMgr.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryRMSBeanMgr.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryRMSBeanMgr.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryRMSBeanMgr.java Mon Dec 18 03:49:56 2006
@@ -20,8 +20,6 @@
import java.util.List;
import org.apache.axis2.context.AbstractContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.storage.SandeshaStorageException;
@@ -30,8 +28,6 @@
import org.apache.sandesha2.storage.beans.RMBean;
public class InMemoryRMSBeanMgr extends InMemoryBeanMgr implements RMSBeanMgr {
-
- private static final Log log = LogFactory.getLog(InMemoryRMSBeanMgr.class);
public InMemoryRMSBeanMgr(InMemoryStorageManager mgr, AbstractContext context) {
super(mgr, context, Sandesha2Constants.BeanMAPs.CREATE_SEQUECE);
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java Mon Dec 18 03:49:56 2006
@@ -21,8 +21,6 @@
import java.util.List;
import org.apache.axis2.context.AbstractContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.storage.SandeshaStorageException;
@@ -31,8 +29,6 @@
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
public class InMemorySequencePropertyBeanMgr extends InMemoryBeanMgr implements SequencePropertyBeanMgr {
-
- private static final Log log = LogFactory.getLog(InMemorySequencePropertyBeanMgr.class);
public InMemorySequencePropertyBeanMgr(InMemoryStorageManager mgr, AbstractContext context) {
super(mgr, context, Sandesha2Constants.BeanMAPs.SEQUENCE_PROPERTY);
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/MsgInitializer.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/MsgInitializer.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/MsgInitializer.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/MsgInitializer.java Mon Dec 18 03:49:56 2006
@@ -21,17 +21,10 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
-import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.sandesha2.RMMsgContext;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
-import org.apache.sandesha2.i18n.SandeshaMessageHelper;
-import org.apache.sandesha2.i18n.SandeshaMessageKeys;
-import org.apache.sandesha2.storage.StorageManager;
-import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.wsrm.AckRequested;
import org.apache.sandesha2.wsrm.CloseSequence;
import org.apache.sandesha2.wsrm.CloseSequenceResponse;
@@ -177,11 +170,6 @@
* @throws SandeshaException
*/
private static boolean validateMessage(RMMsgContext rmMsgCtx) throws SandeshaException {
-
- ConfigurationContext configContext = rmMsgCtx.getMessageContext().getConfigurationContext();
- AxisConfiguration axisConfiguration = configContext.getAxisConfiguration();
- StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(configContext, axisConfiguration);
- SequencePropertyBeanMgr sequencePropertyBeanMgr = storageManager.getSequencePropertyBeanMgr();
String sequenceID = null;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/PropertyManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/PropertyManager.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/PropertyManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/PropertyManager.java Mon Dec 18 03:49:56 2006
@@ -27,8 +27,6 @@
import org.apache.axis2.description.AxisDescription;
import org.apache.axis2.description.AxisModule;
import org.apache.axis2.description.Parameter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
import org.apache.sandesha2.Sandesha2Constants;
@@ -43,8 +41,6 @@
*/
public class PropertyManager {
-
- private static final Log log = LogFactory.getLog(PropertyManager.class);
public static SandeshaPolicyBean loadPropertiesFromDefaultValues() throws SandeshaException {
SandeshaPolicyBean propertyBean = new SandeshaPolicyBean();
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/Range.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/Range.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/Range.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/Range.java Mon Dec 18 03:49:56 2006
@@ -19,7 +19,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
import org.apache.sandesha2.i18n.SandeshaMessageKeys;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RangeString.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RangeString.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RangeString.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RangeString.java Mon Dec 18 03:49:56 2006
@@ -113,7 +113,7 @@
Collections.sort(sortedList);
String returnString = "";
for(int i=0; i<sortedList.size(); i++){
- returnString = returnString + (rangeMap.get((Long)sortedList.get(i))).toString();
+ returnString = returnString + (rangeMap.get(sortedList.get(i))).toString();
}
return returnString;
@@ -132,7 +132,7 @@
Collections.sort(sortedList);
String returnString = "[";
for(int i=0; i<sortedList.size(); i++){
- Range r = (Range)rangeMap.get((Long)sortedList.get(i));
+ Range r = (Range)rangeMap.get(sortedList.get(i));
for(long l=r.lowerValue; l<=r.upperValue;l++){
if(i==0 && l==r.lowerValue){
//first time does not need leading ','
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=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java Mon Dec 18 03:49:56 2006
@@ -18,9 +18,9 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.MessageContextConstants;
import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.context.OperationContextFactory;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.engine.ListenerManager;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.sandesha2.RMMsgContext;
@@ -196,7 +196,7 @@
OperationContext opCtx = firstAplicationMsgCtx.getOperationContext();
if (opCtx != null) {
try {
- MessageContext requestMsg = opCtx.getMessageContext(OperationContextFactory.MESSAGE_LABEL_IN_VALUE);
+ MessageContext requestMsg = opCtx.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
if (requestMsg != null)
addressingNamespace = (String) requestMsg
.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
@@ -252,7 +252,7 @@
OperationContext opContext = firstAplicationMsgCtx.getOperationContext();
try {
MessageContext requestMessage = opContext
- .getMessageContext(OperationContextFactory.MESSAGE_LABEL_IN_VALUE);
+ .getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
if (requestMessage == null) {
String message = SandeshaMessageHelper
.getMessage(SandeshaMessageKeys.cannotFindReqMsgFromOpContext);
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Accept.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Accept.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Accept.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Accept.java Mon Dec 18 03:49:56 2006
@@ -58,8 +58,6 @@
}
public Object fromOMElement(OMElement element) throws OMException,AxisFault {
-
- OMFactory factory = element.getOMFactory();
OMElement acceptPart = element.getFirstChildWithName(new QName(
rmNamespaceValue, Sandesha2Constants.WSRM_COMMON.ACCEPT));
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckFinal.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckFinal.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckFinal.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckFinal.java Mon Dec 18 03:49:56 2006
@@ -50,8 +50,6 @@
public Object fromOMElement(OMElement element) throws OMException {
- OMFactory factory = element.getOMFactory();
-
OMElement finalPart = element.getFirstChildWithName(new QName(
namespaceValue, Sandesha2Constants.WSRM_COMMON.FINAL));
if (finalPart == null)
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckNone.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckNone.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckNone.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckNone.java Mon Dec 18 03:49:56 2006
@@ -34,8 +34,6 @@
*/
public class AckNone implements IOMRMElement {
- private OMNamespace rmNamespace = null;
-
private String namespaceValue = null;
public AckNone(String namespaceValue) throws SandeshaException {
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java Mon Dec 18 03:49:56 2006
@@ -115,7 +115,6 @@
OMFactory factory = bodyElement.getOMFactory();
OMNamespace rmNamespace = factory.createOMNamespace(rmNamespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
- OMNamespace addressingNamespace = factory.createOMNamespace(addressingNamespaceValue,Sandesha2Constants.WSA.NS_PREFIX_ADDRESSING);
OMElement createSequenceResponseElement = factory.createOMElement(
Sandesha2Constants.WSRM_COMMON.CREATE_SEQUENCE_RESPONSE,
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Endpoint.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Endpoint.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Endpoint.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Endpoint.java Mon Dec 18 03:49:56 2006
@@ -6,7 +6,6 @@
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.EndpointReferenceHelper;
import org.apache.sandesha2.Sandesha2Constants;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/FaultCode.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/FaultCode.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/FaultCode.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/FaultCode.java Mon Dec 18 03:49:56 2006
@@ -23,7 +23,6 @@
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.soap.SOAPFactory;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/IOMRMElement.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/IOMRMElement.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/IOMRMElement.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/IOMRMElement.java Mon Dec 18 03:49:56 2006
@@ -21,7 +21,6 @@
* This is the base interface for all RM infoset objects.
*/
-import org.apache.sandesha2.SandeshaException;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/IOMRMPart.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/IOMRMPart.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/IOMRMPart.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/IOMRMPart.java Mon Dec 18 03:49:56 2006
@@ -17,7 +17,6 @@
package org.apache.sandesha2.wsrm;
-import org.apache.sandesha2.SandeshaException;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Identifier.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Identifier.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Identifier.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Identifier.java Mon Dec 18 03:49:56 2006
@@ -61,8 +61,6 @@
public Object fromOMElement(OMElement element) throws OMException {
- OMFactory factory = element.getOMFactory();
-
OMElement identifierPart = element.getFirstChildWithName(new QName(
namespaceValue, Sandesha2Constants.WSRM_COMMON.IDENTIFIER));
if (identifierPart == null)
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/LastMessage.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/LastMessage.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/LastMessage.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/LastMessage.java Mon Dec 18 03:49:56 2006
@@ -23,7 +23,6 @@
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.soap.SOAPFactory;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MakeConnection.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MakeConnection.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MakeConnection.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MakeConnection.java Mon Dec 18 03:49:56 2006
@@ -29,7 +29,6 @@
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
import org.apache.sandesha2.i18n.SandeshaMessageKeys;
-import org.apache.sandesha2.util.SandeshaUtil;
public class MakeConnection implements IOMRMPart {
@@ -48,7 +47,7 @@
this.namespaceValue = namespaceValue;
}
- public void toSOAPEnvelope(SOAPEnvelope envelope) throws SandeshaException {
+ public void toSOAPEnvelope(SOAPEnvelope envelope) {
SOAPBody body = envelope.getBody();
//detach if already exist.
@@ -97,7 +96,7 @@
return false;
}
- public OMElement toOMElement(OMElement body) throws OMException, SandeshaException {
+ public OMElement toOMElement(OMElement body) throws OMException {
if (body == null || !(body instanceof SOAPBody)) {
String message = "MakeConnection element can only be added to a SOAP Body ";
@@ -105,10 +104,10 @@
SandeshaMessageHelper.getMessage(message));
}
- if (identifier==null && address==null) {
+ /* if (identifier==null && address==null) {
String message = "Invalid MakeConnection object. Both Identifier and Address are null";
}
-
+ */
OMFactory factory = body.getOMFactory();
OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessagePending.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessagePending.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessagePending.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessagePending.java Mon Dec 18 03:49:56 2006
@@ -47,7 +47,7 @@
this.namespaceValue = namespaceValue;
}
- public void toSOAPEnvelope(SOAPEnvelope envelope) throws SandeshaException {
+ public void toSOAPEnvelope(SOAPEnvelope envelope) {
SOAPHeader header = envelope.getHeader();
if (header==null) {
@@ -90,8 +90,7 @@
return messagePendingElement;
}
- public OMElement toOMElement(OMElement headerElement) throws OMException,
- SandeshaException {
+ public OMElement toOMElement(OMElement headerElement) throws OMException {
if (!(headerElement instanceof SOAPHeader)) {
String message = "'MessagePending' element can only be added to a SOAP Header";
throw new OMException(message);
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Nack.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Nack.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Nack.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Nack.java Mon Dec 18 03:49:56 2006
@@ -21,7 +21,6 @@
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.soap.SOAPFactory;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceOffer.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceOffer.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceOffer.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceOffer.java Mon Dec 18 03:49:56 2006
@@ -24,7 +24,6 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.EndpointReference;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequence.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequence.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequence.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequence.java Mon Dec 18 03:49:56 2006
@@ -25,7 +25,6 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPFactory;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequenceResponse.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequenceResponse.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequenceResponse.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequenceResponse.java Mon Dec 18 03:49:56 2006
@@ -29,7 +29,6 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPFactory;
/**
* Adds the Terminate Sequence Response body part.
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java?view=diff&rev=488243&r1=488242&r2=488243
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java Mon Dec 18 03:49:56 2006
@@ -55,7 +55,7 @@
return namespaceValue;
}
- public Object fromOMElement(OMElement header) throws OMException,SandeshaException {
+ public Object fromOMElement(OMElement header) throws OMException {
OMFactory factory = header.getOMFactory();
if (factory==null)
@@ -64,7 +64,7 @@
return this;
}
- public OMElement toOMElement(OMElement header) throws OMException,SandeshaException {
+ public OMElement toOMElement(OMElement header) throws OMException {
if (header == null || !(header instanceof SOAPHeader))
throw new OMException();
@@ -90,7 +90,7 @@
return header;
}
- public void toSOAPEnvelope(SOAPEnvelope envelope) throws SandeshaException {
+ public void toSOAPEnvelope(SOAPEnvelope envelope) {
SOAPHeader header = envelope.getHeader();
if (header==null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org