synapse-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asan...@apache.org
Subject svn commit: r577213 [1/5] - in /webservices/synapse/trunk/java/modules: core/src/main/java/org/apache/synapse/ core/src/main/java/org/apache/synapse/config/ core/src/main/java/org/apache/synapse/config/xml/ core/src/main/java/org/apache/synapse/config/...
Date Wed, 19 Sep 2007 09:09:14 GMT
Author: asankha
Date: Wed Sep 19 02:09:01 2007
New Revision: 577213

URL: http://svn.apache.org/viewvc?rev=577213&view=rev
Log:
Refactor the Constants interfaces to SynapseConstants and XMLConfigConstants classes

Added:
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java   (contents, props changed)
      - copied, changed from r574820, webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Constants.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigConstants.java   (contents, props changed)
      - copied, changed from r574820, webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/Constants.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/metrics/MetricsConstants.java   (contents, props changed)
      - copied, changed from r574820, webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/metrics/Constants.java
Removed:
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Constants.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/Constants.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/metrics/Constants.java
Modified:
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/FaultHandler.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigurationBuilder.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Util.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConfigurationFactoryAndSerializerFinder.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntryFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorPropertyFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceSerializer.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMSequenceMediatorFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistryFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistrySerializer.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationSerializer.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationSerializer.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XSLTMediatorFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointAbstractFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointSerializer.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointSerializer.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointSerializer.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/LoadbalanceAlgorithmFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AnonymousServiceFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AsyncCallback.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/MessageContextCreatorForAxis2.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseStartUpServlet.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/TimeoutHandler.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AddressEndpoint.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/utils/EndpointDefinition.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/MediatorProperty.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SynapseMediator.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/DropMediator.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/POJOCommandMediator.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/FilterMediator.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/InMediator.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/OutMediator.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/metrics/GlobalRequestCountHandler.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/metrics/MetricsAggregatorModule.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzSerializer.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/StatisticsCollector.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/StatisticsHolder.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/StatisticsUtils.java
    webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java
    webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/base/SequenceMediatorTest.java
    webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/HeaderMediatorTest.java
    webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java
    webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/attachment/AttachmentMediatorFactory.java
    webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java
    webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactory.java
    webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/dblookup/DBLookupMediatorFactory.java
    webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/dbreport/DBReportMediatorFactory.java
    webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java
    webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java
    webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java
    webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediator.java
    webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorFactory.java
    webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializer.java
    webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMessageContext.java
    webservices/synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/handler/SynapseInHandler.java
    webservices/synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/handler/SynapseModule.java
    webservices/synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/handler/SynapseOutHandler.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_0_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_100_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_101_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_102_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_103_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_104_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_10_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_110_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_111_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_112_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_113_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_114_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_11_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_1_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_2_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_3_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_4_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_500_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_501_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_502_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_503_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_50_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_510_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_51_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_52_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_53_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_54_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_55_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_56_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_57_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_5_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_600_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_60_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_6_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_7_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_8_Integration.java
    webservices/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/SynapseSample_9_Integration.java

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/FaultHandler.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/FaultHandler.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/FaultHandler.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/FaultHandler.java Wed Sep 19 02:09:01 2007
@@ -49,14 +49,14 @@
 
     public void handleFault(MessageContext synCtx, Exception e) {
 
-        if (synCtx.getProperty(Constants.ERROR_CODE) == null) {
-            synCtx.setProperty(Constants.ERROR_CODE, "00000");
+        if (synCtx.getProperty(SynapseConstants.ERROR_CODE) == null) {
+            synCtx.setProperty(SynapseConstants.ERROR_CODE, "00000");
         }
-        if (synCtx.getProperty(Constants.ERROR_MESSAGE) == null) {
+        if (synCtx.getProperty(SynapseConstants.ERROR_MESSAGE) == null) {
             // use only the first line as the message for multiline exception messages (Axis2 has these)
-            synCtx.setProperty(Constants.ERROR_MESSAGE, e.getMessage().split("\n")[0]);
+            synCtx.setProperty(SynapseConstants.ERROR_MESSAGE, e.getMessage().split("\n")[0]);
         }
-        synCtx.setProperty(Constants.ERROR_DETAIL, getStackTrace(e));
+        synCtx.setProperty(SynapseConstants.ERROR_DETAIL, getStackTrace(e));
 
         try {
             onFault(synCtx);

Copied: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java (from r574820, webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Constants.java)
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java?p2=webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java&p1=webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Constants.java&r1=574820&r2=577213&rev=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Constants.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java Wed Sep 19 02:09:01 2007
@@ -23,207 +23,163 @@
 import org.apache.axiom.om.OMNamespace;
 
 /**
- * Global constants for the Synapse project
+ * Global constants for the Apache Synapse project
  */
-public interface Constants {
+public final class SynapseConstants {
 
     /** The Synapse namespace */
     public static final String SYNAPSE_NAMESPACE = "http://ws.apache.org/ns/synapse";
-
-    public static final String MAIN_SEQUENCE_KEY  = "main";
-    public static final String FAULT_SEQUENCE_KEY = "fault";
-
+    /** An OMNamespace object for the Synapse NS */
     public static final OMNamespace SYNAPSE_OMNAMESPACE =
             OMAbstractFactory.getOMFactory().createOMNamespace(SYNAPSE_NAMESPACE, "syn");
 
-    // -- keys related to Axis2 configuration and Synapse initialization --
-    /** The key name used to store the Synapse configuration into the Axis2 config */
-    String SYNAPSE_CONFIG = "synapse.config";
-
-    /** The key name used to store the Synapse environment into the Axis2 config */
-    String SYNAPSE_ENV = "synapse.env";
-
-    /** The system property used to specify/override the synapse configuration XML location */
-    String SYNAPSE_XML = "synapse.xml";
-
-    /** The system property used to specify/override the synapse home location */
-    String SYNAPSE_HOME = "synapse.home";
-   
-    /** a message context property set to hold the relates to for POX responses */
-    String RELATES_TO_FOR_POX = "RelatesToForPox";
-
-    /** If the message context contains a Boolean.TRUE with this key, WS-A would be turned on send */
-    String OUTFLOW_ADDRESSING_ON = "OUTFLOW_ADDRESSING_ON";
-
-    /** If the message context contains a Boolean.TRUE with this key, RM would be turned on send */
-    String OUTFLOW_RM_ON = "OUTFLOW_RM_ON";
-
-    /** The message context property name which holds the RM 'Policy' object for outgoing messages */
-    String OUTFLOW_RM_POLICY = "OUTFLOW_RM_POLICY";
-
-    /** If the message context contains a Boolean.TRUE with this key, Rampart would be engaged on send */
-    String OUTFLOW_SECURITY_ON = "OUTFLOW_SECURITY_ON";
-
-    /** The message context property name which holds the Security 'Policy' object for outgoing messages */
-    String OUTFLOW_SEC_POLICY = "OUTFLOW_SEC_POLICY";
-    
-
-    // -- Synapse message context property keys --
-    /** The scope for the synapse message context properties */
-    String SCOPE_DEFAULT = "default";
-    
-    /**
-     * The scope for a set-property mediator, when the property should be set
-     *  on the underlying Axis2 message context
-     */
-    String SCOPE_AXIS2 = "axis2";
-
-    /**
-     * The scope for a set-property mediator, when the property should be set
-     *  on the underlying transport 
-     */
-    String SCOPE_TRANSPORT = "transport";
-
-    /** An string name which holds the out sequence property in the MessageContext */
-    String PROXY_SERVICE = "proxy.name";
-
-    /** A key with this name on the message context set to Boolean.TRUE, indicates that this is a response */
-    String ISRESPONSE_PROPERTY = "synapse.isresponse";
-
-    /** If message context property contains Boolean.TRUE then Axis2 will send this with a separate listener engaged **/
-    public static final String OUTFLOW_USE_SEPARATE_LISTENER = "OUTFLOW_USE_SEPARATE_LISTENER";
-    
-    /** The message context property name which holds the error code for the last encountered exception */
-    String ERROR_CODE = "ERROR_CODE";
-
-    /** The message context property name which holds the error message for the last encountered exception */
-    String ERROR_MESSAGE = "ERROR_MESSAGE";
-
-    /** The message context property name which holds the error detail (stack trace) for the last encountered exception */
-    String ERROR_DETAIL = "ERROR_DETAIL";
+    /** The name of the main sequence for message mediation */
+    public static final String MAIN_SEQUENCE_KEY  = "main";
+    /** The name of the fault sequence to execute on failures during mediation */
+    public static final String FAULT_SEQUENCE_KEY = "fault";
 
-    // -- names of modules to be engaged at runtime --
+    //- names of modules to be engaged at runtime -
     /** The Name of the WS-RM Sandesha module */
-    String SANDESHA2_MODULE_NAME = "sandesha2";
-
+    public static final String SANDESHA2_MODULE_NAME = "sandesha2";
     /** The Name of the WS-A Addressing module */
-    String ADDRESSING_MODULE_NAME = "addressing";
-
+    public static final String ADDRESSING_MODULE_NAME = "addressing";
     /** The Name of the WS-Security Rampart module */
-    String RAMPART_MODULE_NAME = "rampart";
+    public static final String RAMPART_MODULE_NAME = "rampart";
 
-    /** Refers the To header */
-    String HEADER_TO = "To";
-    /** Refers the From header */
-    String HEADER_FROM = "From";
-    /** Refers the FaultTo header */
-    String HEADER_FAULT = "FaultTo";
-    /** Refers the Action header */
-    String HEADER_ACTION = "Action";
-    /** Refers the ReplyTo header */
-    String HEADER_REPLY_TO = "ReplyTo";
-    /** Refers the MessageID header */
-    String HEADER_MESSAGE_ID = "MessageID";
-
-    String RESPONSE = "RESPONSE";
-
-    String OUT_ONLY = "OUT_ONLY";
-
-    /** The tracing state -off */
-    int TRACING_OFF =0;
-    /** The tracing state-on */
-    int TRACING_ON =1;
-    /** The tracing state-unset */
-    int TRACING_UNSET=2;
-    /** Tracing logger */
-    String TRACE_LOGGER ="TRACE_LOGGER";
-
-    //  -- Synapse property values for WS-RM sequence handling --
-    /** WS-RM version 1.0*/
-    String SEQUENCE_VERSION_1_0 = "1.0";
-    /** WS-RM version 1.1*/
-    String SEQUENCE_VERSION_1_1 = "1.1";
-
-    /** Sandesha last message property name */
-    String SANDESHA_LAST_MESSAGE = "Sandesha2LastMessage";
-    /** Sandesha last sequence key property name */
-    String SANDESHA_SEQUENCE_KEY = "Sandesha2SequenceKey";
-    /** Sandesha WS-RM specification version property name */
-    String SANDESHA_SPEC_VERSION = "Sandesha2RMSpecVersion";
-
-    /** The statistics state -off */
-    int STATISTICS_OFF =0;
-    /** The statistics state-on */
-    int STATISTICS_ON =1;
-    /** The statistics state-unset */
-    int STATISTICS_UNSET=2;
-
-    String SYNAPSE_ERROR ="syapse_error" ;
-
-    /** key for lookup sequence statistics stack */
-    String SEQUENCE_STATISTICS_STACK ="sequence_statistics_stack";
-
-    /** key for lookup Proxy Service statistics stack */
-    String PROXYSERVICE_STATISTICS_STACK ="proxyservice_statistics_stack";
-
-    /** key for lookup Proxy Service statistics stack */
-    String SYNAPSESERVICE_STATISTICS_STACK ="synapseservice_statistics_stack";      
-
-    /** key for lookup Endpoint statistics stack */
-    String ENDPOINT_STATISTICS_STACK ="endpoint_statistics_stack";
-
-    /** Sequence statistics category*/
-    int  SEQUENCE_STATISTICS = 0;
-
-    /** Proxy Service statistics category */
-    int  PROXYSERVICE_STATISTICS = 1;
-
-    /** Endpoint statistics category*/
-    int ENDPOINT_STATISTICS = 2;
-
-    /**
-     * Interval for activating the timeout handler for cleaning up expired requests. Note that
-     * there can be an error as large as the value of the interval. But for smaller intervals and
-     * larger timeouts this error is negligable.
-     */
-    long TIMEOUT_HANDLER_INTERVAL = 1000;
-
-    /**
-     * don't do anything for response timeouts. this means infinite timeout. this is the default
-     * action, if the timeout configuration is not explicitly set.
-     */
-    int NONE = 100;
-
-    /** Discard the callback if the timeout for the response is expired */
-    int DISCARD = 101;
-
-    /**
-     * Discard the callback and activate specified fault sequence if the timeout for the response
-     * is expired
-     */
-    int DISCARD_AND_FAULT = 102;
-
-    /**
-     * Error codes for message sending. We go with closest HTTP fault codes.
-     */
-    String TIME_OUT = "504";
-    String SENDING_FAULT = "503";
+    //- Standard headers that can be read as get-property('header')-
+    /** Refers to the To header */
+    public static final String HEADER_TO = "To";
+    /** Refers to the From header */
+    public static final String HEADER_FROM = "From";
+    /** Refers to the FaultTo header */
+    public static final String HEADER_FAULT = "FaultTo";
+    /** Refers to the Action header */
+    public static final String HEADER_ACTION = "Action";
+    /** Refers to the ReplyTo header */
+    public static final String HEADER_REPLY_TO = "ReplyTo";
+    /** Refers to the MessageID header */
+    public static final String HEADER_MESSAGE_ID = "MessageID";
+
+    /** The Axis2 client options property name for the Rampart policy */
+    public static final String RAMPART_POLICY = "rampartPolicy";
+    /** The Axis2 client options property name for the Sandesha policy */
+	public static final String SANDESHA_POLICY = "sandeshaPolicy";
+
+    /** The name of the Parameter set on the Axis2Configuration to hold the Synapse Configuration */
+    public static final String SYNAPSE_CONFIG = "synapse.config";
+    /** The name of the Parameter set on the Axis2Configuration to hold the Synapse Environment */
+    public static final String SYNAPSE_ENV = "synapse.env";
+
+    /** The name of the system property that will hold the Synapse home directory */
+    public static final String SYNAPSE_HOME = "synapse.home";
+    /** The name of the system property used to specify/override the synapse config XML location */
+    public static final String SYNAPSE_XML = "synapse.xml";
+
+    //- Synapse Message Context Properties -
+        /** The Synapse MC property name that holds the name of the Proxy service thats handling it */
+        public static final String PROXY_SERVICE = "proxy.name";
+        /** The Synapse MC property that marks it as a RESPONSE */
+        public static final String RESPONSE = "RESPONSE";
+        /** The Synapse MC property that marks the message as a OUT_ONLY message */
+        public static final String OUT_ONLY = "OUT_ONLY";
+
+        //-- error handling --
+        /** The message context property name which holds the error code for the last encountered exception */
+        public static final String ERROR_CODE = "ERROR_CODE";
+        /** The MC property name which holds the error message for the last encountered exception */
+        public static final String ERROR_MESSAGE = "ERROR_MESSAGE";
+        /** The message context property name which holds the error detail (stack trace) for the last encountered exception */
+        public static final String ERROR_DETAIL = "ERROR_DETAIL";
+
+        /** Sandesha last message property name */
+        public static final String SANDESHA_LAST_MESSAGE = "Sandesha2LastMessage";
+        /** Sandesha last sequence key property name */
+        public static final String SANDESHA_SEQUENCE_KEY = "Sandesha2SequenceKey";
+        /** Sandesha WS-RM specification version property name */
+        public static final String SANDESHA_SPEC_VERSION = "Sandesha2RMSpecVersion";
+
+    //- Axis2 Message Context Properties used by Synapse -
+    /** an axis2 message context property set to hold the relates to for POX responses */
+    public static final String RELATES_TO_FOR_POX = "synapse.RelatesToForPox";
+
+    /** an axis2 message context property set to indicate this is a response message for Synapse */
+    public static final String ISRESPONSE_PROPERTY = "synapse.isresponse";
+
+
+    //- tracing and statistics constants -
+        /** Tracing logger name */
+        public static final String TRACE_LOGGER ="TRACE_LOGGER";
+
+        /** The tracing state -off */
+        public static final int TRACING_OFF =0;
+        /** The tracing state-on */
+        public static final int TRACING_ON =1;
+        /** The tracing state-unset */
+        public static final int TRACING_UNSET=2;
+
+        /** The statistics state -off */
+        public static final int STATISTICS_OFF =0;
+        /** The statistics state-on */
+        public static final int STATISTICS_ON =1;
+        /** The statistics state-unset */
+        public static final int STATISTICS_UNSET=2;
+
+        /** key for lookup sequence statistics stack */
+        public static final String SEQUENCE_STATISTICS_STACK ="sequence_statistics_stack";
+
+        /** key for lookup Proxy Service statistics stack */
+        public static final String PROXYSERVICE_STATISTICS_STACK ="proxyservice_statistics_stack";
+
+        /** key for lookup Proxy Service statistics stack */
+        public static final String SYNAPSESERVICE_STATISTICS_STACK ="synapseservice_statistics_stack";
+
+        /** key for lookup Endpoint statistics stack */
+        public static final String ENDPOINT_STATISTICS_STACK ="endpoint_statistics_stack";
+
+        /** Sequence statistics category*/
+        public static final int  SEQUENCE_STATISTICS = 0;
+
+        /** Proxy Service statistics category */
+        public static final int  PROXYSERVICE_STATISTICS = 1;
+
+        /** Endpoint statistics category*/
+        public static final int ENDPOINT_STATISTICS = 2;
+
+    //- handling of timed out events from the callbacks -
+        /**
+         * Interval for activating the timeout handler for cleaning up expired requests. Note that
+         * there can be an error as large as the value of the interval. But for smaller intervals
+         * and larger timeouts this error is negligable.
+         */
+        public static final long TIMEOUT_HANDLER_INTERVAL = 1000;
+
+        /**
+         * don't do anything for response timeouts. this means infinite timeout. this is the default
+         * action, if the timeout configuration is not explicitly set.
+         */
+        public static final int NONE = 100;
+
+        /** Discard the callback if the timeout for the response is expired */
+        public static final int DISCARD = 101;
+
+        /**
+         * Discard the callback and activate specified fault sequence if the timeout for the response
+         * is expired
+         */
+        public static final int DISCARD_AND_FAULT = 102;
+
+        /**
+         * Error codes for message sending. We go with closest HTTP fault codes.
+         */
+        public static final String TIME_OUT = "504";
+        public static final String SENDING_FAULT = "503";
 
+    //- Endpoints processing constants -
     /** Property name to store the last endpoint through which the message has flowed */
-    String PROCESSED_ENDPOINT = "processed_endpoint";
-    /**  Anonymous Endpoint key   */
-    String ANONYMOUS_ENDPOINTS = "AnonymousEndpoints";
-    /** Anonymous Sequence  key   */
-    String ANONYMOUS_SEQUENCES = "AnonymousSequences";
-    /** Anonymous ProxyServices key   */
-    String ANONYMOUS_PROXYSERVICES = "AnonymousProxyServices";
-
-    /** Property key for the aggregation corelation */
-    String AGGREGATE_CORELATION = "aggregateCorelation";
-
-    /** Property key for the message sequence details in an aggregation */
-    String MESSAGE_SEQUENCE = "messageSequence";
+    public static final String PROCESSED_ENDPOINT = "processed_endpoint";
+    /** A name to use for anonymous endpoints */
+    public static final String ANONYMOUS_ENDPOINTS = "AnonymousEndpoints";
 
-    /** String message sequence delemiter */
-    String MESSAGE_SEQUENCE_DELEMITER = "/";
+    /** A name to use for anonymous sequences in the sequence stack */
+    public static final String ANONYMOUS_SEQUENCES = "AnonymousSequences";
 }

Propchange: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java Wed Sep 19 02:09:01 2007
@@ -23,7 +23,7 @@
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
 import org.apache.synapse.ManagedLifecycle;
 import org.apache.synapse.Mediator;
 import org.apache.synapse.SynapseException;
@@ -178,7 +178,7 @@
 	 * @return the main mediator sequence
 	 */
 	public Mediator getMainSequence() {
-		return getSequence(Constants.MAIN_SEQUENCE_KEY);
+		return getSequence(SynapseConstants.MAIN_SEQUENCE_KEY);
 	}
 
 	/**
@@ -188,7 +188,7 @@
 	 * @return the fault sequence
 	 */
 	public Mediator getFaultSequence() {
-		return getSequence(Constants.FAULT_SEQUENCE_KEY);
+		return getSequence(SynapseConstants.FAULT_SEQUENCE_KEY);
 	}
 
 	/**

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigurationBuilder.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigurationBuilder.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigurationBuilder.java Wed Sep 19 02:09:01 2007
@@ -21,7 +21,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
 import org.apache.synapse.SynapseException;
 import org.apache.synapse.config.xml.XMLConfigurationBuilder;
 import org.apache.synapse.mediators.base.SynapseMediator;
@@ -35,7 +35,7 @@
 /**
  * Builds a Synapse Configuration model with a given input (e.g. XML, programmatic creation, default etc)
  */
-public class SynapseConfigurationBuilder implements Constants {
+public class SynapseConfigurationBuilder {
 
     private static Log log = LogFactory.getLog(SynapseConfigurationBuilder.class);
 

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Util.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Util.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Util.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Util.java Wed Sep 19 02:09:01 2007
@@ -24,7 +24,7 @@
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseConstants;
 import org.apache.synapse.SynapseException;
 
 import javax.xml.stream.XMLInputFactory;
@@ -119,7 +119,7 @@
                         log.debug("Can not open a connection to the URL with a path :" +
                                   path);
                     }
-                    String synapseHome = System.getProperty(Constants.SYNAPSE_HOME);
+                    String synapseHome = System.getProperty(SynapseConstants.SYNAPSE_HOME);
                     if (synapseHome != null) {
                         if (log.isDebugEnabled()) {
                             log.debug("Trying  to resolve an absolute path of the " +
@@ -259,7 +259,7 @@
                         log.debug("Can not open a connection to the URL with a path :" +
                                   path);
                     }
-                    String synapseHome = System.getProperty(Constants.SYNAPSE_HOME);
+                    String synapseHome = System.getProperty(SynapseConstants.SYNAPSE_HOME);
                     if (synapseHome != null) {
                         if (synapseHome.endsWith("/")) {
                             synapseHome = synapseHome.substring(0, synapseHome.lastIndexOf("/"));

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java Wed Sep 19 02:09:01 2007
@@ -36,15 +36,15 @@
     protected void initMediator(Mediator mediator, OMElement mediatorOmElement) {
 
         OMAttribute trace = mediatorOmElement.getAttribute(
-            new QName(Constants.NULL_NAMESPACE, Constants.TRACE_ATTRIB_NAME));
+            new QName(XMLConfigConstants.NULL_NAMESPACE, XMLConfigConstants.TRACE_ATTRIB_NAME));
 
         if (trace != null) {
             String traceValue = trace.getAttributeValue();
             if (traceValue != null) {
-                if (traceValue.equals(Constants.TRACE_ENABLE)) {
-                    mediator.setTraceState(org.apache.synapse.Constants.TRACING_ON);
-                } else if (traceValue.equals(Constants.TRACE_DISABLE)) {
-                    mediator.setTraceState(org.apache.synapse.Constants.TRACING_OFF);
+                if (traceValue.equals(XMLConfigConstants.TRACE_ENABLE)) {
+                    mediator.setTraceState(org.apache.synapse.SynapseConstants.TRACING_ON);
+                } else if (traceValue.equals(XMLConfigConstants.TRACE_DISABLE)) {
+                    mediator.setTraceState(org.apache.synapse.SynapseConstants.TRACING_OFF);
                 }
             }
         }

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java Wed Sep 19 02:09:01 2007
@@ -36,8 +36,8 @@
 public abstract class AbstractMediatorSerializer implements MediatorSerializer {
 
     protected static final OMFactory fac = OMAbstractFactory.getOMFactory();
-    protected static final OMNamespace synNS = fac.createOMNamespace(Constants.SYNAPSE_NAMESPACE, "syn");
-    protected static final OMNamespace nullNS = fac.createOMNamespace(Constants.NULL_NAMESPACE, "");
+    protected static final OMNamespace synNS = fac.createOMNamespace(XMLConfigConstants.SYNAPSE_NAMESPACE, "syn");
+    protected static final OMNamespace nullNS = fac.createOMNamespace(XMLConfigConstants.NULL_NAMESPACE, "");
     private static final Log log = LogFactory.getLog(AbstractMediatorSerializer.class);
 
     /**
@@ -50,14 +50,14 @@
     protected static void finalizeSerialization(OMElement mediatorOmElement, Mediator mediator) {
         int traceState = mediator.getTraceState();
         String traceValue = null;
-        if (traceState == org.apache.synapse.Constants.TRACING_ON) {
-            traceValue = Constants.TRACE_ENABLE;
-        } else if (traceState == org.apache.synapse.Constants.TRACING_OFF) {
-            traceValue = Constants.TRACE_DISABLE;
+        if (traceState == org.apache.synapse.SynapseConstants.TRACING_ON) {
+            traceValue = XMLConfigConstants.TRACE_ENABLE;
+        } else if (traceState == org.apache.synapse.SynapseConstants.TRACING_OFF) {
+            traceValue = XMLConfigConstants.TRACE_DISABLE;
         }
         if (traceValue != null) {
             mediatorOmElement.addAttribute(fac.createOMAttribute(
-                Constants.TRACE_ATTRIB_NAME, nullNS, traceValue));
+                XMLConfigConstants.TRACE_ATTRIB_NAME, nullNS, traceValue));
         }
 
     }
@@ -97,7 +97,7 @@
         while (iter.hasNext()) {
             String prefix = (String) iter.next();
             String uri = xpath.getNamespaceContext().translateNamespacePrefixToUri(prefix);
-            if (!Constants.SYNAPSE_NAMESPACE.equals(uri)) {
+            if (!XMLConfigConstants.SYNAPSE_NAMESPACE.equals(uri)) {
                 elem.declareNamespace(uri, prefix);
             }
         }

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ClassMediatorFactory.java Wed Sep 19 02:09:01 2007
@@ -45,7 +45,7 @@
 
     private static final Log log = LogFactory.getLog(ClassMediatorFactory.class);
 
-    private static final QName CLASS_Q = new QName(Constants.SYNAPSE_NAMESPACE,
+    private static final QName CLASS_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE,
             "class");
 
     public Mediator createMediator(OMElement elem) {
@@ -53,7 +53,7 @@
         ClassMediator classMediator = new ClassMediator();
 
         OMAttribute name = elem.getAttribute(new QName(
-                Constants.NULL_NAMESPACE, "name"));
+                XMLConfigConstants.NULL_NAMESPACE, "name"));
         if (name == null) {
             String msg = "The name of the actual mediator class is a required attribute";
             log.error(msg);

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConfigurationFactoryAndSerializerFinder.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConfigurationFactoryAndSerializerFinder.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConfigurationFactoryAndSerializerFinder.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConfigurationFactoryAndSerializerFinder.java Wed Sep 19 02:09:01 2007
@@ -180,7 +180,7 @@
 
 	public static void serializeConfiguration(SynapseConfiguration synCfg, OutputStream outputStream) throws XMLStreamException {
 		if (synCfg.getDefaultQName()==null) {
-			serializeConfiguration(synCfg, Constants.DEFINITIONS_ELT, outputStream);
+			serializeConfiguration(synCfg, XMLConfigConstants.DEFINITIONS_ELT, outputStream);
 		}
 		else {
 			serializeConfiguration(synCfg, synCfg.getDefaultQName(), outputStream);

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorFactory.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DropMediatorFactory.java Wed Sep 19 02:09:01 2007
@@ -34,7 +34,7 @@
  */
 public class DropMediatorFactory extends AbstractMediatorFactory  {
 
-    private static final QName DROP_Q = new QName(Constants.SYNAPSE_NAMESPACE, "drop");
+    private static final QName DROP_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "drop");
 
     public Mediator createMediator(OMElement el) {
 

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntryFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntryFactory.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntryFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntryFactory.java Wed Sep 19 02:09:01 2007
@@ -39,7 +39,7 @@
 
     public static Entry createEntry(OMElement elem) {
 
-        OMAttribute key = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "key"));
+        OMAttribute key = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "key"));
         if (key == null) {
             handleException("The 'key' attribute is required for a local registry entry");
             return null;
@@ -47,7 +47,7 @@
         } else {
 
             Entry entry = new Entry(key.getAttributeValue());
-            String src  = elem.getAttributeValue(new QName(Constants.NULL_NAMESPACE, "src"));
+            String src  = elem.getAttributeValue(new QName(XMLConfigConstants.NULL_NAMESPACE, "src"));
 
             // if a src attribute is present, this is a URL source resource,
             // it would now be loaded from the URL source, as all static properties

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java Wed Sep 19 02:09:01 2007
@@ -37,8 +37,8 @@
 
     protected static final OMFactory fac = OMAbstractFactory.getOMFactory();
     protected static final OMNamespace synNS = fac.createOMNamespace(
-            Constants.SYNAPSE_NAMESPACE, "syn");
-    protected static final OMNamespace nullNS = fac.createOMNamespace(Constants.NULL_NAMESPACE, "");
+            XMLConfigConstants.SYNAPSE_NAMESPACE, "syn");
+    protected static final OMNamespace nullNS = fac.createOMNamespace(XMLConfigConstants.NULL_NAMESPACE, "");
 
     /**
      * Serialize the Entry object to an OMElement representing the entry

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java Wed Sep 19 02:09:01 2007
@@ -48,17 +48,17 @@
  */
 public class FaultMediatorFactory extends AbstractMediatorFactory  {
 
-    private static final QName FAULT_Q = new QName(Constants.SYNAPSE_NAMESPACE, "makefault");
+    private static final QName FAULT_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "makefault");
 
-    private static final QName ATT_VERSION_Q = new QName(Constants.NULL_NAMESPACE, "version");
-    private static final QName CODE_Q        = new QName(Constants.SYNAPSE_NAMESPACE, "code");
-    private static final QName REASON_Q      = new QName(Constants.SYNAPSE_NAMESPACE, "reason");
-    private static final QName NODE_Q        = new QName(Constants.SYNAPSE_NAMESPACE, "node");
-    private static final QName ROLE_Q        = new QName(Constants.SYNAPSE_NAMESPACE, "role");
-    private static final QName DETAIL_Q      = new QName(Constants.SYNAPSE_NAMESPACE, "detail");
+    private static final QName ATT_VERSION_Q = new QName(XMLConfigConstants.NULL_NAMESPACE, "version");
+    private static final QName CODE_Q        = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "code");
+    private static final QName REASON_Q      = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "reason");
+    private static final QName NODE_Q        = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "node");
+    private static final QName ROLE_Q        = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "role");
+    private static final QName DETAIL_Q      = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "detail");
 
-    private static final QName ATT_VALUE_Q = new QName(Constants.NULL_NAMESPACE, "value");
-    private static final QName ATT_EXPR_Q  = new QName(Constants.NULL_NAMESPACE, "expression");
+    private static final QName ATT_VALUE_Q = new QName(XMLConfigConstants.NULL_NAMESPACE, "value");
+    private static final QName ATT_EXPR_Q  = new QName(XMLConfigConstants.NULL_NAMESPACE, "expression");
 
     private static final String SOAP11 = "soap11";
     private static final String SOAP12 = "soap12";

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorFactory.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorFactory.java Wed Sep 19 02:09:01 2007
@@ -26,6 +26,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.synapse.SynapseException;
 import org.apache.synapse.Mediator;
+import org.apache.synapse.SynapseConstants;
 import org.apache.synapse.mediators.filters.FilterMediator;
 import org.jaxen.JaxenException;
 
@@ -46,14 +47,14 @@
 
     private static final Log log = LogFactory.getLog(FaultMediatorFactory.class);
 
-    private static final QName FILTER_Q    = new QName(Constants.SYNAPSE_NAMESPACE, "filter");
+    private static final QName FILTER_Q    = new QName(SynapseConstants.SYNAPSE_NAMESPACE, "filter");
 
     public Mediator createMediator(OMElement elem) {
         FilterMediator filter = new FilterMediator();
 
-        OMAttribute attXpath  = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "xpath"));
-        OMAttribute attSource = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "source"));
-        OMAttribute attRegex  = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "regex"));
+        OMAttribute attXpath  = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "xpath"));
+        OMAttribute attSource = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "source"));
+        OMAttribute attRegex  = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "regex"));
 
         if (attXpath != null) {
             if (attXpath.getAttributeValue() != null && attXpath.getAttributeValue().trim().length() == 0) {

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorFactory.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/HeaderMediatorFactory.java Wed Sep 19 02:09:01 2007
@@ -50,15 +50,15 @@
 
     private static final Log log = LogFactory.getLog(HeaderMediatorFactory.class);
 
-    private static final QName HEADER_Q = new QName(Constants.SYNAPSE_NAMESPACE, "header");
+    private static final QName HEADER_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "header");
 
     public Mediator createMediator(OMElement elem) {
 
         HeaderMediator headerMediator = new HeaderMediator();
-        OMAttribute name   = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "name"));
-        OMAttribute value  = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "value"));
-        OMAttribute exprn  = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "expression"));
-        OMAttribute action = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "action"));
+        OMAttribute name   = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "name"));
+        OMAttribute value  = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "value"));
+        OMAttribute exprn  = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "expression"));
+        OMAttribute action = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "action"));
 
         if (name == null || name.getAttributeValue() == null) {
             String msg = "A valid name attribute is required for the header mediator";

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorFactory.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorFactory.java Wed Sep 19 02:09:01 2007
@@ -36,7 +36,7 @@
  */
 public class InMediatorFactory extends AbstractListMediatorFactory {
 
-    private static final QName IN_Q = new QName(Constants.SYNAPSE_NAMESPACE, "in");
+    private static final QName IN_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "in");
 
     public Mediator createMediator(OMElement elem) {
         InMediator filter = new InMediator();

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorFactory.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/LogMediatorFactory.java Wed Sep 19 02:09:01 2007
@@ -41,7 +41,7 @@
 
     private static final Log log = LogFactory.getLog(LogMediatorFactory.class);
 
-    private static final QName LOG_Q    = new QName(Constants.SYNAPSE_NAMESPACE, "log");
+    private static final QName LOG_Q    = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "log");
     private static final String SIMPLE  = "simple";
     private static final String HEADERS = "headers";
     private static final String FULL    = "full";
@@ -60,7 +60,7 @@
         initMediator(logMediator,elem);
         
         // Set the high level set of properties to be logged (i.e. log level)
-        OMAttribute level = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "level"));
+        OMAttribute level = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "level"));
         if (level != null) {
             String levelstr = level.getAttributeValue();
             if (SIMPLE.equals(levelstr)) {
@@ -75,7 +75,7 @@
         }
 
         // check if a custom separator has been supplied, if so use it
-        OMAttribute separator = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "separator"));
+        OMAttribute separator = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "separator"));
         if (separator != null) {
             logMediator.setSeparator(separator.getAttributeValue());
         }

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorPropertyFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorPropertyFactory.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorPropertyFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorPropertyFactory.java Wed Sep 19 02:09:01 2007
@@ -51,7 +51,7 @@
 
         List propertyList = new ArrayList();
 
