Author: hiranya
Date: Mon Apr 26 11:17:54 2010
New Revision: 938003
URL: http://svn.apache.org/viewvc?rev=938003&view=rev
Log:
Unifying the Synapse namespace constance throughout the code base
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistrySerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TargetSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationSerializer.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java?rev=938003&r1=938002&r2=938003&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
Mon Apr 26 11:17:54 2010
@@ -33,7 +33,7 @@ public final class SynapseConstants {
public static final String SYNAPSE_NAMESPACE =
"http://ws.apache.org/ns/synapse";;
/** An OMNamespace object for the Synapse NS */
public static final OMNamespace SYNAPSE_OMNAMESPACE =
-
OMAbstractFactory.getOMFactory().createOMNamespace(SYNAPSE_NAMESPACE, "syn");
+
OMAbstractFactory.getOMFactory().createOMNamespace(SYNAPSE_NAMESPACE, "");
/** The name of the main sequence for message mediation */
public static final String MAIN_SEQUENCE_KEY = "main";
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java?rev=938003&r1=938002&r2=938003&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorSerializer.java
Mon Apr 26 11:17:54 2010
@@ -28,6 +28,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Mediator;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.aspects.AspectConfigurable;
import org.apache.synapse.aspects.statistics.StatisticsConfigurable;
import org.apache.synapse.mediators.MediatorProperty;
@@ -44,12 +45,11 @@ public abstract class AbstractMediatorSe
protected static Log log;
protected static final OMFactory fac = OMAbstractFactory.getOMFactory();
- protected static final OMNamespace synNS
- = fac.createOMNamespace(XMLConfigConstants.SYNAPSE_NAMESPACE,
"syn");
+ protected static final OMNamespace synNS =
SynapseConstants.SYNAPSE_OMNAMESPACE;
protected static final OMNamespace nullNS
= fac.createOMNamespace(XMLConfigConstants.NULL_NAMESPACE, "");
protected static final QName PROP_Q
- = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "property", "syn");
+ = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "property");
/**
* A constructor that makes subclasses pick up the correct logger
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java?rev=938003&r1=938002&r2=938003&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java
Mon Apr 26 11:17:54 2010
@@ -27,6 +27,7 @@ import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMElement;
import org.apache.synapse.config.Entry;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.SynapseConstants;
import org.apache.axiom.om.impl.llom.OMTextImpl;
import javax.xml.stream.XMLStreamConstants;
import java.net.URL;
@@ -39,8 +40,7 @@ public class EntrySerializer {
private static Log log = LogFactory.getLog(EntrySerializer.class);
protected static final OMFactory fac = OMAbstractFactory.getOMFactory();
- protected static final OMNamespace synNS = fac.createOMNamespace(
- XMLConfigConstants.SYNAPSE_NAMESPACE, "syn");
+ protected static final OMNamespace synNS =
SynapseConstants.SYNAPSE_OMNAMESPACE;
protected static final OMNamespace nullNS =
fac.createOMNamespace(XMLConfigConstants.NULL_NAMESPACE, "");
/**
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceSerializer.java?rev=938003&r1=938002&r2=938003&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceSerializer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceSerializer.java
Mon Apr 26 11:17:54 2010
@@ -23,6 +23,7 @@ import org.apache.axiom.om.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.aspects.AspectConfigurable;
import org.apache.synapse.aspects.statistics.StatisticsConfigurable;
import org.apache.synapse.config.xml.endpoints.EndpointSerializer;
@@ -45,7 +46,7 @@ public class ProxyServiceSerializer {
private static final Log log =
LogFactory.getLog(PropertyMediatorSerializer.class);
protected static final OMFactory fac = OMAbstractFactory.getOMFactory();
- protected static final OMNamespace synNS =
fac.createOMNamespace(XMLConfigConstants.SYNAPSE_NAMESPACE, "syn");
+ protected static final OMNamespace synNS =
SynapseConstants.SYNAPSE_OMNAMESPACE;
protected static final OMNamespace nullNS =
fac.createOMNamespace(XMLConfigConstants.NULL_NAMESPACE, "");
public static OMElement serializeProxy(OMElement parent, ProxyService
service) {
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistrySerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistrySerializer.java?rev=938003&r1=938002&r2=938003&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistrySerializer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistrySerializer.java
Mon Apr 26 11:17:54 2010
@@ -26,6 +26,7 @@ import org.apache.axiom.om.OMNamespace;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.registry.Registry;
import java.util.Iterator;
@@ -40,7 +41,7 @@ public class RegistrySerializer {
private static final Log log = LogFactory.getLog(RegistrySerializer.class);
protected static final OMFactory fac = OMAbstractFactory.getOMFactory();
- protected static final OMNamespace synNS =
fac.createOMNamespace(XMLConfigConstants.SYNAPSE_NAMESPACE, "syn");
+ protected static final OMNamespace synNS =
SynapseConstants.SYNAPSE_OMNAMESPACE;
protected static final OMNamespace nullNS =
fac.createOMNamespace(XMLConfigConstants.NULL_NAMESPACE, "");
public static OMElement serializeRegistry(OMElement parent, Registry
registry) {
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationSerializer.java?rev=938003&r1=938002&r2=938003&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationSerializer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationSerializer.java
Mon Apr 26 11:17:54 2010
@@ -35,8 +35,7 @@ public class SynapseXMLConfigurationSeri
private static final OMFactory fac = OMAbstractFactory.getOMFactory();
- private static final OMNamespace synNS = fac.createOMNamespace(
- XMLConfigConstants.SYNAPSE_NAMESPACE, "syn");
+ private static final OMNamespace synNS =
SynapseConstants.SYNAPSE_OMNAMESPACE;
/**
* Order of entries is irrelevant, however its nice to have some order.
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TargetSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TargetSerializer.java?rev=938003&r1=938002&r2=938003&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TargetSerializer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/TargetSerializer.java
Mon Apr 26 11:17:54 2010
@@ -25,6 +25,7 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.synapse.config.xml.endpoints.EndpointSerializer;
import org.apache.synapse.mediators.eip.Target;
+import org.apache.synapse.SynapseConstants;
/**
* Serializer for {...@link Target} instances.
@@ -42,7 +43,7 @@ public class TargetSerializer {
* This holds the Synapse namesapce for all the elements (qualified from
default)
*/
private static final OMNamespace synNS
- = fac.createOMNamespace(XMLConfigConstants.SYNAPSE_NAMESPACE,
"syn");
+ = SynapseConstants.SYNAPSE_OMNAMESPACE;
/**
* This holds the null namespace for all the attributes (unqualified from
default)
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationSerializer.java?rev=938003&r1=938002&r2=938003&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationSerializer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationSerializer.java
Mon Apr 26 11:17:54 2010
@@ -43,8 +43,10 @@ public class XMLConfigurationSerializer
public static void serializeConfiguration(SynapseConfiguration synCfg,
OutputStream outputStream) throws XMLStreamException {
- log.info("Serializing the XML Configuration to the output stream");
-
+ if (log.isDebugEnabled()) {
+ log.debug("Serializing the XML Configuration to the output
stream");
+ }
+
OMElement definitions
=
ConfigurationFactoryAndSerializerFinder.serializeConfiguration(synCfg);
definitions.serialize(outputStream);
