You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2007/02/25 20:57:05 UTC
svn commit: r511585 [5/10] - in /webservices/axis2/trunk/java/modules/kernel:
src/org/apache/axis2/addressing/ src/org/apache/axis2/addressing/wsdl/
src/org/apache/axis2/builder/ src/org/apache/axis2/cluster/
src/org/apache/axis2/context/ src/org/apach...
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java Sun Feb 25 11:56:59 2007
@@ -96,7 +96,7 @@
class OutInAxisOperationClient extends OperationClient {
private static Log log = LogFactory.getLog(OutInAxisOperationClient.class);
-
+
OutInAxisOperationClient(OutInAxisOperation axisOp, ServiceContext sc,
Options options) {
super(axisOp, sc, options);
@@ -151,7 +151,7 @@
* @throws AxisFault if something goes wrong during the execution of the MEP.
*/
public void execute(boolean block) throws AxisFault {
- if(log.isDebugEnabled()) log.debug("Entry: OutInAxisOperationClient::execute, " + block);
+ if(log.isDebugEnabled()) log.debug("Entry: OutInAxisOperationClient::execute, " + block);
if (completed) {
throw new AxisFault(Messages.getMessage("mepiscomplted"));
}
@@ -179,34 +179,34 @@
*/
boolean useAsync = false;
if(!options.isUseSeparateListener()) {
- Boolean useAsyncOption = (Boolean) mc.getProperty(Constants.Configuration.USE_ASYNC_OPERATIONS);
- if(useAsyncOption != null) useAsync = useAsyncOption.booleanValue();
+ Boolean useAsyncOption = (Boolean) mc.getProperty(Constants.Configuration.USE_ASYNC_OPERATIONS);
+ if(useAsyncOption != null) useAsync = useAsyncOption.booleanValue();
}
if (useAsync || options.isUseSeparateListener()) {
- if(log.isDebugEnabled())
- log.debug("useAsync=" + useAsync + ", seperateListener=" + options.isUseSeparateListener());
- /**
- * We are following the async path. If the user hasn't set a callback object then we must
- * block until the whole MEP is complete, as they have no other way to get their reply message.
- */
- CallbackReceiver callbackReceiver = null;
- if(axisOp.getMessageReceiver() != null && axisOp.getMessageReceiver() instanceof CallbackReceiver) {
- callbackReceiver = (CallbackReceiver) axisOp.getMessageReceiver();
- } else {
- if(log.isDebugEnabled()) log.debug("Creating new callback receiver");
- callbackReceiver = new CallbackReceiver();
- axisOp.setMessageReceiver(callbackReceiver);
- }
-
- SyncCallBack internalCallback = null;
- if(callback != null) {
+ if(log.isDebugEnabled())
+ log.debug("useAsync=" + useAsync + ", seperateListener=" + options.isUseSeparateListener());
+ /**
+ * We are following the async path. If the user hasn't set a callback object then we must
+ * block until the whole MEP is complete, as they have no other way to get their reply message.
+ */
+ CallbackReceiver callbackReceiver = null;
+ if(axisOp.getMessageReceiver() != null && axisOp.getMessageReceiver() instanceof CallbackReceiver) {
+ callbackReceiver = (CallbackReceiver) axisOp.getMessageReceiver();
+ } else {
+ if(log.isDebugEnabled()) log.debug("Creating new callback receiver");
+ callbackReceiver = new CallbackReceiver();
+ axisOp.setMessageReceiver(callbackReceiver);
+ }
+
+ SyncCallBack internalCallback = null;
+ if(callback != null) {
callbackReceiver.addCallback(mc.getMessageID(), callback);
- } else {
- if(log.isDebugEnabled()) log.debug("Creating internal callback");
- internalCallback = new SyncCallBack();
- callbackReceiver.addCallback(mc.getMessageID(), internalCallback);
- }
+ } else {
+ if(log.isDebugEnabled()) log.debug("Creating internal callback");
+ internalCallback = new SyncCallBack();
+ callbackReceiver.addCallback(mc.getMessageID(), internalCallback);
+ }
/**
* If USE_CUSTOM_LISTENER is set to 'true' the replyTo value will not be replaced and Axis2 will not
@@ -236,36 +236,36 @@
engine.send(mc);
if(internalCallback != null) {
- long timeout = options.getTimeOutInMilliSeconds();
- long waitTime = timeout;
- long startTime = System.currentTimeMillis();
-
- synchronized (internalCallback) {
- while (! internalCallback.isComplete() && waitTime >= 0) {
- try {
- internalCallback.wait(timeout);
- } catch (InterruptedException e) {
- // We were interrupted for some reason, keep waiting
- // or throw new AxisFault( "Callback was interrupted by someone?" );
- }
- // The wait finished, compute remaining time
- // - wait can end prematurely, see Object.wait( int timeout )
- waitTime = timeout - (System.currentTimeMillis() - startTime);
- }
- }
- // process the result of the invocation
- if (internalCallback.envelope != null) {
- // The call ended normally, so there is nothing to do
- } else {
- if (internalCallback.error instanceof AxisFault) {
- throw (AxisFault) internalCallback.error;
- } else if (internalCallback.error != null) {
- throw new AxisFault(internalCallback.error);
- } else if (! internalCallback.isComplete()) {
- throw new AxisFault(Messages.getMessage("responseTimeOut"));
- } else
- throw new AxisFault(Messages.getMessage("callBackCompletedWithError"));
- }
+ long timeout = options.getTimeOutInMilliSeconds();
+ long waitTime = timeout;
+ long startTime = System.currentTimeMillis();
+
+ synchronized (internalCallback) {
+ while (! internalCallback.isComplete() && waitTime >= 0) {
+ try {
+ internalCallback.wait(timeout);
+ } catch (InterruptedException e) {
+ // We were interrupted for some reason, keep waiting
+ // or throw new AxisFault( "Callback was interrupted by someone?" );
+ }
+ // The wait finished, compute remaining time
+ // - wait can end prematurely, see Object.wait( int timeout )
+ waitTime = timeout - (System.currentTimeMillis() - startTime);
+ }
+ }
+ // process the result of the invocation
+ if (internalCallback.envelope != null) {
+ // The call ended normally, so there is nothing to do
+ } else {
+ if (internalCallback.error instanceof AxisFault) {
+ throw (AxisFault) internalCallback.error;
+ } else if (internalCallback.error != null) {
+ throw new AxisFault(internalCallback.error);
+ } else if (! internalCallback.isComplete()) {
+ throw new AxisFault(Messages.getMessage("responseTimeOut"));
+ } else
+ throw new AxisFault(Messages.getMessage("callBackCompletedWithError"));
+ }
}
} else {
if (block) {
@@ -398,10 +398,10 @@
}
} catch (Exception e) {
- callback.onError(e);
- } finally {
- callback.setComplete(true);
- }
+ callback.onError(e);
+ } finally {
+ callback.setComplete(true);
+ }
}
}
@@ -410,34 +410,34 @@
*/
private class SyncCallBack extends Callback {
- private SOAPEnvelope envelope;
+ private SOAPEnvelope envelope;
- private Exception error;
+ private Exception error;
- public void onComplete(AsyncResult result) {
- if(log.isDebugEnabled()) log.debug("Entry: OutInAxisOperationClient$SyncCallBack::onComplete");
+ public void onComplete(AsyncResult result) {
+ if(log.isDebugEnabled()) log.debug("Entry: OutInAxisOperationClient$SyncCallBack::onComplete");
// Transport input stream gets closed after calling setComplete
// method. Have to build the whole envelope including the
// attachments at this stage. Data might get lost if the input
// stream gets closed before building the whole envelope.
this.envelope = result.getResponseEnvelope();
this.envelope.buildWithAttachments();
- if(log.isDebugEnabled()) log.debug("Exit: OutInAxisOperationClient$SyncCallBack::onComplete");
+ if(log.isDebugEnabled()) log.debug("Exit: OutInAxisOperationClient$SyncCallBack::onComplete");
}
public void setComplete(boolean complete) {
- if(log.isDebugEnabled()) log.debug("Entry: OutInAxisOperationClient$SyncCallBack::setComplete, " + complete);
+ if(log.isDebugEnabled()) log.debug("Entry: OutInAxisOperationClient$SyncCallBack::setComplete, " + complete);
super.setComplete(complete);
synchronized (this) {
notify();
}
- if(log.isDebugEnabled()) log.debug("Exit: OutInAxisOperationClient$SyncCallBack::setComplete, " + complete);
+ if(log.isDebugEnabled()) log.debug("Exit: OutInAxisOperationClient$SyncCallBack::setComplete, " + complete);
}
public void onError(Exception e) {
- if(log.isDebugEnabled()) log.debug("Entry: OutInAxisOperationClient$SyncCallBack::onError, " + e);
+ if(log.isDebugEnabled()) log.debug("Entry: OutInAxisOperationClient$SyncCallBack::onError, " + e);
error = e;
- if(log.isDebugEnabled()) log.debug("Exit: OutInAxisOperationClient$SyncCallBack::onError");
+ if(log.isDebugEnabled()) log.debug("Exit: OutInAxisOperationClient$SyncCallBack::onError");
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ParameterIncludeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ParameterIncludeImpl.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ParameterIncludeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ParameterIncludeImpl.java Sun Feb 25 11:56:59 2007
@@ -29,9 +29,7 @@
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
-import java.io.ObjectInputStream;
import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -61,10 +59,10 @@
private static final long serialVersionUID = 8153736719090126891L;
/**
- * @serial Tracks the revision level of a class to identify changes to the
+ * @serial Tracks the revision level of a class to identify changes to the
* class definition that are compatible to serialization/externalization.
* If a class definition changes, then the serialization/externalization
- * of the class is affected.
+ * of the class is affected.
* Refer to the writeExternal() and readExternal() methods.
*/
// supported revision levels, add a new level to manage compatible changes
@@ -189,23 +187,21 @@
* Externalizable support
* ===============================================================
*/
-
+
/**
* Save the contents of this object.
- * <p>
+ * <p/>
* NOTE: Transient fields and static fields are not saved.
- * Also, objects that represent "static" data are
- * not saved, except for enough information to be
- * able to find matching objects when the message
- * context is re-constituted.
+ * Also, objects that represent "static" data are
+ * not saved, except for enough information to be
+ * able to find matching objects when the message
+ * context is re-constituted.
*
- * @param out The stream to write the object contents to
- *
- * @exception IOException
+ * @param out The stream to write the object contents to
+ * @throws IOException
*/
- public void writeExternal(ObjectOutput out) throws IOException
- {
+ public void writeExternal(ObjectOutput out) throws IOException {
// write out contents of this object
//---------------------------------------------------------
@@ -229,39 +225,34 @@
/**
* Restore the contents of the object that was previously saved.
- * <p>
+ * <p/>
* NOTE: The field data must read back in the same order and type
- * as it was written. Some data will need to be validated when
+ * as it was written. Some data will need to be validated when
* resurrected.
*
- * @param in The stream to read the object contents from
- *
- * @exception IOException
- * @exception ClassNotFoundException
+ * @param in The stream to read the object contents from
+ * @throws IOException
+ * @throws ClassNotFoundException
*/
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
- {
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
// trace point
- if (log.isTraceEnabled())
- {
- log.trace(myClassName+":readExternal(): BEGIN bytes available in stream ["+in.available()+"] ");
+ if (log.isTraceEnabled()) {
+ log.trace(myClassName + ":readExternal(): BEGIN bytes available in stream [" + in.available() + "] ");
}
// serialization version ID
long suid = in.readLong();
// revision ID
- int revID = in.readInt();
+ int revID = in.readInt();
// make sure the object data is in a version we can handle
- if (suid != serialVersionUID)
- {
+ if (suid != serialVersionUID) {
throw new ClassNotFoundException(ObjectStateUtils.UNSUPPORTED_SUID);
}
// make sure the object data is in a revision level we can handle
- if (revID != REVISION_1)
- {
+ if (revID != REVISION_1) {
throw new ClassNotFoundException(ObjectStateUtils.UNSUPPORTED_REVID);
}
@@ -271,17 +262,12 @@
HashMap tmp = ObjectStateUtils.readHashMap(in, "ParameterIncludeImpl.parameters");
- if (tmp != null)
- {
- if (parameters != null)
- {
+ if (tmp != null) {
+ if (parameters != null) {
parameters.putAll(tmp);
- }
- else
- {
- if (log.isTraceEnabled())
- {
- log.trace(myClassName+":readExternal(): WARNING: parameters doesnot have a defined HashMap ");
+ } else {
+ if (log.isTraceEnabled()) {
+ log.trace(myClassName + ":readExternal(): WARNING: parameters doesnot have a defined HashMap ");
}
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java Sun Feb 25 11:56:59 2007
@@ -29,75 +29,75 @@
public class PolicyInclude {
- public static final int ANON_POLICY = 100;
+ public static final int ANON_POLICY = 100;
- public static final int AXIS_POLICY = 1;
-
- public static final int AXIS_MODULE_POLICY = 2;
+ public static final int AXIS_POLICY = 1;
+
+ public static final int AXIS_MODULE_POLICY = 2;
- public static final int AXIS_SERVICE_POLICY = 3;
+ public static final int AXIS_SERVICE_POLICY = 3;
- public static final int AXIS_OPERATION_POLICY = 4;
+ public static final int AXIS_OPERATION_POLICY = 4;
- public static final int AXIS_MESSAGE_POLICY = 5;
+ public static final int AXIS_MESSAGE_POLICY = 5;
- public static final int SERVICE_POLICY = 6;
+ public static final int SERVICE_POLICY = 6;
- public static final int PORT_POLICY = 7;
+ public static final int PORT_POLICY = 7;
- public static final int PORT_TYPE_POLICY = 8;
+ public static final int PORT_TYPE_POLICY = 8;
- public static final int BINDING_POLICY = 9;
+ public static final int BINDING_POLICY = 9;
- public static final int OPERATION_POLICY = 10;
+ public static final int OPERATION_POLICY = 10;
- public static final int BINDING_OPERATION_POLICY = 11;
+ public static final int BINDING_OPERATION_POLICY = 11;
- public static final int INPUT_POLICY = 12;
+ public static final int INPUT_POLICY = 12;
- public static final int OUTPUT_POLICY = 13;
+ public static final int OUTPUT_POLICY = 13;
- public static final int BINDING_INPUT_POLICY = 14;
+ public static final int BINDING_INPUT_POLICY = 14;
- public static final int BINDING_OUTPUT_POLICY = 15;
+ public static final int BINDING_OUTPUT_POLICY = 15;
- public static final int MESSAGE_POLICY = 16;
+ public static final int MESSAGE_POLICY = 16;
- private Policy policy = null;
+ private Policy policy = null;
- private Policy effectivePolicy = null;
-
- private PolicyRegistry reg;
+ private Policy effectivePolicy = null;
+
+ private PolicyRegistry reg;
- private AxisDescription description;
-
- private Hashtable wrapperElements = new Hashtable();
+ private AxisDescription description;
+
+ private Hashtable wrapperElements = new Hashtable();
- public PolicyInclude() {
- reg = new PolicyRegistryImpl();
- }
+ public PolicyInclude() {
+ reg = new PolicyRegistryImpl();
+ }
- public PolicyInclude(AxisDescription axisDescription) {
-
- if (axisDescription.getParent() != null) {
- PolicyInclude parentPolicyInclude = axisDescription.getParent().getPolicyInclude();
+ public PolicyInclude(AxisDescription axisDescription) {
+
+ if (axisDescription.getParent() != null) {
+ PolicyInclude parentPolicyInclude = axisDescription.getParent().getPolicyInclude();
reg = new PolicyRegistryImpl(parentPolicyInclude.getPolicyRegistry());
- } else {
- reg = new PolicyRegistryImpl();
+ } else {
+ reg = new PolicyRegistryImpl();
}
setDescription(axisDescription);
- }
+ }
- public void setPolicyRegistry(PolicyRegistry reg) {
- this.reg = reg;
- }
-
- public PolicyRegistry getPolicyRegistry() {
- return reg;
- }
+ public void setPolicyRegistry(PolicyRegistry reg) {
+ this.reg = reg;
+ }
+
+ public PolicyRegistry getPolicyRegistry() {
+ return reg;
+ }
- public void setPolicy(Policy policy) {
- wrapperElements.clear();
+ public void setPolicy(Policy policy) {
+ wrapperElements.clear();
if (policy.getName() == null && policy.getId() == null) {
policy.setId(UUIDGenerator.getUUID());
@@ -109,138 +109,138 @@
} else {
wrapperElements.put(policy.getId(), wrapper);
}
- }
-
- public void updatePolicy(Policy policy) {
- String key;
+ }
+
+ public void updatePolicy(Policy policy) {
+ String key;
if ((key = policy.getName()) == null && (key = policy.getId()) == null) {
// TODO throw more meaningful exception ..
throw new RuntimeException("policy doesn't have a name or an id ");
}
-
- Wrapper wrapper = (Wrapper) wrapperElements.get(key);
- wrapper.value = policy;
- }
-
- public void setEffectivePolicy(Policy effectivePolicy) {
- this.effectivePolicy = effectivePolicy;
- }
-
- public void setDescription(AxisDescription description) {
- this.description = description;
- }
-
- public AxisDescription getDescription() {
- return description;
- }
-
- private PolicyInclude getParent() {
-
- if (description != null && description.getParent() != null) {
- return description.getParent().getPolicyInclude();
- }
- return null;
- }
-
- private void calculatePolicy() {
-
- Policy result = null;
- Iterator iterator = wrapperElements.values().iterator();
-
- while (iterator.hasNext()) {
- Object policyElement = ((Wrapper) iterator.next()).getValue();
- Policy p;
+
+ Wrapper wrapper = (Wrapper) wrapperElements.get(key);
+ wrapper.value = policy;
+ }
+
+ public void setEffectivePolicy(Policy effectivePolicy) {
+ this.effectivePolicy = effectivePolicy;
+ }
+
+ public void setDescription(AxisDescription description) {
+ this.description = description;
+ }
+
+ public AxisDescription getDescription() {
+ return description;
+ }
+
+ private PolicyInclude getParent() {
+
+ if (description != null && description.getParent() != null) {
+ return description.getParent().getPolicyInclude();
+ }
+ return null;
+ }
+
+ private void calculatePolicy() {
- if (policyElement instanceof PolicyReference) {
+ Policy result = null;
+ Iterator iterator = wrapperElements.values().iterator();
+
+ while (iterator.hasNext()) {
+ Object policyElement = ((Wrapper) iterator.next()).getValue();
+ Policy p;
+
+ if (policyElement instanceof PolicyReference) {
PolicyRegistry r = getPolicyRegistry();
- p = (Policy) ((PolicyReference) policyElement)
- .normalize(getPolicyRegistry(), false);
+ p = (Policy) ((PolicyReference) policyElement)
+ .normalize(getPolicyRegistry(), false);
- } else if (policyElement instanceof Policy) {
- p = (Policy) policyElement;
+ } else if (policyElement instanceof Policy) {
+ p = (Policy) policyElement;
- } else {
- // TODO AxisFault?
- throw new RuntimeException();
- }
+ } else {
+ // TODO AxisFault?
+ throw new RuntimeException();
+ }
result = (result == null) ? (Policy) p : (Policy) result.merge(p);
}
- this.policy = result;
- }
+ this.policy = result;
+ }
- private void calculateEffectivePolicy() {
- Policy result ;
-
- if (getParent() != null) {
- Policy parentPolicy = getParent().getEffectivePolicy();
-
- if (parentPolicy == null) {
- result = getPolicy();
-
- } else {
-
- if (getPolicy() != null) {
- result = (Policy) parentPolicy.merge(getPolicy());
-
- } else {
- result = parentPolicy;
- }
- }
-
- } else {
- result = getPolicy();
- }
- setEffectivePolicy(result);
- }
-
- public Policy getPolicy() {
- calculatePolicy();
- return policy;
- }
-
- public Policy getEffectivePolicy() {
- calculateEffectivePolicy();
- return effectivePolicy;
- }
-
- public ArrayList getPolicyElements() {
- ArrayList policyElementsList = new ArrayList();
- Iterator policyElementIterator = wrapperElements.values().iterator();
-
- while (policyElementIterator.hasNext()) {
- policyElementsList
- .add(((Wrapper) policyElementIterator.next()).getValue());
- }
- return policyElementsList;
- }
-
- public ArrayList getPolicyElements(int type) {
- ArrayList policyElementList = new ArrayList();
- Iterator wrapperElementIterator = wrapperElements.values().iterator();
- Wrapper wrapper;
-
- while (wrapperElementIterator.hasNext()) {
- wrapper = (Wrapper) wrapperElementIterator.next();
-
- if (wrapper.getType() == type) {
- policyElementList.add(wrapper.getValue());
- }
- }
- return policyElementList;
- }
-
- public void registerPolicy(String key, Policy policy) {
- reg.register(key, policy);
- }
-
- public Policy getPolicy(String key) {
- return reg.lookup(key);
- }
+ private void calculateEffectivePolicy() {
+ Policy result ;
+
+ if (getParent() != null) {
+ Policy parentPolicy = getParent().getEffectivePolicy();
+
+ if (parentPolicy == null) {
+ result = getPolicy();
+
+ } else {
+
+ if (getPolicy() != null) {
+ result = (Policy) parentPolicy.merge(getPolicy());
+
+ } else {
+ result = parentPolicy;
+ }
+ }
+
+ } else {
+ result = getPolicy();
+ }
+ setEffectivePolicy(result);
+ }
+
+ public Policy getPolicy() {
+ calculatePolicy();
+ return policy;
+ }
+
+ public Policy getEffectivePolicy() {
+ calculateEffectivePolicy();
+ return effectivePolicy;
+ }
+
+ public ArrayList getPolicyElements() {
+ ArrayList policyElementsList = new ArrayList();
+ Iterator policyElementIterator = wrapperElements.values().iterator();
+
+ while (policyElementIterator.hasNext()) {
+ policyElementsList
+ .add(((Wrapper) policyElementIterator.next()).getValue());
+ }
+ return policyElementsList;
+ }
+
+ public ArrayList getPolicyElements(int type) {
+ ArrayList policyElementList = new ArrayList();
+ Iterator wrapperElementIterator = wrapperElements.values().iterator();
+ Wrapper wrapper;
+
+ while (wrapperElementIterator.hasNext()) {
+ wrapper = (Wrapper) wrapperElementIterator.next();
+
+ if (wrapper.getType() == type) {
+ policyElementList.add(wrapper.getValue());
+ }
+ }
+ return policyElementList;
+ }
+
+ public void registerPolicy(String key, Policy policy) {
+ reg.register(key, policy);
+ }
- public void addPolicyElement(int type, Policy policy) {
+ public Policy getPolicy(String key) {
+ return reg.lookup(key);
+ }
+
+ public void addPolicyElement(int type, Policy policy) {
String key;
@@ -250,44 +250,44 @@
key = (policy.getName() != null) ? policy.getName() : policy.getId();
- Wrapper wrapper = new Wrapper(type, policy);
- wrapperElements.put(key, wrapper);
+ Wrapper wrapper = new Wrapper(type, policy);
+ wrapperElements.put(key, wrapper);
reg.register(key, policy);
- }
+ }
- public void addPolicyRefElement(int type, PolicyReference policyReference) {
- Wrapper wrapper = new Wrapper(type, policyReference);
- wrapperElements.put(policyReference.getURI(), wrapper);
- }
-
- class Wrapper {
- private int type;
- private Object value;
-
- Wrapper(int type, Object value) {
- setType(type);
- setValue(value);
- }
-
- void setType(int type) {
- this.type = type;
- }
-
- int getType() {
- return type;
- }
-
- void setValue(Object value) {
- this.value = value;
- }
-
- Object getValue() {
- return value;
- }
- }
-
- public void removePolicyElement(String policyURI) {
- wrapperElements.remove(policyURI);
+ public void addPolicyRefElement(int type, PolicyReference policyReference) {
+ Wrapper wrapper = new Wrapper(type, policyReference);
+ wrapperElements.put(policyReference.getURI(), wrapper);
+ }
+
+ class Wrapper {
+ private int type;
+ private Object value;
+
+ Wrapper(int type, Object value) {
+ setType(type);
+ setValue(value);
+ }
+
+ void setType(int type) {
+ this.type = type;
+ }
+
+ int getType() {
+ return type;
+ }
+
+ void setValue(Object value) {
+ this.value = value;
+ }
+
+ Object getValue() {
+ return value;
+ }
+ }
+
+ public void removePolicyElement(String policyURI) {
+ wrapperElements.remove(policyURI);
reg.remove(policyURI);
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java Sun Feb 25 11:56:59 2007
@@ -85,7 +85,7 @@
responseMessageContext.setTransportIn(msgctx.getTransportIn());
responseMessageContext.setTransportOut(msgctx.getTransportOut());
responseMessageContext.setProperty(MessageContext.TRANSPORT_HEADERS,
- msgctx.getProperty(MessageContext.TRANSPORT_HEADERS));
+ msgctx.getProperty(MessageContext.TRANSPORT_HEADERS));
SOAPEnvelope envelope = responseMessageContext.getEnvelope();
if (envelope == null) {
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TwoChannelAxisOperation.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java Sun Feb 25 11:56:59 2007
@@ -735,7 +735,7 @@
addQNameReference(inMessage, wsdl4jOperation, isWrapped, extensibilityElements, wsdl4jMessage);
}
- /**
+ /**
* Add the QName for the binding output
*
* @param outMessage
@@ -757,8 +757,8 @@
}
}
- private void addQNameReference(AxisMessage message, Operation wsdl4jOperation, boolean isWrapped, List extensibilityElements, Message wsdl4jMessage) {
- for (int i = 0; i < extensibilityElements.size(); i++) {
+ private void addQNameReference(AxisMessage message, Operation wsdl4jOperation, boolean isWrapped, List extensibilityElements, Message wsdl4jMessage) {
+ for (int i = 0; i < extensibilityElements.size(); i++) {
ExtensibilityElement extElement = (ExtensibilityElement) extensibilityElements.get(i);
List bindingPartsList = null;
@@ -776,27 +776,27 @@
if (bindingPartsList != null && !bindingPartsList.isEmpty()) {
// we can process a single part only
if (bindingPartsList.size() > 1) {
- // do something here - perhaps throw and exception
- } else {
- // find the part from the relevant message
- Part wsdl4jMessagePart = wsdl4jMessage
- .getPart((String) bindingPartsList.get(0));
- // the part name better be there - if not throw an exception
- if (wsdl4jMessagePart == null) {
- throw new WSDLProcessingException("Missing part named \""
- + bindingPartsList.get(0) + "\"");
- }
- QName name = wsdl4jMessagePart.getElementName();
- if (name == null) {
- name = wsdl4jMessagePart.getTypeName();
- }
- if (name == null) {
- throw new WSDLProcessingException(
- "Element reference / Type name missing for "
- + bindingPartsList.get(0) + "!");
- }
- message.setElementQName(wsdl4jMessagePart.getElementName());
- }
+ // do something here - perhaps throw and exception
+ } else {
+ // find the part from the relevant message
+ Part wsdl4jMessagePart = wsdl4jMessage
+ .getPart((String) bindingPartsList.get(0));
+ // the part name better be there - if not throw an exception
+ if (wsdl4jMessagePart == null) {
+ throw new WSDLProcessingException("Missing part named \""
+ + bindingPartsList.get(0) + "\"");
+ }
+ QName name = wsdl4jMessagePart.getElementName();
+ if (name == null) {
+ name = wsdl4jMessagePart.getTypeName();
+ }
+ if (name == null) {
+ throw new WSDLProcessingException(
+ "Element reference / Type name missing for "
+ + bindingPartsList.get(0) + "!");
+ }
+ message.setElementQName(wsdl4jMessagePart.getElementName());
+ }
// there are no parts named in the binding - process the
// items normally
// by looking at the single message part - or the wrapped
@@ -829,7 +829,7 @@
}
}
}
- }
+ }
/**
* Add the QName for the binding output
@@ -1616,33 +1616,33 @@
// <wsp:Policy>
if (WSDLConstants.WSDL11Constants.POLICY.equals(type)) {
- if (isTraceEnabled) {
+ if (isTraceEnabled) {
log.trace("copyExtensibleElements:: PolicyElement found " + unknown);
}
Policy policy = (Policy) PolicyUtil.getPolicyComponent(unknown.getElement());
int attachmentScope = getPolicyAttachmentPoint(description, originOfExtensibilityElements);
- if(attachmentScope > -1){
- description.getPolicyInclude().addPolicyElement(
- attachmentScope, policy);
- }
+ if(attachmentScope > -1){
+ description.getPolicyInclude().addPolicyElement(
+ attachmentScope, policy);
+ }
// <wsp:PolicyReference>
} else if (WSDLConstants.WSDL11Constants.POLICY_REFERENCE
.equals(type)) {
- if (isTraceEnabled) {
+ if (isTraceEnabled) {
log.trace("copyExtensibleElements:: PolicyReference found " + unknown);
}
PolicyReference policyReference = (PolicyReference) PolicyUtil
.getPolicyComponent(unknown.getElement());
int attachmentScope = getPolicyAttachmentPoint(description, originOfExtensibilityElements);
- if(attachmentScope > -1){
- description.getPolicyInclude().addPolicyRefElement(
- attachmentScope, policyReference);
- }
+ if(attachmentScope > -1){
+ description.getPolicyInclude().addPolicyRefElement(
+ attachmentScope, policyReference);
+ }
} else if (AddressingConstants.Final.WSAW_USING_ADDRESSING
.equals(type)
|| AddressingConstants.Submission.WSAW_USING_ADDRESSING
.equals(unknown.getElementType())) {
- if (isTraceEnabled) {
+ if (isTraceEnabled) {
log.trace("copyExtensibleElements:: wsaw:UsingAddressing found " + unknown);
}
// FIXME We need to set this the appropriate Axis Description AxisEndpoint or
@@ -1863,51 +1863,51 @@
}
private int getPolicyAttachmentPoint(AxisDescription description,
- String originOfExtensibilityElements) {
- int result = -1; // Attachment Point Not Identified
- if (description instanceof AxisService) {
+ String originOfExtensibilityElements) {
+ int result = -1; // Attachment Point Not Identified
+ if (description instanceof AxisService) {
// wsdl:service
- if (SERVICE.equals(originOfExtensibilityElements)) {
- result = PolicyInclude.SERVICE_POLICY;
+ if (SERVICE.equals(originOfExtensibilityElements)) {
+ result = PolicyInclude.SERVICE_POLICY;
// wsdl:service -> wsdl:port
- } else if (PORT.equals(originOfExtensibilityElements)) {
- result =PolicyInclude.PORT_POLICY;
+ } else if (PORT.equals(originOfExtensibilityElements)) {
+ result =PolicyInclude.PORT_POLICY;
// wsdl:binding
- } else if (BINDING.equals(originOfExtensibilityElements)) {
- result = PolicyInclude.BINDING_POLICY;
- }
- // TODO policy for wsdl:portType ?
- } else if (description instanceof AxisOperation) {
+ } else if (BINDING.equals(originOfExtensibilityElements)) {
+ result = PolicyInclude.BINDING_POLICY;
+ }
+ // TODO policy for wsdl:portType ?
+ } else if (description instanceof AxisOperation) {
// wsdl:portType -> wsdl:operation
- if (PORT_TYPE_OPERATION.equals(originOfExtensibilityElements)) {
- result = PolicyInclude.OPERATION_POLICY;
+ if (PORT_TYPE_OPERATION.equals(originOfExtensibilityElements)) {
+ result = PolicyInclude.OPERATION_POLICY;
// wsdl:binding -> wsdl:operation
- } else {
- result = PolicyInclude.BINDING_POLICY;
- }
- } else {
+ } else {
+ result = PolicyInclude.BINDING_POLICY;
+ }
+ } else {
// wsdl:portType -> wsdl:operation -> wsdl:input
- if (PORT_TYPE_OPERATION_INPUT.equals(originOfExtensibilityElements)) {
- result = PolicyInclude.INPUT_POLICY;
+ if (PORT_TYPE_OPERATION_INPUT.equals(originOfExtensibilityElements)) {
+ result = PolicyInclude.INPUT_POLICY;
// wsdl:binding -> wsdl:operation -> wsdl:input
- } else if (BINDING_OPERATION_INPUT
- .equals(originOfExtensibilityElements)) {
- result = PolicyInclude.BINDING_INPUT_POLICY;
+ } else if (BINDING_OPERATION_INPUT
+ .equals(originOfExtensibilityElements)) {
+ result = PolicyInclude.BINDING_INPUT_POLICY;
// wsdl:portType -> wsdl:operation -> wsdl:put
- } else if (PORT_TYPE_OPERATION_OUTPUT
- .equals(originOfExtensibilityElements)) {
- result = PolicyInclude.OUTPUT_POLICY;
+ } else if (PORT_TYPE_OPERATION_OUTPUT
+ .equals(originOfExtensibilityElements)) {
+ result = PolicyInclude.OUTPUT_POLICY;
// wsdl:binding -> wsdl:operation -> wsdl:output
- } else if (BINDING_OPERATION_OUTPUT
- .equals(originOfExtensibilityElements)) {
- result = PolicyInclude.BINDING_OUTPUT_POLICY;
- }
+ } else if (BINDING_OPERATION_OUTPUT
+ .equals(originOfExtensibilityElements)) {
+ result = PolicyInclude.BINDING_OUTPUT_POLICY;
+ }
// TODO Faults ..
- }
- if(isTraceEnabled){
- log.trace("getPolicyAttachmentPoint:: axisDescription="+description+" extensibilityPoint="+originOfExtensibilityElements+" result="+result);
- }
- return result;
+ }
+ if(isTraceEnabled){
+ log.trace("getPolicyAttachmentPoint:: axisDescription="+description+" extensibilityPoint="+originOfExtensibilityElements+" result="+result);
+ }
+ return result;
}
/**
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20DefaultValueHolder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/AbstractOperationDispatcher.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/AbstractServiceDispatcher.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/ActionBasedOperationDispatcher.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RelatesToBasedOperationDispatcher.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RelatesToBasedServiceDispatcher.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RequestURIBasedOperationDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RequestURIBasedOperationDispatcher.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RequestURIBasedOperationDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RequestURIBasedOperationDispatcher.java Sun Feb 25 11:56:59 2007
@@ -1,68 +1,68 @@
-/*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-
-package org.apache.axis2.dispatchers;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.HandlerDescription;
-import org.apache.axis2.util.Utils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * Dispatches the operation based on the information from the target endpoint URL.
- */
-public class RequestURIBasedOperationDispatcher extends AbstractOperationDispatcher {
-
- public static final String NAME = "RequestURIBasedOperationDispatcher";
- private static final Log log = LogFactory.getLog(RequestURIBasedOperationDispatcher.class);
-
- /*
- * (non-Javadoc)
- * @see org.apache.axis2.engine.AbstractDispatcher#findOperation(org.apache.axis2.description.AxisService, org.apache.axis2.context.MessageContext)
- */
- public AxisOperation findOperation(AxisService service, MessageContext messageContext)
- throws AxisFault {
-
- EndpointReference toEPR = messageContext.getTo();
- if (toEPR != null) {
- String filePart = toEPR.getAddress();
- String[] values = Utils.parseRequestURLForServiceAndOperation(filePart,
- messageContext.getConfigurationContext().getServiceContextPath());
-
- if ((values.length >= 2) && (values[1] != null)) {
- QName operationName = new QName(values[1]);
- log.debug(messageContext.getLogIDString()+" Checking for Operation using QName(target endpoint URI fragment) : " + operationName);
- return service.getOperation(operationName);
- } else {
- log.debug(messageContext.getLogIDString()+" Attempted to check for Operation using target endpoint URI, but the operation fragment was missing");
- return null;
- }
- } else {
- log.debug(messageContext.getLogIDString()+" Attempted to check for Operation using null target endpoint URI");
- return null;
- }
- }
-
- public void initDispatcher() {
- init(new HandlerDescription(NAME));
- }
-}
+/*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+
+package org.apache.axis2.dispatchers;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.HandlerDescription;
+import org.apache.axis2.util.Utils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Dispatches the operation based on the information from the target endpoint URL.
+ */
+public class RequestURIBasedOperationDispatcher extends AbstractOperationDispatcher {
+
+ public static final String NAME = "RequestURIBasedOperationDispatcher";
+ private static final Log log = LogFactory.getLog(RequestURIBasedOperationDispatcher.class);
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.axis2.engine.AbstractDispatcher#findOperation(org.apache.axis2.description.AxisService, org.apache.axis2.context.MessageContext)
+ */
+ public AxisOperation findOperation(AxisService service, MessageContext messageContext)
+ throws AxisFault {
+
+ EndpointReference toEPR = messageContext.getTo();
+ if (toEPR != null) {
+ String filePart = toEPR.getAddress();
+ String[] values = Utils.parseRequestURLForServiceAndOperation(filePart,
+ messageContext.getConfigurationContext().getServiceContextPath());
+
+ if ((values.length >= 2) && (values[1] != null)) {
+ QName operationName = new QName(values[1]);
+ log.debug(messageContext.getLogIDString()+" Checking for Operation using QName(target endpoint URI fragment) : " + operationName);
+ return service.getOperation(operationName);
+ } else {
+ log.debug(messageContext.getLogIDString()+" Attempted to check for Operation using target endpoint URI, but the operation fragment was missing");
+ return null;
+ }
+ } else {
+ log.debug(messageContext.getLogIDString()+" Attempted to check for Operation using null target endpoint URI");
+ return null;
+ }
+ }
+
+ public void initDispatcher() {
+ init(new HandlerDescription(NAME));
+ }
+}
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RequestURIBasedOperationDispatcher.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RequestURIBasedServiceDispatcher.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/SOAPMessageBodyBasedOperationDispatcher.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/SOAPMessageBodyBasedServiceDispatcher.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java Sun Feb 25 11:56:59 2007
@@ -67,7 +67,7 @@
}
public AxisService findService(MessageContext messageContext) throws AxisFault {
- EndpointReference toEPR = messageContext.getTo();
+ EndpointReference toEPR = messageContext.getTo();
AxisService service = null;
if (toEPR != null) {
@@ -135,7 +135,7 @@
String relatesTo = msgctx.getRelatesTo().getValue();
if(isDebugEnabled){
- log.debug(msgctx.getLogIDString()+" "+Messages.getMessage("checkingrelatesto",
+ log.debug(msgctx.getLogIDString()+" "+Messages.getMessage("checkingrelatesto",
relatesTo));
}
if ((relatesTo != null) && !"".equals(relatesTo)) {
@@ -144,11 +144,11 @@
.getOperationContext(relatesTo);
if (operationContext != null) {
- if(operationContext.isComplete()){
- // If the dispatch happens because of the RelatesTo and the mep is complete
- // we should throw a more descriptive fault.
- throw new AxisFault(Messages.getMessage("duplicaterelatesto",relatesTo));
- }
+ if(operationContext.isComplete()){
+ // If the dispatch happens because of the RelatesTo and the mep is complete
+ // we should throw a more descriptive fault.
+ throw new AxisFault(Messages.getMessage("duplicaterelatesto",relatesTo));
+ }
msgctx.setAxisOperation(operationContext.getAxisOperation());
msgctx.setOperationContext(operationContext);
msgctx.setServiceContext((ServiceContext) operationContext.getParent());
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java Sun Feb 25 11:56:59 2007
@@ -175,36 +175,36 @@
messageReceivers.put(mepURL, messageReceiver);
}
- /**
- * Register a messageBuilder implementation against a content type.
- * This is used by Axis2 to support different message formats.
- * @param contentType
- * @param messageBuilder
- */
- public void addMessageBuilder(String contentType,
- OMBuilder messageBuilder) {
- messageBuilders.put(contentType, messageBuilder);
- }
-
-
- /**
- * Register a messageFormatter implementation against a content type.
- * This is used by Axis2 to support serialization of messages to different
- * message formats. (Eg: JSON)
- * @param contentType
- * @param messageFormatter
- */
- public void addMessageFormatter(String contentType,
- MessageFormatter messageFormatter) {
- messageFormatters.put(contentType, messageFormatter);
- }
-
- /**
- * Method addModule.
- *
- * @param module
- * @throws AxisFault
- */
+ /**
+ * Register a messageBuilder implementation against a content type.
+ * This is used by Axis2 to support different message formats.
+ * @param contentType
+ * @param messageBuilder
+ */
+ public void addMessageBuilder(String contentType,
+ OMBuilder messageBuilder) {
+ messageBuilders.put(contentType, messageBuilder);
+ }
+
+
+ /**
+ * Register a messageFormatter implementation against a content type.
+ * This is used by Axis2 to support serialization of messages to different
+ * message formats. (Eg: JSON)
+ * @param contentType
+ * @param messageFormatter
+ */
+ public void addMessageFormatter(String contentType,
+ MessageFormatter messageFormatter) {
+ messageFormatters.put(contentType, messageFormatter);
+ }
+
+ /**
+ * Method addModule.
+ *
+ * @param module
+ * @throws AxisFault
+ */
public void addModule(AxisModule module) throws AxisFault {
module.setParent(this);
notifyObservers(AxisEvent.MODULE_DEPLOY, module);
@@ -624,19 +624,19 @@
}
/**
- * @param contentType
- * @return the configured message builder implementation class name against
- * the given content type.
- */
+ * @param contentType
+ * @return the configured message builder implementation class name against
+ * the given content type.
+ */
public OMBuilder getMessageBuilder(String contentType) {
return (OMBuilder)messageBuilders.get(contentType);
}
/**
- * @param contentType
- * @return the configured message formatter implementation class name
- * against the given content type.
- */
+ * @param contentType
+ * @return the configured message formatter implementation class name
+ * against the given content type.
+ */
public MessageFormatter getMessageFormatter(String contentType) {
return (MessageFormatter) messageFormatters.get(contentType);
}
@@ -881,12 +881,12 @@
}
public ClusterManager getClusterManager() {
- return clusterManager;
- }
+ return clusterManager;
+ }
- public void setClusterManager(ClusterManager clusterManager) {
- this.clusterManager = clusterManager;
- }
+ public void setClusterManager(ClusterManager clusterManager) {
+ this.clusterManager = clusterManager;
+ }
public Object getKey() {
return toString();
@@ -1015,7 +1015,7 @@
}
/**
- * For internal used only! To store instance of DataLocator when it is first loaded. This allows to
+ * For internal used only! To store instance of DataLocator when it is first loaded. This allows to
* re-use DataLocator after it is initially loaded.
* @param dialect- an absolute URI represents the format and version of data
* @param dataLocator - specified an DataLocator instance to support retrieval
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisError.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisError.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisError.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisError.java Sun Feb 25 11:56:59 2007
@@ -18,9 +18,9 @@
public class AxisError extends RuntimeException {
- private static final long serialVersionUID = 6291062136407995920L;
+ private static final long serialVersionUID = 6291062136407995920L;
- public AxisError() {
+ public AxisError() {
}
/**
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/HTTPLocationBasedDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/HTTPLocationBasedDispatcher.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/HTTPLocationBasedDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/HTTPLocationBasedDispatcher.java Sun Feb 25 11:56:59 2007
@@ -95,8 +95,8 @@
*/
public AxisService findService(MessageContext messageContext) throws AxisFault {
// This Dispatcher does not need to resolve the service, as that is handled
- // by the RequestURIBasedDispatcher.
- return null;
+ // by the RequestURIBasedDispatcher.
+ return null;
}
public void initDispatcher() {
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/HTTPLocationBasedDispatcher.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Handler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Handler.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Handler.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Handler.java Sun Feb 25 11:56:59 2007
@@ -137,7 +137,7 @@
}
public String toString() {
- return description;
+ return description;
}
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java Sun Feb 25 11:56:59 2007
@@ -47,7 +47,7 @@
public AxisOperation findOperation(AxisService service, MessageContext messageContext)
throws AxisFault {
// This Dispatcher does not need to resolve the operation, as that is handled
- // by the RequestURIOperationDispatcher.
+ // by the RequestURIOperationDispatcher.
return null;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIOperationDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIOperationDispatcher.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIOperationDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIOperationDispatcher.java Sun Feb 25 11:56:59 2007
@@ -1,86 +1,86 @@
-/*
-* Copyright 2004,2005 The Apache Software Foundation.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-
-package org.apache.axis2.engine;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.HandlerDescription;
-import org.apache.axis2.description.AxisEndpoint;
-import org.apache.axis2.description.WSDL2Constants;
-import org.apache.axis2.description.AxisBindingOperation;
-import org.apache.axis2.util.Utils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * Dispatches the operation based on the information from the target endpoint URL.
- */
-public class RequestURIOperationDispatcher extends AbstractDispatcher {
-
- public static final String NAME = "RequestURIOperationDispatcher";
- private static final Log log = LogFactory.getLog(RequestURIOperationDispatcher.class);
-
- /*
- * (non-Javadoc)
- * @see org.apache.axis2.engine.AbstractDispatcher#findOperation(org.apache.axis2.description.AxisService, org.apache.axis2.context.MessageContext)
- */
- public AxisOperation findOperation(AxisService service, MessageContext messageContext)
- throws AxisFault {
-
- EndpointReference toEPR = messageContext.getTo();
- if (toEPR != null) {
- String filePart = toEPR.getAddress();
- String[] values = Utils.parseRequestURLForServiceAndOperation(filePart,
- messageContext.getConfigurationContext().getServiceContextPath());
-
- if ((values.length >= 2) && (values[1] != null)) {
- QName operationName = new QName(values[1]);
- log.debug(messageContext.getLogIDString()+" Checking for Operation using QName(target endpoint URI fragment) : " + operationName);
- AxisOperation axisOperation = service.getOperation(operationName);
- return axisOperation;
- } else {
- log.debug(messageContext.getLogIDString()+" Attempted to check for Operation using target endpoint URI, but the operation fragment was missing");
- return null;
- }
- } else {
- log.debug(messageContext.getLogIDString()+" Attempted to check for Operation using null target endpoint URI");
- return null;
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.apache.axis2.engine.AbstractDispatcher#findService(org.apache.axis2.context.MessageContext)
- */
- public AxisService findService(MessageContext messageContext) throws AxisFault {
- // This Dispatcher does not need to resolve the service, as that is handled
- // by the RequestURIBasedDispatcher.
- return null;
- }
-
- public void initDispatcher() {
- init(new HandlerDescription(NAME));
- }
-}
+/*
+* Copyright 2004,2005 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+
+package org.apache.axis2.engine;
+
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.HandlerDescription;
+import org.apache.axis2.description.AxisEndpoint;
+import org.apache.axis2.description.WSDL2Constants;
+import org.apache.axis2.description.AxisBindingOperation;
+import org.apache.axis2.util.Utils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.xml.namespace.QName;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Dispatches the operation based on the information from the target endpoint URL.
+ */
+public class RequestURIOperationDispatcher extends AbstractDispatcher {
+
+ public static final String NAME = "RequestURIOperationDispatcher";
+ private static final Log log = LogFactory.getLog(RequestURIOperationDispatcher.class);
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.axis2.engine.AbstractDispatcher#findOperation(org.apache.axis2.description.AxisService, org.apache.axis2.context.MessageContext)
+ */
+ public AxisOperation findOperation(AxisService service, MessageContext messageContext)
+ throws AxisFault {
+
+ EndpointReference toEPR = messageContext.getTo();
+ if (toEPR != null) {
+ String filePart = toEPR.getAddress();
+ String[] values = Utils.parseRequestURLForServiceAndOperation(filePart,
+ messageContext.getConfigurationContext().getServiceContextPath());
+
+ if ((values.length >= 2) && (values[1] != null)) {
+ QName operationName = new QName(values[1]);
+ log.debug(messageContext.getLogIDString()+" Checking for Operation using QName(target endpoint URI fragment) : " + operationName);
+ AxisOperation axisOperation = service.getOperation(operationName);
+ return axisOperation;
+ } else {
+ log.debug(messageContext.getLogIDString()+" Attempted to check for Operation using target endpoint URI, but the operation fragment was missing");
+ return null;
+ }
+ } else {
+ log.debug(messageContext.getLogIDString()+" Attempted to check for Operation using null target endpoint URI");
+ return null;
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.axis2.engine.AbstractDispatcher#findService(org.apache.axis2.context.MessageContext)
+ */
+ public AxisService findService(MessageContext messageContext) throws AxisFault {
+ // This Dispatcher does not need to resolve the service, as that is handled
+ // by the RequestURIBasedDispatcher.
+ return null;
+ }
+
+ public void initDispatcher() {
+ init(new HandlerDescription(NAME));
+ }
+}
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIOperationDispatcher.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/Messages.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/Messages.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/Messages.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/Messages.java Sun Feb 25 11:56:59 2007
@@ -28,7 +28,7 @@
private static final String resourceName = MessagesConstants.resourceName;
private static final Locale locale = MessagesConstants.locale;
-
+
public static final String DEFAULT_MESSAGE_BUNDLE_KEY = "default";
private static final String NO_MESSAGE_BUNDLE = "Message Bundle is not available";
@@ -37,26 +37,26 @@
private static final ResourceBundle parent =
(MessagesConstants.rootPackageName.equals(packageName))
- ? null
- : MessagesConstants.rootBundle;
-
- private static HashMap messageBundleMap = new HashMap ();
+ ? null
+ : MessagesConstants.rootBundle;
+
+ private static HashMap messageBundleMap = new HashMap();
static {
- MessageBundle defaultMessageBundle =
- new MessageBundle(projectName, packageName, resourceName,
- locale, classLoader, parent);
- addMessageBundle(DEFAULT_MESSAGE_BUNDLE_KEY,defaultMessageBundle);
+ MessageBundle defaultMessageBundle =
+ new MessageBundle(projectName, packageName, resourceName,
+ locale, classLoader, parent);
+ addMessageBundle(DEFAULT_MESSAGE_BUNDLE_KEY, defaultMessageBundle);
}
-
+
/**
* To add a new Message Bundle to the MessageBundle list.
- *
+ *
* @param messageBundleKey The key which will be used to refer to this message bundle later.
- * @param messageBundle The message bundle.
+ * @param messageBundle The message bundle.
*/
- public static void addMessageBundle (String messageBundleKey,MessageBundle messageBundle) {
- messageBundleMap.put(messageBundleKey,messageBundle);
+ public static void addMessageBundle(String messageBundleKey, MessageBundle messageBundle) {
+ messageBundleMap.put(messageBundleKey, messageBundle);
}
/**
@@ -67,7 +67,7 @@
*/
public static String getMessage(String key)
throws MissingResourceException {
- MessageBundle messageBundle = getMessageBundle (DEFAULT_MESSAGE_BUNDLE_KEY);
+ MessageBundle messageBundle = getMessageBundle(DEFAULT_MESSAGE_BUNDLE_KEY);
return messageBundle.getMessage(key);
}
@@ -80,7 +80,7 @@
*/
public static String getMessage(String key, String arg0)
throws MissingResourceException {
- MessageBundle messageBundle = getMessageBundle (DEFAULT_MESSAGE_BUNDLE_KEY);
+ MessageBundle messageBundle = getMessageBundle(DEFAULT_MESSAGE_BUNDLE_KEY);
return messageBundle.getMessage(key, arg0);
}
@@ -94,7 +94,7 @@
*/
public static String getMessage(String key, String arg0, String arg1)
throws MissingResourceException {
- MessageBundle messageBundle = getMessageBundle (DEFAULT_MESSAGE_BUNDLE_KEY);
+ MessageBundle messageBundle = getMessageBundle(DEFAULT_MESSAGE_BUNDLE_KEY);
return messageBundle.getMessage(key, arg0, arg1);
}
@@ -109,7 +109,7 @@
*/
public static String getMessage(String key, String arg0, String arg1, String arg2)
throws MissingResourceException {
- MessageBundle messageBundle = getMessageBundle (DEFAULT_MESSAGE_BUNDLE_KEY);
+ MessageBundle messageBundle = getMessageBundle(DEFAULT_MESSAGE_BUNDLE_KEY);
return messageBundle.getMessage(key, arg0, arg1, arg2);
}
@@ -125,7 +125,7 @@
*/
public static String getMessage(String key, String arg0, String arg1, String arg2, String arg3)
throws MissingResourceException {
- MessageBundle messageBundle = getMessageBundle (DEFAULT_MESSAGE_BUNDLE_KEY);
+ MessageBundle messageBundle = getMessageBundle(DEFAULT_MESSAGE_BUNDLE_KEY);
return messageBundle.getMessage(key, arg0, arg1, arg2, arg3);
}
@@ -142,7 +142,7 @@
*/
public static String getMessage(String key, String arg0, String arg1, String arg2, String arg3, String arg4)
throws MissingResourceException {
- MessageBundle messageBundle = getMessageBundle (DEFAULT_MESSAGE_BUNDLE_KEY);
+ MessageBundle messageBundle = getMessageBundle(DEFAULT_MESSAGE_BUNDLE_KEY);
return messageBundle.getMessage(key, arg0, arg1, arg2, arg3, arg4);
}
@@ -155,36 +155,36 @@
*/
public static String getMessage(String key, String[] args)
throws MissingResourceException {
- MessageBundle messageBundle = getMessageBundle (DEFAULT_MESSAGE_BUNDLE_KEY);
+ MessageBundle messageBundle = getMessageBundle(DEFAULT_MESSAGE_BUNDLE_KEY);
return messageBundle.getMessage(key, args);
}
public static ResourceBundle getResourceBundle() {
- MessageBundle messageBundle = getMessageBundle (DEFAULT_MESSAGE_BUNDLE_KEY);
+ MessageBundle messageBundle = getMessageBundle(DEFAULT_MESSAGE_BUNDLE_KEY);
return messageBundle.getResourceBundle();
}
public static MessageBundle getMessageBundle() {
- return getMessageBundle (DEFAULT_MESSAGE_BUNDLE_KEY);
+ return getMessageBundle(DEFAULT_MESSAGE_BUNDLE_KEY);
}
-
+
public static MessageBundle getMessageBundle(String messageBundleKey) {
- return (MessageBundle) messageBundleMap.get (messageBundleKey);
+ return (MessageBundle) messageBundleMap.get(messageBundleKey);
}
-
+
/**
* Get a message from resource.properties from the package of the given object.
*
* @param messageBundleKey The key for getting the correct message bundle.
- * @param key The resource key
+ * @param key The resource key
* @return The formatted message
*/
- public static String getMessageFromBundle(String messageBundleKey,String key)
+ public static String getMessageFromBundle(String messageBundleKey, String key)
throws MissingResourceException, Exception {
- MessageBundle messageBundle = getMessageBundle (messageBundleKey);
- if (messageBundle==null)
- throw new Exception (NO_MESSAGE_BUNDLE);
-
+ MessageBundle messageBundle = getMessageBundle(messageBundleKey);
+ if (messageBundle == null)
+ throw new Exception(NO_MESSAGE_BUNDLE);
+
return messageBundle.getMessage(key);
}
@@ -192,16 +192,16 @@
* Get a message from resource.properties from the package of the given object.
*
* @param messageBundleKey The key for getting the correct message bundle.
- * @param key The resource key
- * @param arg0 The argument to place in variable {0}
+ * @param key The resource key
+ * @param arg0 The argument to place in variable {0}
* @return The formatted message
*/
- public static String getMessageFromBundle(String messageBundleKey,String key, String arg0)
+ public static String getMessageFromBundle(String messageBundleKey, String key, String arg0)
throws MissingResourceException, Exception {
- MessageBundle messageBundle = getMessageBundle (messageBundleKey);
- if (messageBundle==null)
- throw new Exception (NO_MESSAGE_BUNDLE);
-
+ MessageBundle messageBundle = getMessageBundle(messageBundleKey);
+ if (messageBundle == null)
+ throw new Exception(NO_MESSAGE_BUNDLE);
+
return messageBundle.getMessage(key, arg0);
}
@@ -209,17 +209,17 @@
* Get a message from resource.properties from the package of the given object.
*
* @param messageBundleKey The key for getting the correct message bundle.
- * @param key The resource key
- * @param arg0 The argument to place in variable {0}
- * @param arg1 The argument to place in variable {1}
+ * @param key The resource key
+ * @param arg0 The argument to place in variable {0}
+ * @param arg1 The argument to place in variable {1}
* @return The formatted message
*/
- public static String getMessageFromBundle(String messageBundleKey,String key, String arg0, String arg1)
+ public static String getMessageFromBundle(String messageBundleKey, String key, String arg0, String arg1)
throws MissingResourceException, Exception {
- MessageBundle messageBundle = getMessageBundle (messageBundleKey);
- if (messageBundle==null)
- throw new Exception (NO_MESSAGE_BUNDLE);
-
+ MessageBundle messageBundle = getMessageBundle(messageBundleKey);
+ if (messageBundle == null)
+ throw new Exception(NO_MESSAGE_BUNDLE);
+
return messageBundle.getMessage(key, arg0, arg1);
}
@@ -227,18 +227,18 @@
* Get a message from resource.properties from the package of the given object.
*
* @param messageBundleKey The key for getting the correct message bundle.
- * @param key The resource key
- * @param arg0 The argument to place in variable {0}
- * @param arg1 The argument to place in variable {1}
- * @param arg2 The argument to place in variable {2}
+ * @param key The resource key
+ * @param arg0 The argument to place in variable {0}
+ * @param arg1 The argument to place in variable {1}
+ * @param arg2 The argument to place in variable {2}
* @return The formatted message
*/
- public static String getMessageFromBundle(String messageBundleKey,String key, String arg0, String arg1, String arg2)
+ public static String getMessageFromBundle(String messageBundleKey, String key, String arg0, String arg1, String arg2)
throws MissingResourceException, Exception {
- MessageBundle messageBundle = getMessageBundle (messageBundleKey);
- if (messageBundle==null)
- throw new Exception (NO_MESSAGE_BUNDLE);
-
+ MessageBundle messageBundle = getMessageBundle(messageBundleKey);
+ if (messageBundle == null)
+ throw new Exception(NO_MESSAGE_BUNDLE);
+
return messageBundle.getMessage(key, arg0, arg1, arg2);
}
@@ -246,19 +246,19 @@
* Get a message from resource.properties from the package of the given object.
*
* @param messageBundleKey The key for getting the correct message bundle.
- * @param key The resource key
- * @param arg0 The argument to place in variable {0}
- * @param arg1 The argument to place in variable {1}
- * @param arg2 The argument to place in variable {2}
- * @param arg3 The argument to place in variable {3}
+ * @param key The resource key
+ * @param arg0 The argument to place in variable {0}
+ * @param arg1 The argument to place in variable {1}
+ * @param arg2 The argument to place in variable {2}
+ * @param arg3 The argument to place in variable {3}
* @return The formatted message
*/
- public static String getMessageFromBundle(String messageBundleKey,String key, String arg0, String arg1, String arg2, String arg3)
- throws MissingResourceException, Exception {
- MessageBundle messageBundle = getMessageBundle (messageBundleKey);
- if (messageBundle==null)
- throw new Exception (NO_MESSAGE_BUNDLE);
-
+ public static String getMessageFromBundle(String messageBundleKey, String key, String arg0, String arg1, String arg2, String arg3)
+ throws MissingResourceException, Exception {
+ MessageBundle messageBundle = getMessageBundle(messageBundleKey);
+ if (messageBundle == null)
+ throw new Exception(NO_MESSAGE_BUNDLE);
+
return messageBundle.getMessage(key, arg0, arg1, arg2, arg3);
}
@@ -266,20 +266,20 @@
* Get a message from resource.properties from the package of the given object.
*
* @param messageBundleKey The key for getting the correct message bundle.
- * @param key The resource key
- * @param arg0 The argument to place in variable {0}
- * @param arg1 The argument to place in variable {1}
- * @param arg2 The argument to place in variable {2}
- * @param arg3 The argument to place in variable {3}
- * @param arg4 The argument to place in variable {4}
+ * @param key The resource key
+ * @param arg0 The argument to place in variable {0}
+ * @param arg1 The argument to place in variable {1}
+ * @param arg2 The argument to place in variable {2}
+ * @param arg3 The argument to place in variable {3}
+ * @param arg4 The argument to place in variable {4}
* @return The formatted message
*/
- public static String getMessageFromBundle(String messageBundleKey,String key, String arg0, String arg1, String arg2, String arg3, String arg4)
- throws MissingResourceException, Exception {
- MessageBundle messageBundle = getMessageBundle (messageBundleKey);
- if (messageBundle==null)
- throw new Exception (NO_MESSAGE_BUNDLE);
-
+ public static String getMessageFromBundle(String messageBundleKey, String key, String arg0, String arg1, String arg2, String arg3, String arg4)
+ throws MissingResourceException, Exception {
+ MessageBundle messageBundle = getMessageBundle(messageBundleKey);
+ if (messageBundle == null)
+ throw new Exception(NO_MESSAGE_BUNDLE);
+
return messageBundle.getMessage(key, arg0, arg1, arg2, arg3, arg4);
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/ProjectResourceBundle.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/ProjectResourceBundle.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/ProjectResourceBundle.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/ProjectResourceBundle.java Sun Feb 25 11:56:59 2007
@@ -47,7 +47,7 @@
* Argument values are specified in the various overloaded getString() methods.</p>
*/
public class ProjectResourceBundle extends ResourceBundle {
- private static final Log log = LogFactory.getLog(ProjectResourceBundle.class);
+ private static final Log log = LogFactory.getLog(ProjectResourceBundle.class);
// The static cache of ResourceBundles.
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/modules/PolicyExtension.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/modules/PolicyExtension.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/modules/PolicyExtension.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/modules/PolicyExtension.java Sun Feb 25 11:56:59 2007
@@ -24,6 +24,6 @@
import org.w3c.dom.Element;
public interface PolicyExtension {
- public void addMethodsToStub(Document document, Element element, QName methodName, List assertions);
+ public void addMethodsToStub(Document document, Element element, QName methodName, List assertions);
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseException.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseException.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseException.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseException.java Sun Feb 25 11:56:59 2007
@@ -24,9 +24,9 @@
*/
public class PhaseException extends AxisFault {
- private static final long serialVersionUID = 5690503396724929322L;
+ private static final long serialVersionUID = 5690503396724929322L;
- /**
+ /**
* Constructor PhaseException
*
* @param message
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java Sun Feb 25 11:56:59 2007
@@ -29,7 +29,7 @@
* This is takes care of the IN-OUT sync MEP in the server side
*/
public abstract class AbstractInOutAsyncMessageReceiver extends AbstractMessageReceiver {
- private static final Log log = LogFactory.getLog(AbstractInOutAsyncMessageReceiver.class);
+ private static final Log log = LogFactory.getLog(AbstractInOutAsyncMessageReceiver.class);
public abstract void invokeBusinessLogic(MessageContext inMessage,
MessageContext outMessage) throws AxisFault;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org