-        Iterator iter = elem.getChildrenWithName(new QName(Constants.SYNAPSE_NAMESPACE, "property"));
+        Iterator iter = elem.getChildrenWithName(new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "property"));
         while (iter.hasNext()) {
 
             OMElement propEle = (OMElement) iter.next();

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorFactory.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorFactory.java Wed Sep 19 02:09:01 2007
@@ -36,7 +36,7 @@
  */
 public class OutMediatorFactory extends AbstractListMediatorFactory {
 
-    private static final QName OUT_Q = new QName(Constants.SYNAPSE_NAMESPACE, "out");
+    private static final QName OUT_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "out");
 
     public Mediator createMediator(OMElement elem) {
         OutMediator filter = new OutMediator();

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorFactory.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/POJOCommandMediatorFactory.java Wed Sep 19 02:09:01 2007
@@ -47,14 +47,14 @@
     private static final Log log = LogFactory.getLog(POJOCommandMediatorFactory.class);
 
     private static final QName POJO_COMMAND_Q =
-            new QName(Constants.SYNAPSE_NAMESPACE, "pojoCommand");
+            new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "pojoCommand");
 
     public Mediator createMediator(OMElement elem) {
 
         POJOCommandMediator pojoMediator = new POJOCommandMediator();
 
         // Class name of the Command object should be present
-        OMAttribute name = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "name"));
+        OMAttribute name = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "name"));
         if (name == null) {
             String msg = "The name of the actual POJO command implementation class" +
                     " is a required attribute";

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java Wed Sep 19 02:09:01 2007
@@ -42,16 +42,16 @@
 
     private static final Log log = LogFactory.getLog(LogMediatorFactory.class);
 
-    private static final QName PROP_Q = new QName(Constants.SYNAPSE_NAMESPACE, "property");
+    private static final QName PROP_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "property");
 
     public Mediator createMediator(OMElement elem) {
 
         PropertyMediator propMediator = new PropertyMediator();
-        OMAttribute name = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "name"));
-        OMAttribute value = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "value"));
-        OMAttribute expression = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "expression"));
-        OMAttribute scope = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "scope"));
-        OMAttribute action = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "action"));
+        OMAttribute name = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "name"));
+        OMAttribute value = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "value"));
+        OMAttribute expression = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "expression"));
+        OMAttribute scope = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "scope"));
+        OMAttribute action = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "action"));
         if (name == null) {
             String msg = "The 'name' attribute is required for the configuration of a property mediator";
             log.error(msg);
@@ -78,9 +78,9 @@
         }
         if (scope != null) {
             String valueStr = scope.getAttributeValue();
-            if (!Constants.SCOPE_AXIS2.equals(valueStr) && !Constants.SCOPE_TRANSPORT.equals(valueStr)
-                    && !Constants.SCOPE_DEFAULT.equals(valueStr)) {
-                String msg = "Only '" + Constants.SCOPE_AXIS2 + "' or '" + Constants.SCOPE_TRANSPORT
+            if (!XMLConfigConstants.SCOPE_AXIS2.equals(valueStr) && !XMLConfigConstants.SCOPE_TRANSPORT.equals(valueStr)
+                    && !XMLConfigConstants.SCOPE_DEFAULT.equals(valueStr)) {
+                String msg = "Only '" + XMLConfigConstants.SCOPE_AXIS2 + "' or '" + XMLConfigConstants.SCOPE_TRANSPORT
                         + "' values are allowed for attribute scope for a property mediator"
                         + ", Unsupported scope " + valueStr;
                 log.error(msg);

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java Wed Sep 19 02:09:01 2007
@@ -68,7 +68,7 @@
 
         ProxyService proxy = new ProxyService();
 
-        OMAttribute name = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "name"));
+        OMAttribute name = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "name"));
         if (name == null) {
             handleException("The 'name' attribute is required for a Proxy service definition");
         } else {
@@ -76,19 +76,19 @@
         }
 
         OMAttribute statistics = elem.getAttribute(
-                new QName(Constants.NULL_NAMESPACE, Constants.STATISTICS_ATTRIB_NAME));
+                new QName(XMLConfigConstants.NULL_NAMESPACE, XMLConfigConstants.STATISTICS_ATTRIB_NAME));
         if (statistics != null) {
             String statisticsValue = statistics.getAttributeValue();
             if (statisticsValue != null) {
-                if (Constants.STATISTICS_ENABLE.equals(statisticsValue)) {
-                    proxy.setStatisticsEnable(org.apache.synapse.Constants.STATISTICS_ON);
-                } else if (Constants.STATISTICS_DISABLE.equals(statisticsValue)) {
-                    proxy.setStatisticsEnable(org.apache.synapse.Constants.STATISTICS_OFF);
+                if (XMLConfigConstants.STATISTICS_ENABLE.equals(statisticsValue)) {
+                    proxy.setStatisticsEnable(org.apache.synapse.SynapseConstants.STATISTICS_ON);
+                } else if (XMLConfigConstants.STATISTICS_DISABLE.equals(statisticsValue)) {
+                    proxy.setStatisticsEnable(org.apache.synapse.SynapseConstants.STATISTICS_OFF);
                 }
             }
         }
 
-        OMAttribute trans = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "transports"));
+        OMAttribute trans = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "transports"));
         if (trans != null) {
             String transports = trans.getAttributeValue();
             if (transports == null || ProxyService.ALL_TRANSPORTS.equals(transports)) {
@@ -105,19 +105,19 @@
                 proxy.setTransports(transportList);
             }
         }
