Author: ruwan
Date: Sun Aug 29 09:37:48 2010
New Revision: 990532
URL: http://svn.apache.org/viewvc?rev=990532&view=rev
Log:
getting rid of the spring specific namespace of that mediator
Modified:
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java
synapse/trunk/java/repository/conf/sample/resources/spring/synapse_spring_unittest.xml
Modified:
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java?rev=990532&r1=990531&r2=990532&view=diff
==============================================================================
---
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java
(original)
+++
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java
Sun Aug 29 09:37:48 2010
@@ -29,7 +29,7 @@ import javax.xml.namespace.QName;
/**
* Creates an instance of a Spring mediator that refers to the given Spring
- * configuration and bean. Optionally, one could specify an inlined Spring
+ * configuration and bean. Optionally, one could specify an in-lined Spring
* configuration as opposed to a globally defined Spring configuration
* <p/>
* <spring bean="exampleBean1" key="string""/>
@@ -37,8 +37,7 @@ import javax.xml.namespace.QName;
@SuppressWarnings({"UnusedDeclaration"})
public class SpringMediatorFactory extends AbstractMediatorFactory {
- private static final QName TAG_NAME =
- new QName(XMLConfigConstants.SYNAPSE_NAMESPACE + "/spring",
"spring");
+ private static final QName TAG_NAME = new
QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "spring");
/**
* Create a Spring mediator instance referring to the bean and
configuration given
Modified:
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java?rev=990532&r1=990531&r2=990532&view=diff
==============================================================================
---
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java
(original)
+++
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java
Sun Aug 29 09:37:48 2010
@@ -22,9 +22,8 @@ package org.apache.synapse.mediators.spr
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.synapse.Mediator;
-import org.apache.synapse.config.xml.XMLConfigConstants;
-import org.apache.synapse.config.xml.MediatorSerializer;
import org.apache.synapse.config.xml.AbstractMediatorSerializer;
+import org.apache.synapse.config.xml.XMLConfigConstants;
/**
* <spring bean="exampleBean1" (config="spring1" | src="spring.xml)"/>
@@ -33,7 +32,7 @@ import org.apache.synapse.config.xml.Abs
public class SpringMediatorSerializer extends AbstractMediatorSerializer {
private static final OMNamespace sprNS =
-
fac.createOMNamespace(XMLConfigConstants.SYNAPSE_NAMESPACE+"/spring", "spring");
+ fac.createOMNamespace(XMLConfigConstants.SYNAPSE_NAMESPACE,
"spring");
public OMElement serializeSpecificMediator(Mediator m) {
Modified:
synapse/trunk/java/repository/conf/sample/resources/spring/synapse_spring_unittest.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/resources/spring/synapse_spring_unittest.xml?rev=990532&r1=990531&r2=990532&view=diff
==============================================================================
---
synapse/trunk/java/repository/conf/sample/resources/spring/synapse_spring_unittest.xml
(original)
+++
synapse/trunk/java/repository/conf/sample/resources/spring/synapse_spring_unittest.xml
Sun Aug 29 09:37:48 2010
@@ -17,8 +17,7 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<definitions xmlns="http://synapse.apache.org/ns/2010/04/configuration";
-
xmlns:spring="http://synapse.apache.org/ns/2010/04/configuration/spring";>
+<definitions xmlns="http://synapse.apache.org/ns/2010/04/configuration";>
<registry provider="org.apache.synapse.registry.url.SimpleURLRegistry">
<parameter name="root">file:./../../repository/</parameter>
@@ -29,8 +28,8 @@
src="file:./../../repository/conf/sample/resources/spring/springsample.xml"/>
<sequence name="main">
- <spring:spring bean="springtest"
key="conf/sample/resources/spring/springsample.xml"/>
- <spring:spring bean="springtest" key="springconfig2"/>
+ <spring bean="springtest"
key="conf/sample/resources/spring/springsample.xml"/>
+ <spring bean="springtest" key="springconfig2"/>
</sequence>
</definitions>
