Author: gatfora
Date: Wed Feb 20 01:18:43 2008
New Revision: 629393
URL: http://svn.apache.org/viewvc?rev=629393&view=rev
Log:
Remove several unused imports, added some missing log.isDebugEnabled checks,
removed some exceptions from methods that never throw that exception
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/handlers/MessageContextCorrectionHandler.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/SandeshaInHandler.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/SandeshaUtil.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/AckRequested.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/Sequence.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceFault.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/UsesSequenceSTR.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=629393&r1=629392&r2=629393&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
Wed Feb 20 01:18:43 2008
@@ -26,7 +26,6 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
-import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisDescription;
@@ -112,7 +111,7 @@
String message = SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.cannotInitInMemoryStorageManager,
e.toString());
- log.debug(message,e);
+ if (log.isDebugEnabled()) log.debug(message,e);
}
try {
@@ -122,7 +121,7 @@
String message = SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.cannotInitPersistentStorageManager,
e.toString());
- log.debug(message,e);
+ if (log.isDebugEnabled()) log.debug(message,e);
}
// Reset the security manager, and then load it
@@ -256,7 +255,7 @@
Iterator ops = service.getOperations();
while(ops.hasNext()) {
AxisOperation op = (AxisOperation) ops.next();
- log.debug("Examining operation " + op.getName()
+ ", mep " + op.getMessageExchangePattern());
+ if (log.isDebugEnabled()) log.debug("Examining
operation " + op.getName() + ", mep " + op.getMessageExchangePattern());
String name = null;
QName qName = op.getName();
@@ -274,7 +273,7 @@
}
} else if(axisDescription instanceof AxisOperation) {
AxisOperation op = (AxisOperation) axisDescription;
- log.debug("Examining operation " + op.getName() + ",
mep " + op.getAxisSpecificMEPConstant());
+ if (log.isDebugEnabled()) log.debug("Examining
operation " + op.getName() + ", mep " + op.getAxisSpecificMEPConstant());
String name = null;
QName qName = op.getName();
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/MessageContextCorrectionHandler.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/MessageContextCorrectionHandler.java?rev=629393&r1=629392&r2=629393&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/MessageContextCorrectionHandler.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/MessageContextCorrectionHandler.java
Wed Feb 20 01:18:43 2008
@@ -19,7 +19,6 @@
package org.apache.sandesha2.handlers;
-import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.handlers.AbstractHandler;
@@ -29,7 +28,7 @@
*/
public class MessageContextCorrectionHandler extends AbstractHandler {
- public InvocationResponse invoke(MessageContext msgContext) throws
AxisFault {
+ public InvocationResponse invoke(MessageContext msgContext) {
msgContext.setProperty("IsAddressingProcessed", Boolean.FALSE);
return InvocationResponse.CONTINUE;
}
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java?rev=629393&r1=629392&r2=629393&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
Wed Feb 20 01:18:43 2008
@@ -115,7 +115,7 @@
} catch(Exception e) {
// Do nothing, we failed to find a
Sequence header
if (log.isDebugEnabled())
- log.debug("Exception
encountered accessing Sequence Header " + e.getMessage());
+ log.debug("Exception
encountered accessing Sequence Header ", e);
}
if(lastMessageHeader) {
SOAPBody body = env.getBody();
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/SandeshaInHandler.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/SandeshaInHandler.java?rev=629393&r1=629392&r2=629393&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/SandeshaInHandler.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/SandeshaInHandler.java
Wed Feb 20 01:18:43 2008
@@ -68,7 +68,7 @@
ConfigurationContext context = msgCtx.getConfigurationContext();
if (context == null) {
String message =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.configContextNotSet);
- log.debug(message);
+ if (log.isDebugEnabled()) log.debug(message);
throw new AxisFault(message);
}
@@ -84,7 +84,7 @@
if (msgCtx.getAxisService() != null) {
Parameter unreliableParam =
msgCtx.getAxisService().getParameter(SandeshaClientConstants.UNRELIABLE_MESSAGE);
if (null != unreliableParam &&
"true".equals(unreliableParam.getValue())) {
- log.debug("Exit: SandeshaInHandler::invoke,
Service has disabled RM " + returnValue);
+ if (log.isDebugEnabled()) log.debug("Exit:
SandeshaInHandler::invoke, Service has disabled RM " + returnValue);
return returnValue;
}
}
@@ -98,7 +98,7 @@
AxisService axisService = msgCtx.getAxisService();
if (axisService == null) {
String message =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.axisServiceIsNull);
- log.debug(message);
+ if (log.isDebugEnabled()) log.debug(message);
throw new AxisFault(message);
}
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=629393&r1=629392&r2=629393&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
Wed Feb 20 01:18:43 2008
@@ -305,7 +305,7 @@
if(log.isDebugEnabled()) log.debug("Exit:
MakeConnectionProcessor::replyToPoll");
}
- private static void addMessagePendingHeader (MessageContext
returnMessage, String namespace) throws SandeshaException {
+ private static void addMessagePendingHeader (MessageContext
returnMessage, String namespace) {
MessagePending messagePending = new MessagePending();
messagePending.setPending(true);
messagePending.toHeader(returnMessage.getEnvelope().getHeader());
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=629393&r1=629392&r2=629393&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
Wed Feb 20 01:18:43 2008
@@ -133,8 +133,7 @@
* @return
* @throws SandeshaException
*/
- public static ArrayList getAckRangeArrayList(RangeString
completedMessageRanges, String rmNamespaceValue)
- throws SandeshaException {
+ public static ArrayList getAckRangeArrayList(RangeString
completedMessageRanges, String rmNamespaceValue) {
ArrayList ackRanges = new ArrayList(); //the final ack ranges
that we will build up
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/AckRequested.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/AckRequested.java?rev=629393&r1=629392&r2=629393&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/AckRequested.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/AckRequested.java
Wed Feb 20 01:18:43 2008
@@ -48,7 +48,7 @@
private OMNamespace omNamespace = null;
private OMElement originalAckRequestedElement;
- public AckRequested(String namespaceValue) throws SandeshaException {
+ public AckRequested(String namespaceValue) {
this.namespaceValue = namespaceValue;
if
(Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceValue)) {
omNamespace = Sandesha2Constants.SPEC_2005_02.OM_NS_URI;
@@ -96,7 +96,7 @@
return originalAckRequestedElement;
}
- public void toHeader(SOAPHeader header) throws SandeshaException {
+ public void toHeader(SOAPHeader header) {
if (identifier == null)
throw new OMException(SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.ackRequestNullID));
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/Sequence.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/Sequence.java?rev=629393&r1=629392&r2=629393&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/Sequence.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/Sequence.java
Wed Feb 20 01:18:43 2008
@@ -47,7 +47,7 @@
private String namespaceValue = null;
private OMNamespace omNamespace = null;
- public Sequence(String namespaceValue) throws SandeshaException {
+ public Sequence(String namespaceValue) {
this.namespaceValue = namespaceValue;
if
(Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceValue)) {
omNamespace = Sandesha2Constants.SPEC_2005_02.OM_NS_URI;
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java?rev=629393&r1=629392&r2=629393&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
Wed Feb 20 01:18:43 2008
@@ -56,7 +56,7 @@
private OMElement originalSequenceAckElement;
- public SequenceAcknowledgement(String namespaceValue) throws
SandeshaException {
+ public SequenceAcknowledgement(String namespaceValue) {
this.namespaceValue = namespaceValue;
if
(Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceValue)) {
omNamespace = Sandesha2Constants.SPEC_2005_02.OM_NS_URI;
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceFault.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceFault.java?rev=629393&r1=629392&r2=629393&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceFault.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceFault.java
Wed Feb 20 01:18:43 2008
@@ -43,7 +43,7 @@
private String namespaceValue = null;
private OMNamespace omNamespace = null;
- public SequenceFault(String namespaceValue) throws SandeshaException {
+ public SequenceFault(String namespaceValue) {
this.namespaceValue = namespaceValue;
if
(Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceValue)) {
omNamespace = Sandesha2Constants.SPEC_2005_02.OM_NS_URI;
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/UsesSequenceSTR.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/UsesSequenceSTR.java?rev=629393&r1=629392&r2=629393&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/UsesSequenceSTR.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/UsesSequenceSTR.java
Wed Feb 20 01:18:43 2008
@@ -23,7 +23,6 @@
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.sandesha2.Sandesha2Constants;
-import org.apache.sandesha2.SandeshaException;
/**
* Class which handles the UsesSequenceSTR header block
@@ -38,7 +37,7 @@
return this;
}
- public void toHeader(SOAPHeader header) throws SandeshaException {
+ public void toHeader(SOAPHeader header) {
SOAPHeaderBlock sequenceAcknowledgementHeaderBlock =
header.addHeaderBlock(
Sandesha2Constants.WSRM_COMMON.USES_SEQUENCE_STR,Sandesha2Constants.SPEC_2007_02.OM_NS_URI);
// This header _must_ always be understood
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