-        OMAttribute trace = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, Constants.TRACE_ATTRIB_NAME));
+        OMAttribute trace = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, XMLConfigConstants.TRACE_ATTRIB_NAME));
         if (trace != null) {
             String traceValue = trace.getAttributeValue();
             if (traceValue != null) {
-                if (traceValue.equals(Constants.TRACE_ENABLE)) {
-                    proxy.setTraceState(org.apache.synapse.Constants.TRACING_ON);
-                } else if (traceValue.equals(Constants.TRACE_DISABLE)) {
-                    proxy.setTraceState(org.apache.synapse.Constants.TRACING_OFF);
+                if (traceValue.equals(XMLConfigConstants.TRACE_ENABLE)) {
+                    proxy.setTraceState(org.apache.synapse.SynapseConstants.TRACING_ON);
+                } else if (traceValue.equals(XMLConfigConstants.TRACE_DISABLE)) {
+                    proxy.setTraceState(org.apache.synapse.SynapseConstants.TRACING_OFF);
                 }
             }
         }
         OMAttribute startOnLoad = elem.getAttribute(
-                new QName(Constants.NULL_NAMESPACE, "startOnLoad"));
+                new QName(XMLConfigConstants.NULL_NAMESPACE, "startOnLoad"));
         if (startOnLoad != null) {
             proxy.setStartOnLoad(Boolean.valueOf(startOnLoad.getAttributeValue()).booleanValue());
         } else {
@@ -126,7 +126,7 @@
 
         // setting the description of the proxy service
         OMElement descriptionElement = elem.getFirstChildWithName(
-                new QName(Constants.SYNAPSE_NAMESPACE, "description"));
+                new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "description"));
         if (descriptionElement != null) {
             proxy.setDescription(descriptionElement.getText().trim());
         }
