jmsnell 2002/12/03 20:16:16
Modified: java/src/org/apache/axis/ime MessageExchange.java
MessageExchangeCorrelator.java
java/src/org/apache/axis/ime/internal
MessageExchangeImpl.java
java build.xml
Added: java/src/org/apache/axis/features FeatureEnabled.java readme
FeatureNotSupportedException.java
java/src/org/apache/axis/ime/internal
SimpleMessageExchangeCorrelator.java
Removed: java/src/org/apache/axis/ime FeatureEnabled.java
Log:
* Minor changes to ime packages
* Added a new >provisional< org.apache.axis.features package that is filtered out
using the compile.ime option
* Moved the FeatureEnabled interface to the org.apache.axis.features package
* Made MessageExchangeCorrelator an interface and created
SimpleMessageExchangeCorrelator as the basic impl
Revision Changes Path
1.9 +1 -0 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MessageExchange.java 18 Nov 2002 20:07:32 -0000 1.8
+++ MessageExchange.java 4 Dec 2002 04:16:15 -0000 1.9
@@ -56,6 +56,7 @@
import org.apache.axis.AxisFault;
import org.apache.axis.MessageContext;
+import org.apache.axis.features.FeatureEnabled;
import java.util.Map;
1.4 +4 -16
xml-axis/java/src/org/apache/axis/ime/MessageExchangeCorrelator.java
Index: MessageExchangeCorrelator.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/ime/MessageExchangeCorrelator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MessageExchangeCorrelator.java 28 Oct 2002 21:45:59 -0000 1.3
+++ MessageExchangeCorrelator.java 4 Dec 2002 04:16:15 -0000 1.4
@@ -63,21 +63,9 @@
*
* @author James M Snell ([EMAIL PROTECTED])
*/
-public class MessageExchangeCorrelator
- implements Serializable {
-
- private String identifier;
-
- private MessageExchangeCorrelator() {
- }
-
- public MessageExchangeCorrelator(
- String identifier) {
- this.identifier = identifier;
- }
-
- public String getIdentifier() {
- return this.identifier;
- }
+public interface MessageExchangeCorrelator
+ extends Serializable {
+
+ public String getIdentifier();
}
1.1 xml-axis/java/src/org/apache/axis/features/FeatureEnabled.java
Index: FeatureEnabled.java
===================================================================
package org.apache.axis.features;
import org.apache.axis.AxisFault;
/**
* A "feature" is a collection of behaviors such as
* reliable delivery, WS-Security support, etc that
* may be enabled or disabled. Enabling a feature may
* involve adding handlers to chain, setting properties,
* etc. The point is to make it easier to enable/disable
* complex behaviors
*
* @author James M Snell ([EMAIL PROTECTED])
*/
public interface FeatureEnabled {
/**
* @param String The id of the feature to enable
* @throws AxisFault
*/
public void enableFeature(String featureId)
throws AxisFault;
/**
* @param String The id of the feature to disable
* @throws AxisFault
*/
public void disableFeature(String featureId)
throws AxisFault;
/**
* @param String The id of the feature to check
* @return boolean
* @throws AxisFault
*/
public boolean isFeatureEnabled(String featureId)
throws AxisFault;
/**
* @return String[]
* @throws AxisFault
*/
public String[] getSupportedFeatures()
throws AxisFault;
}
1.1 xml-axis/java/src/org/apache/axis/features/readme
Index: readme
===================================================================
This package is provisional until we work out a fully thought out
approach to supporting features
1.1
xml-axis/java/src/org/apache/axis/features/FeatureNotSupportedException.java
Index: FeatureNotSupportedException.java
===================================================================
package java.src.org.apache.axis.features;
public class FeatureNotSupportedException
extends Exception {
public FeatureNotSupportedException() {
super();
}
public FeatureNotSupportedException(String message) {
super(message);
}
}
1.11 +1 -1
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MessageExchangeImpl.java 18 Nov 2002 20:07:32 -0000 1.10
+++ MessageExchangeImpl.java 4 Dec 2002 04:16:15 -0000 1.11
@@ -116,7 +116,7 @@
(MessageExchangeCorrelator) context.getProperty(
MessageExchangeConstants.MESSAGE_CORRELATOR_PROPERTY);
if (correlator == null) {
- correlator = new MessageExchangeCorrelator(
+ correlator = new SimpleMessageExchangeCorrelator(
UUIDGenFactory.getUUIDGen(null).nextUUID());
context.setProperty(
MessageExchangeConstants.MESSAGE_CORRELATOR_PROPERTY,
1.1
xml-axis/java/src/org/apache/axis/ime/internal/SimpleMessageExchangeCorrelator.java
Index: SimpleMessageExchangeCorrelator.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Axis" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.axis.ime.internal;
import org.apache.axis.ime.MessageExchangeCorrelator;
/**
* Used for correlating outbound/inbound messages.
* This class may be extended to allow for more complex
* Correlation mechanisms
*
* @author James M Snell ([EMAIL PROTECTED])
*/
public class SimpleMessageExchangeCorrelator
implements MessageExchangeCorrelator {
private String identifier;
private SimpleMessageExchangeCorrelator() {
}
public SimpleMessageExchangeCorrelator(
String identifier) {
this.identifier = identifier;
}
public String getIdentifier() {
return this.identifier;
}
}
1.216 +7 -1 xml-axis/java/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/build.xml,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- build.xml 22 Nov 2002 23:14:35 -0000 1.215
+++ build.xml 4 Dec 2002 04:16:16 -0000 1.216
@@ -138,8 +138,14 @@
<exclude name="**/javax/xml/rpc/server/Servlet*.java"
unless="servlet.present"/>
<exclude name="**/*TestSuite.java" unless="junit.present"/>
<exclude name="**/org/apache/axis/encoding/ser/castor/*.java"
unless="castor.present"/>
- <exclude name="**/org/apache/axis/ime/**/*" unless="compile.ime" />
<exclude name="**/org/apache/axis/test/AxisTestBase.java"
unless="junit.present"/>
+
+ <!-- Work-In-Progress Items
+ These packages will be excluded from the build unless
+ the compileime environment variable is set to "true" -->
+ <exclude name="**/org/apache/axis/ime/**/*" unless="compile.ime" />
+ <exclude name="**/org/apache/axis/features/**/*" unless="compile.ime" />
+
</javac>
<copy file="${src.dir}/org/apache/axis/server/server-config.wsdd"
toDir="${build.dest}/org/apache/axis/server"/>
