jmsnell 2002/12/04 13:32:46
Modified: java/src/org/apache/axis/ime MessageExchange.java
MessageExchangeFactory.java
java/src/org/apache/axis/ime/internal/util/handler
HandlerMessageExchange.java
java/src/org/apache/axis/ime/internal
MessageExchangeImpl.java
MessageExchangeProvider.java
Log:
* Removed FeatureEnabled from MessageExchange.
* Made changes to sync the MessageExchange.getOption() methods
with the Handler.getOption() related methods. Minor change that
will make it easier to bridge between the two.
Revision Changes Path
1.10 +20 -22 xml-axis/java/src/org/apache/axis/ime/MessageExchange.java
Index: MessageExchange.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/ime/MessageExchange.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MessageExchange.java 4 Dec 2002 04:16:15 -0000 1.9
+++ MessageExchange.java 4 Dec 2002 21:32:45 -0000 1.10
@@ -56,9 +56,8 @@
import org.apache.axis.AxisFault;
import org.apache.axis.MessageContext;
-import org.apache.axis.features.FeatureEnabled;
-import java.util.Map;
+import java.util.Hashtable;
/**
* Represents the boundary interface through which messages
@@ -68,8 +67,7 @@
* @author James M Snell ([EMAIL PROTECTED])
* @author Ray Chun ([EMAIL PROTECTED])
*/
-public interface MessageExchange
- extends FeatureEnabled {
+public interface MessageExchange {
/**
* Send an outbound message. (Impl's of this method
@@ -197,38 +195,38 @@
/**
* @param String The id of the property
- * @param Object The value of the property
+ * @param Object The value of the Option
*/
- public void setProperty(
- String propertyId,
- Object propertyValue);
+ public void setOption(
+ String OptionId,
+ Object OptionValue);
/**
- * @param String The id of the property
- * @return Object The value of the property
+ * @param String The id of the Option
+ * @return Object The value of the Option
*/
- public Object getProperty(
- String propertyId);
+ public Object getOption(
+ String OptionId);
/**
- * @param String The id of the property
- * @param Object The default value of the property
- * @return Object The value of the property
+ * @param String The id of the Option
+ * @param Object The default value of the Option
+ * @return Object The value of the Option
*/
- public Object getProperty(
- String propertyId,
+ public Object getOption(
+ String OptionId,
Object defaultValue);
/**
- * @return java.lang.Map The collection of properties
+ * @return java.lang.Hashtable The collection of properties
*/
- public Map getProperties();
+ public Hashtable getOptions();
/**
- * @param java.lang.Map The collection of properties
+ * @param java.lang.Hashtable The collection of properties
*/
- public void setProperties(Map properties);
+ public void setOptions(Hashtable options);
- public void clearProperties();
+ public void clearOptions();
}
1.6 +2 -2
xml-axis/java/src/org/apache/axis/ime/MessageExchangeFactory.java
Index: MessageExchangeFactory.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/ime/MessageExchangeFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MessageExchangeFactory.java 29 Oct 2002 06:39:57 -0000 1.5
+++ MessageExchangeFactory.java 4 Dec 2002 21:32:45 -0000 1.6
@@ -56,7 +56,7 @@
import org.apache.axis.AxisFault;
-import java.util.Map;
+import java.util.Hashtable;
/**
* @author James M Snell ([EMAIL PROTECTED])
@@ -76,7 +76,7 @@
* @return ConfigurableMessageExchange
*/
public MessageExchange createMessageExchange(
- Map properties,
+ Hashtable options,
String[] enabledFeatures)
throws AxisFault;
}
1.6 +28 -0
xml-axis/java/src/org/apache/axis/ime/internal/util/handler/HandlerMessageExchange.java
Index: HandlerMessageExchange.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/ime/internal/util/handler/HandlerMessageExchange.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HandlerMessageExchange.java 19 Nov 2002 21:17:25 -0000 1.5
+++ HandlerMessageExchange.java 4 Dec 2002 21:32:45 -0000 1.6
@@ -55,6 +55,8 @@
package org.apache.axis.ime.internal.util.handler;
+import java.util.Hashtable;
+
import org.apache.axis.Handler;
import org.apache.axis.TargetedChain;
import org.apache.axis.MessageContext;
@@ -167,4 +169,30 @@
}
}
}
+
+ public void clearOptions() {
+ handler.setOptions(null);
+ }
+
+ public Hashtable getOptions() {
+ return handler.getOptions();
+ }
+
+ public Object getOption(String propertyId, Object defaultValue) {
+ Object value = getOption(propertyId);
+ return (value == null) ? defaultValue : value;
+ }
+
+ public Object getOption(String propertyId) {
+ return handler.getOption(propertyId);
+ }
+
+ public void setOptions(Hashtable properties) {
+ handler.setOptions(properties);
+ }
+
+ public void setOption(String propertyId, Object propertyValue) {
+ handler.setOption(propertyId, propertyValue);
+ }
+
}
1.12 +21 -58
xml-axis/java/src/org/apache/axis/ime/internal/MessageExchangeImpl.java
Index: MessageExchangeImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/ime/internal/MessageExchangeImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- MessageExchangeImpl.java 4 Dec 2002 04:16:15 -0000 1.11
+++ MessageExchangeImpl.java 4 Dec 2002 21:32:45 -0000 1.12
@@ -57,7 +57,6 @@
import org.apache.axis.AxisFault;
import org.apache.axis.MessageContext;
-import org.apache.axis.i18n.Messages;
import org.apache.axis.ime.MessageExchange;
import org.apache.axis.ime.MessageExchangeConstants;
import org.apache.axis.ime.MessageExchangeCorrelator;
@@ -70,7 +69,7 @@
import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
-import java.util.Map;
+import java.util.Hashtable;
/**
* @author James M Snell ([EMAIL PROTECTED])
@@ -288,91 +287,55 @@
/**
* Unsupported for now
- * @see org.apache.axis.ime.MessageExchange@enableFeature(featureId)
+ * @see org.apache.axis.ime.MessageExchange@setOption(String,Object)
*/
- public void enableFeature(String featureId)
- throws AxisFault {
- throw new
UnsupportedOperationException(Messages.getMessage("unsupportedOperationException00"));
- }
-
- /**
- * Unsupported for now
- * @see org.apache.axis.ime.MessageExchange@disableFeature(featureId)
- */
- public void disableFeature(String featureId)
- throws AxisFault {
- throw new
UnsupportedOperationException(Messages.getMessage("unsupportedOperationException00"));
- }
-
- /**
- * Unsupported for now
- * @see org.apache.axis.ime.MessageExchange@isFeatureEnabled(featureId)
- */
- public boolean isFeatureEnabled(String featureId)
- throws AxisFault {
- throw new
UnsupportedOperationException(Messages.getMessage("unsupportedOperationException00"));
- }
-
- /**
- * Unsupported for now
- * @see org.apache.axis.ime.MessageExchange@isFeatureEnabled(featureId)
- */
- public String[] getSupportedFeatures()
- throws AxisFault {
- throw new
UnsupportedOperationException(Messages.getMessage("unsupportedOperationException00"));
- }
-
- /**
- * Unsupported for now
- * @see org.apache.axis.ime.MessageExchange@setProperty(String,Object)
- */
- public void setProperty(
- String propertyId,
- Object propertyValue) {
- throw new
UnsupportedOperationException(Messages.getMessage("unsupportedOperationException00"));
+ public void setOption(
+ String OptionId,
+ Object OptionValue) {
+ provider.setOption(OptionId, OptionValue);
}
/**
* Unsupported for now
- * @see org.apache.axis.ime.MessageExchange@getProperty(String)
+ * @see org.apache.axis.ime.MessageExchange@getOption(String)
*/
- public Object getProperty(
- String propertyId) {
- throw new
UnsupportedOperationException(Messages.getMessage("unsupportedOperationException00"));
+ public Object getOption(
+ String OptionId) {
+ return provider.getOption(OptionId);
}
/**
* Unsupported for now
- * @see org.apache.axis.ime.MessageExchange@getProperty(String,Object)
+ * @see org.apache.axis.ime.MessageExchange@getOption(String,Object)
*/
- public Object getProperty(
- String propertyId,
+ public Object getOption(
+ String OptionId,
Object defaultValue) {
- throw new
UnsupportedOperationException(Messages.getMessage("unsupportedOperationException00"));
+ return provider.getOption(OptionId, defaultValue);
}
/**
* Unsupported for now
* @see org.apache.axis.ime.MessageExchange@getProperties()
*/
- public Map getProperties() {
- throw new
UnsupportedOperationException(Messages.getMessage("unsupportedOperationException00"));
+ public Hashtable getOptions() {
+ return provider.getOptions();
}
/**
* Unsupported for now
- * @see org.apache.axis.ime.MessageExchange@setProperties(java.lang.Map)
+ * @see org.apache.axis.ime.MessageExchange@setProperties(java.lang.Hashtable)
*/
- public void setProperties(Map properties) {
- throw new
UnsupportedOperationException(Messages.getMessage("unsupportedOperationException00"));
+ public void setOptions(Hashtable options) {
+ provider.setOptions(options);
}
/**
* Unsupported for now
* @see org.apache.axis.ime.MessageExchange@clearProperties()
*/
- public void clearProperties() {
- throw new
UnsupportedOperationException(Messages.getMessage("unsupportedOperationException00"));
+ public void clearOptions() {
+ provider.clearOptions();
}
1.12 +53 -4
xml-axis/java/src/org/apache/axis/ime/internal/MessageExchangeProvider.java
Index: MessageExchangeProvider.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/ime/internal/MessageExchangeProvider.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- MessageExchangeProvider.java 4 Dec 2002 04:33:33 -0000 1.11
+++ MessageExchangeProvider.java 4 Dec 2002 21:32:45 -0000 1.12
@@ -58,10 +58,8 @@
import org.apache.axis.i18n.Messages;
import org.apache.axis.AxisFault;
import org.apache.axis.Handler;
-import org.apache.axis.MessageContext;
import org.apache.axis.ime.MessageExchange;
import org.apache.axis.ime.MessageExchangeEventListener;
-import org.apache.axis.ime.MessageExchangeCorrelator;
import org.apache.axis.ime.MessageExchangeFactory;
import org.apache.axis.ime.event.MessageSendEvent;
import org.apache.axis.ime.internal.util.KeyedBuffer;
@@ -70,7 +68,7 @@
import org.apache.axis.components.threadpool.ThreadPool;
import org.apache.commons.logging.Log;
-import java.util.Map;
+import java.util.Hashtable;
/**
* @author James M Snell ([EMAIL PROTECTED])
@@ -123,7 +121,7 @@
* Unsupported for now
*/
public MessageExchange createMessageExchange(
- Map properties,
+ Hashtable properties,
String[] enabledFeatures)
throws AxisFault {
throw AxisFault.makeFault(
@@ -228,7 +226,58 @@
}
}
+ /**
+ * Unsupported for now
+ * @see org.apache.axis.ime.MessageExchange@setProperty(String,Object)
+ */
+ public void setOption(
+ String propertyId,
+ Object propertyValue) {
+ throw new
UnsupportedOperationException(Messages.getMessage("unsupportedOperationException00"));
+ }
+
+ /**
+ * Unsupported for now
+ * @see org.apache.axis.ime.MessageExchange@getProperty(String)
+ */
+ public Object getOption(
+ String propertyId) {
+ throw new
UnsupportedOperationException(Messages.getMessage("unsupportedOperationException00"));
+ }
+
+ /**
+ * Unsupported for now
+ * @see org.apache.axis.ime.MessageExchange@getProperty(String,Object)
+ */
+ public Object getOption(
+ String propertyId,
+ Object defaultValue) {
+ throw new
UnsupportedOperationException(Messages.getMessage("unsupportedOperationException00"));
+ }
+ /**
+ * Unsupported for now
+ * @see org.apache.axis.ime.MessageExchange@getProperties()
+ */
+ public Hashtable getOptions() {
+ throw new
UnsupportedOperationException(Messages.getMessage("unsupportedOperationException00"));
+ }
+
+ /**
+ * Unsupported for now
+ * @see org.apache.axis.ime.MessageExchange@setProperties(java.langHashtable)
+ */
+ public void setOptions(Hashtable properties) {
+ throw new
UnsupportedOperationException(Messages.getMessage("unsupportedOperationException00"));
+ }
+
+ /**
+ * Unsupported for now
+ * @see org.apache.axis.ime.MessageExchange@clearProperties()
+ */
+ public void clearOptions() {
+ throw new
UnsupportedOperationException(Messages.getMessage("unsupportedOperationException00"));
+ }
// -- Worker Classes --- //
public static class MessageReceiver