@@ -135,47 +135,47 @@
         // or a named sequence. If none of these are specified, the messages would be mediated
         // by the Synapse main mediator
         OMElement target = elem.getFirstChildWithName(
-                new QName(Constants.SYNAPSE_NAMESPACE, "target"));
+                new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "target"));
         if (target != null) {
             boolean isTargetOk = false;
             SequenceMediatorFactory mediatorFactory = new SequenceMediatorFactory();
-            OMAttribute inSequence = target.getAttribute(new QName(Constants.NULL_NAMESPACE, "inSequence"));
+            OMAttribute inSequence = target.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "inSequence"));
             if (inSequence != null) {
                 proxy.setTargetInSequence(inSequence.getAttributeValue());
                 isTargetOk = true;
             } else {
-                OMElement inSequenceElement = target.getFirstChildWithName(new QName(Constants.SYNAPSE_NAMESPACE, "inSequence"));
+                OMElement inSequenceElement = target.getFirstChildWithName(new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "inSequence"));
                 if (inSequenceElement != null) {
                     proxy.setTargetInLineInSequence(mediatorFactory.createAnonymousSequence(inSequenceElement));
                     isTargetOk = true;
                 }
             }
-            OMAttribute outSequence = target.getAttribute(new QName(Constants.NULL_NAMESPACE, "outSequence"));
+            OMAttribute outSequence = target.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "outSequence"));
             if (outSequence != null) {
                 proxy.setTargetOutSequence(outSequence.getAttributeValue());
             } else {
-                OMElement outSequenceElement = target.getFirstChildWithName(new QName(Constants.SYNAPSE_NAMESPACE, "outSequence"));
+                OMElement outSequenceElement = target.getFirstChildWithName(new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "outSequence"));
                 if (outSequenceElement != null) {
                     proxy.setTargetInLineOutSequence(mediatorFactory.createAnonymousSequence(outSequenceElement));
                 } else {
                     handleException("Target for the proxy service must declare an out sequence");
                 }
             }
-            OMAttribute faultSequence = target.getAttribute(new QName(Constants.NULL_NAMESPACE, "faultSequence"));
+            OMAttribute faultSequence = target.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "faultSequence"));
             if (faultSequence != null) {
                 proxy.setTargetFaultSequence(faultSequence.getAttributeValue());
             } else {
-                OMElement faultSequenceElement = target.getFirstChildWithName(new QName(Constants.SYNAPSE_NAMESPACE, "faultSequence"));
+                OMElement faultSequenceElement = target.getFirstChildWithName(new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "faultSequence"));
                 if (faultSequenceElement != null) {
                     proxy.setTargetInLineFaultSequence(mediatorFactory.createAnonymousSequence(faultSequenceElement));
                 }
             }
-            OMAttribute tgtEndpt = target.getAttribute(new QName(Constants.NULL_NAMESPACE, "endpoint"));
+            OMAttribute tgtEndpt = target.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "endpoint"));
             if (tgtEndpt != null) {
                 proxy.setTargetEndpoint(tgtEndpt.getAttributeValue());
                 isTargetOk = true;
             } else {
-                OMElement endpointElement = target.getFirstChildWithName(new QName(Constants.SYNAPSE_NAMESPACE, "endpoint"));
+                OMElement endpointElement = target.getFirstChildWithName(new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "endpoint"));
                 if (endpointElement != null) {
                     EndpointFactory fac = EndpointAbstractFactory.getEndpointFactroy(endpointElement);
                     proxy.setTargetInLineEndpoint(fac.createEndpoint(endpointElement, true));
@@ -190,13 +190,13 @@
         }
 
         // read the WSDL, Schemas and Policies and set to the proxy service
-        OMElement wsdl = elem.getFirstChildWithName(new QName(Constants.SYNAPSE_NAMESPACE, "publishWSDL"));
+        OMElement wsdl = elem.getFirstChildWithName(new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "publishWSDL"));
         if (wsdl != null) {
-            OMAttribute wsdlkey = wsdl.getAttribute(new QName(Constants.NULL_NAMESPACE, "key"));
+            OMAttribute wsdlkey = wsdl.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "key"));
             if (wsdlkey != null) {
                 proxy.setWSDLKey(wsdlkey.getAttributeValue());
             } else {
-                OMAttribute wsdlURI = wsdl.getAttribute(new QName(Constants.NULL_NAMESPACE, "uri"));
+                OMAttribute wsdlURI = wsdl.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "uri"));
                 if (wsdlURI != null) {
                     try {
                         proxy.setWsdlURI(new URI(wsdlURI.getAttributeValue()));
@@ -222,12 +222,12 @@
 //        OMElement schema = elem.getFirstChildWithName(
 //                new QName(Constants.SYNAPSE_NAMESPACE, "schema"));
         Iterator policies = elem.getChildrenWithName(
-                new QName(Constants.SYNAPSE_NAMESPACE, "policy"));
+                new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "policy"));
         while (policies.hasNext()) {
             Object o = policies.next();
             if (o instanceof OMElement) {
                 OMElement policy = (OMElement) o;
-                OMAttribute key = policy.getAttribute(new QName(Constants.NULL_NAMESPACE, "key"));
+                OMAttribute key = policy.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "key"));
                 if (key != null) {
                     proxy.addServiceLevelPolicy(key.getAttributeValue());
                 } else {
@@ -239,12 +239,12 @@
         }
 
         Iterator props = elem.getChildrenWithName(
-                new QName(Constants.SYNAPSE_NAMESPACE, "parameter"));
+                new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "parameter"));
         while (props.hasNext()) {
             Object o = props.next();
             if (o instanceof OMElement) {
                 OMElement prop = (OMElement) o;
-                OMAttribute pname = prop.getAttribute(new QName(Constants.NULL_NAMESPACE, "name"));
+                OMAttribute pname = prop.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "name"));
                 OMElement propertyValue = prop.getFirstElement();
                 if (pname != null) {
                     if (propertyValue != null) {
@@ -261,12 +261,12 @@
         }
 
         if (elem.getFirstChildWithName(
-                new QName(Constants.SYNAPSE_NAMESPACE, "enableRM")) != null) {
+                new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "enableRM")) != null) {
             proxy.setWsRMEnabled(true);
         }
 
         if (elem.getFirstChildWithName(
-                new QName(Constants.SYNAPSE_NAMESPACE, "enableSec")) != null) {
+                new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "enableSec")) != null) {
             proxy.setWsSecEnabled(true);
         }
 

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceSerializer.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceSerializer.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceSerializer.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceSerializer.java Wed Sep 19 02:09:01 2007
@@ -58,8 +58,8 @@
     private static final Log log = LogFactory.getLog(PropertyMediatorSerializer.class);
 
     protected static final OMFactory fac = OMAbstractFactory.getOMFactory();
-    protected static final OMNamespace synNS = fac.createOMNamespace(Constants.SYNAPSE_NAMESPACE, "syn");
-    protected static final OMNamespace nullNS = fac.createOMNamespace(Constants.NULL_NAMESPACE, "");
+    protected static final OMNamespace synNS = fac.createOMNamespace(XMLConfigConstants.SYNAPSE_NAMESPACE, "syn");
+    protected static final OMNamespace nullNS = fac.createOMNamespace(XMLConfigConstants.NULL_NAMESPACE, "");
 
     public static OMElement serializeProxy(OMElement parent, ProxyService service) {
 
@@ -207,26 +207,26 @@
 
         int isEnableStatistics = service.getStatisticsEnable();
         String statisticsValue = null;
-        if (isEnableStatistics == org.apache.synapse.Constants.STATISTICS_ON) {
-            statisticsValue = Constants.STATISTICS_ENABLE;
-        } else if (isEnableStatistics == org.apache.synapse.Constants.STATISTICS_OFF) {
-            statisticsValue = Constants.STATISTICS_DISABLE;
+        if (isEnableStatistics == org.apache.synapse.SynapseConstants.STATISTICS_ON) {
+            statisticsValue = XMLConfigConstants.STATISTICS_ENABLE;
+        } else if (isEnableStatistics == org.apache.synapse.SynapseConstants.STATISTICS_OFF) {
+            statisticsValue = XMLConfigConstants.STATISTICS_DISABLE;
         }
         if (statisticsValue != null) {
             proxy.addAttribute(fac.createOMAttribute(
-                    Constants.STATISTICS_ATTRIB_NAME, nullNS, statisticsValue));
+                    XMLConfigConstants.STATISTICS_ATTRIB_NAME, nullNS, statisticsValue));
         }
 
         int traceState = service.getTraceState();
         String traceValue = null;
-        if (traceState == org.apache.synapse.Constants.TRACING_ON) {
-            traceValue = Constants.TRACE_ENABLE;
-        } else if (traceState == org.apache.synapse.Constants.TRACING_OFF) {
-            traceValue = Constants.TRACE_DISABLE;
+        if (traceState == org.apache.synapse.SynapseConstants.TRACING_ON) {
+            traceValue = XMLConfigConstants.TRACE_ENABLE;
+        } else if (traceState == org.apache.synapse.SynapseConstants.TRACING_OFF) {
+            traceValue = XMLConfigConstants.TRACE_DISABLE;
         }
         if (traceValue != null) {
             proxy.addAttribute(fac.createOMAttribute(
-                    Constants.TRACE_ATTRIB_NAME, nullNS, traceValue));
+                    XMLConfigConstants.TRACE_ATTRIB_NAME, nullNS, traceValue));
         }
         if (parent != null) {
             parent.addChild(proxy);

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMSequenceMediatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMSequenceMediatorFactory.java?rev=577213&r1=577212&r2=577213&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMSequenceMediatorFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMSequenceMediatorFactory.java Wed Sep 19 02:09:01 2007
@@ -42,17 +42,17 @@
 
     private static final Log log = LogFactory.getLog(LogMediatorFactory.class);
 
-    private static final QName SEQUENCE_Q = new QName(Constants.SYNAPSE_NAMESPACE, "RMSequence");
+    private static final QName SEQUENCE_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "RMSequence");
 
     public Mediator createMediator(OMElement elem) {
 
         RMSequenceMediator sequenceMediator = new RMSequenceMediator();
         OMAttribute correlation =
-            elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "correlation"));
+            elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "correlation"));
         OMAttribute lastMessage =
-            elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "last-message"));
-        OMAttribute single = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "single"));
-        OMAttribute version = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "version"));
+            elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "last-message"));
+        OMAttribute single = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "single"));
+        OMAttribute version = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "version"));
 
         if (single == null && correlation == null) {
             String msg = "The 'single' attribute value of true or a 'correlation' attribute is " +
@@ -126,10 +126,10 @@
         }
 
         if (version != null) {
-            if (!Constants.SEQUENCE_VERSION_1_0.equals(version.getAttributeValue()) &&
-                !Constants.SEQUENCE_VERSION_1_1.equals(version.getAttributeValue())) {
-                String msg = "Only '" + Constants.SEQUENCE_VERSION_1_0 + "' or '" +
-                    Constants.SEQUENCE_VERSION_1_1
+            if (!XMLConfigConstants.SEQUENCE_VERSION_1_0.equals(version.getAttributeValue()) &&
+                !XMLConfigConstants.SEQUENCE_VERSION_1_1.equals(version.getAttributeValue())) {
+                String msg = "Only '" + XMLConfigConstants.SEQUENCE_VERSION_1_0 + "' or '" +
+                    XMLConfigConstants.SEQUENCE_VERSION_1_1
                     + "' values are allowed for attribute version for a RMSequence mediator"
                     + ", Unsupported version " + version.getAttributeValue();
                 log.error(msg);



---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org


Mime
View raw message