Author: hiranya
Date: Fri Jul 19 18:46:49 2013
New Revision: 1504963
URL: http://svn.apache.org/r1504963
Log:
Applying the patches for SYNAPSE-882
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EvaluatorConstants.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AndSerializer.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/EqualSerializer.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/MatchSerializer.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/NotSerializer.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/OrSerializer.java
synapse/trunk/java/modules/commons/src/test/java/org/apache/synapse/commons/evaluators/config/EqualSerializerTest.java
synapse/trunk/java/modules/commons/src/test/java/org/apache/synapse/commons/evaluators/config/MatchSerializerTest.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/ConditionalRouterMediatorSerializationTest.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/URLRewriteMediatorSerializationTest.java
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EvaluatorConstants.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EvaluatorConstants.java?rev=1504963&r1=1504962&r2=1504963&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EvaluatorConstants.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EvaluatorConstants.java
Fri Jul 19 18:46:49 2013
@@ -47,6 +47,9 @@ public class EvaluatorConstants {
public static final String PRIORITY = "priority";
public static final String DEFAULT_PRIORITY = "defaultPriority";
+ public static final String SYNAPSE_NAMESPACE =
"http://ws.apache.org/ns/synapse";;
+ public static final String EMPTY_PREFIX = "";
+
public static enum URI_FRAGMENTS {
protocol,
user,
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AndSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AndSerializer.java?rev=1504963&r1=1504962&r2=1504963&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AndSerializer.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AndSerializer.java
Fri Jul 19 18:46:49 2013
@@ -34,12 +34,13 @@ import javax.xml.namespace.QName;
public class AndSerializer extends AbstractEvaluatorSerializer {
public OMElement serialize(OMElement parent, Evaluator evaluator) throws
EvaluatorException {
if (!(evaluator instanceof AndEvaluator)) {
- throw new IllegalArgumentException("Evalutor should be a
AndEvalutor");
+ throw new IllegalArgumentException("Evaluator should be an
AndEvaluator");
}
AndEvaluator andEvaluator = (AndEvaluator) evaluator;
- OMElement andElement = fac.createOMElement(new
QName((EvaluatorConstants.AND)));
+ OMElement andElement = fac.createOMElement(EvaluatorConstants.AND,
+ EvaluatorConstants.SYNAPSE_NAMESPACE,
EvaluatorConstants.EMPTY_PREFIX);
serializeChildren(andElement, andEvaluator.getEvaluators());
if (parent != null) {
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/EqualSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/EqualSerializer.java?rev=1504963&r1=1504962&r2=1504963&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/EqualSerializer.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/EqualSerializer.java
Fri Jul 19 18:46:49 2013
@@ -33,11 +33,12 @@ public class EqualSerializer extends Tex
public OMElement serialize(OMElement parent, Evaluator evaluator) throws
EvaluatorException {
if (!(evaluator instanceof EqualEvaluator)) {
- throw new IllegalArgumentException("Evalutor must be an
EqualEvalutor");
+ throw new IllegalArgumentException("Evaluator must be an
EqualEvaluator");
}
EqualEvaluator equalEvaluator = (EqualEvaluator) evaluator;
- OMElement equalElement = fac.createOMElement(new
QName(EvaluatorConstants.EQUAL));
+ OMElement equalElement = fac.createOMElement(EvaluatorConstants.EQUAL,
+ EvaluatorConstants.SYNAPSE_NAMESPACE,
EvaluatorConstants.EMPTY_PREFIX);
serializeSourceTextRetriever(equalEvaluator.getTextRetriever(),
equalElement);
equalElement.addAttribute(fac.createOMAttribute(EvaluatorConstants.VALUE,
nullNS,
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/MatchSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/MatchSerializer.java?rev=1504963&r1=1504962&r2=1504963&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/MatchSerializer.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/MatchSerializer.java
Fri Jul 19 18:46:49 2013
@@ -16,11 +16,12 @@ public class MatchSerializer extends Tex
public OMElement serialize(OMElement parent, Evaluator evaluator) throws
EvaluatorException {
if (!(evaluator instanceof MatchEvaluator)) {
- throw new IllegalArgumentException("Evalutor must be a
NotEvalutor");
+ throw new IllegalArgumentException("Evaluator must be a
NotEvaluator");
}
MatchEvaluator matchEvaluator = (MatchEvaluator) evaluator;
- OMElement matchElement = fac.createOMElement(new
QName(EvaluatorConstants.MATCH));
+ OMElement matchElement = fac.createOMElement(EvaluatorConstants.MATCH,
+ EvaluatorConstants.SYNAPSE_NAMESPACE,
EvaluatorConstants.EMPTY_PREFIX);
serializeSourceTextRetriever(matchEvaluator.getTextRetriever(),
matchElement);
matchElement.addAttribute(fac.createOMAttribute(EvaluatorConstants.REGEX,
nullNS,
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/NotSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/NotSerializer.java?rev=1504963&r1=1504962&r2=1504963&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/NotSerializer.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/NotSerializer.java
Fri Jul 19 18:46:49 2013
@@ -35,12 +35,13 @@ public class NotSerializer extends Abstr
public OMElement serialize(OMElement parent, Evaluator evaluator) throws
EvaluatorException {
if (!(evaluator instanceof NotEvaluator)) {
- throw new IllegalArgumentException("Evalutor should be a
NotEvalutor");
+ throw new IllegalArgumentException("Evaluator should be a
NotEvaluator");
}
NotEvaluator notEvaluator = (NotEvaluator) evaluator;
- OMElement notElement = fac.createOMElement(new
QName(EvaluatorConstants.NOT));
+ OMElement notElement = fac.createOMElement(EvaluatorConstants.NOT,
+ EvaluatorConstants.SYNAPSE_NAMESPACE,
EvaluatorConstants.EMPTY_PREFIX);
serializeChild(notElement, notEvaluator.getEvaluator());
if (parent != null) {
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/OrSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/OrSerializer.java?rev=1504963&r1=1504962&r2=1504963&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/OrSerializer.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/OrSerializer.java
Fri Jul 19 18:46:49 2013
@@ -34,12 +34,13 @@ import javax.xml.namespace.QName;
public class OrSerializer extends AbstractEvaluatorSerializer {
public OMElement serialize(OMElement parent, Evaluator evaluator) throws
EvaluatorException {
if (!(evaluator instanceof OrEvaluator)) {
- throw new IllegalArgumentException("Evalutor should be a
OrEvalutor");
+ throw new IllegalArgumentException("Evaluator should be an
OrEvaluator");
}
OrEvaluator orEvaluator = (OrEvaluator) evaluator;
- OMElement orElement = fac.createOMElement(new
QName((EvaluatorConstants.OR)));
+ OMElement orElement = fac.createOMElement(EvaluatorConstants.OR,
+ EvaluatorConstants.SYNAPSE_NAMESPACE,
EvaluatorConstants.EMPTY_PREFIX);
serializeChildren(orElement, orEvaluator.getEvaluators());
if (parent != null) {
Modified:
synapse/trunk/java/modules/commons/src/test/java/org/apache/synapse/commons/evaluators/config/EqualSerializerTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/test/java/org/apache/synapse/commons/evaluators/config/EqualSerializerTest.java?rev=1504963&r1=1504962&r2=1504963&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/test/java/org/apache/synapse/commons/evaluators/config/EqualSerializerTest.java
(original)
+++
synapse/trunk/java/modules/commons/src/test/java/org/apache/synapse/commons/evaluators/config/EqualSerializerTest.java
Fri Jul 19 18:46:49 2013
@@ -30,8 +30,7 @@ public class EqualSerializerTest extends
private EqualFactory fac = new EqualFactory();
public void testHeaderEqualSerializer() {
- String input = "<equal type=\"header\" source=\"foo\" value=\"bar\"/>";
-
+ String input = "<equal xmlns=\"http://ws.apache.org/ns/synapse\";
type=\"header\" source=\"foo\" value=\"bar\"/>";
try {
Evaluator eval = fac.create(AXIOMUtil.stringToOM(input));
OMElement output = serializer.serialize(null, eval);
@@ -42,7 +41,7 @@ public class EqualSerializerTest extends
}
public void testParameterEqualSerializer() {
- String input = "<equal type=\"param\" source=\"foo\" value=\"bar\"/>";
+ String input = "<equal xmlns=\"http://ws.apache.org/ns/synapse\";
type=\"param\" source=\"foo\" value=\"bar\"/>";
try {
Evaluator eval = fac.create(AXIOMUtil.stringToOM(input));
@@ -54,7 +53,7 @@ public class EqualSerializerTest extends
}
public void testURLEqualSerializer() {
- String input = "<equal type=\"url\" value=\"http://foo.org\"/>";
+ String input = "<equal xmlns=\"http://ws.apache.org/ns/synapse\";
type=\"url\" value=\"http://foo.org\"/>";
try {
Evaluator eval = fac.create(AXIOMUtil.stringToOM(input));
@@ -66,7 +65,7 @@ public class EqualSerializerTest extends
}
public void testURLEqualSerializer2() {
- String input = "<equal type=\"url\" value=\"http://foo.org\";
source=\"protocol\"/>";
+ String input = "<equal xmlns=\"http://ws.apache.org/ns/synapse\";
type=\"url\" value=\"http://foo.org\"; source=\"protocol\"/>";
try {
Evaluator eval = fac.create(AXIOMUtil.stringToOM(input));
Modified:
synapse/trunk/java/modules/commons/src/test/java/org/apache/synapse/commons/evaluators/config/MatchSerializerTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/test/java/org/apache/synapse/commons/evaluators/config/MatchSerializerTest.java?rev=1504963&r1=1504962&r2=1504963&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/test/java/org/apache/synapse/commons/evaluators/config/MatchSerializerTest.java
(original)
+++
synapse/trunk/java/modules/commons/src/test/java/org/apache/synapse/commons/evaluators/config/MatchSerializerTest.java
Fri Jul 19 18:46:49 2013
@@ -30,7 +30,7 @@ public class MatchSerializerTest extends
private MatchFactory fac = new MatchFactory();
public void testHeaderMatchSerializer() {
- String input = "<match type=\"header\" source=\"foo\" regex=\"bar\"/>";
+ String input = "<match xmlns=\"http://ws.apache.org/ns/synapse\";
type=\"header\" source=\"foo\" regex=\"bar\"/>";
try {
Evaluator eval = fac.create(AXIOMUtil.stringToOM(input));
@@ -42,7 +42,7 @@ public class MatchSerializerTest extends
}
public void testParameterMatchSerializer() {
- String input = "<match type=\"param\" source=\"foo\" regex=\"bar\"/>";
+ String input = "<match xmlns=\"http://ws.apache.org/ns/synapse\";
type=\"param\" source=\"foo\" regex=\"bar\"/>";
try {
Evaluator eval = fac.create(AXIOMUtil.stringToOM(input));
@@ -54,7 +54,7 @@ public class MatchSerializerTest extends
}
public void testURLMatchSerializer() {
- String input = "<match type=\"url\" regex=\"http://foo.org\"/>";
+ String input = "<match xmlns=\"http://ws.apache.org/ns/synapse\";
type=\"url\" regex=\"http://foo.org\"/>";
try {
Evaluator eval = fac.create(AXIOMUtil.stringToOM(input));
@@ -66,7 +66,7 @@ public class MatchSerializerTest extends
}
public void testURLMatchSerializer2() {
- String input = "<match type=\"url\" regex=\"http://foo.org\";
source=\"protocol\"/>";
+ String input = "<match xmlns=\"http://ws.apache.org/ns/synapse\";
type=\"url\" regex=\"http://foo.org\"; source=\"protocol\"/>";
try {
Evaluator eval = fac.create(AXIOMUtil.stringToOM(input));
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/ConditionalRouterMediatorSerializationTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/ConditionalRouterMediatorSerializationTest.java?rev=1504963&r1=1504962&r2=1504963&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/ConditionalRouterMediatorSerializationTest.java
(original)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/ConditionalRouterMediatorSerializationTest.java
Fri Jul 19 18:46:49 2013
@@ -32,7 +32,7 @@ public class ConditionalRouterMediatorSe
public void testRouterMediatorSerializationSenarioOne() throws Exception {
String inputXml = "<conditionalRouter
xmlns=\"http://ws.apache.org/ns/synapse\";>" +
- "<conditionalRoute><condition><equal xmlns=\"\" type=\"url\"
value=\"http://localhost:9000.*\"/></condition>" +
+ "<conditionalRoute><condition><equal type=\"url\"
value=\"http://localhost:9000.*\"/></condition>" +
"<target><sequence><log
level=\"full\"/></sequence></target></conditionalRoute>" +
"</conditionalRouter>";
@@ -42,7 +42,7 @@ public class ConditionalRouterMediatorSe
public void testRouterMediatorSerializationSenarioTwo() throws Exception {
String inputXml = "<conditionalRouter
xmlns=\"http://ws.apache.org/ns/synapse\";>" +
- "<conditionalRoute><condition><and xmlns=\"\" ><equal
type=\"url\" value=\"http://localhost:9000.*\"/>" +
+ "<conditionalRoute><condition><and><equal type=\"url\"
value=\"http://localhost:9000.*\"/>" +
"<match type=\"url\"
regex=\"http://localhost:9000.*\"/></and></condition>" +
"<target><sequence><log
level=\"full\"/></sequence></target></conditionalRoute>" +
"</conditionalRouter>";
@@ -53,7 +53,7 @@ public class ConditionalRouterMediatorSe
public void testRouterMediatorSerializationSenarioThree() throws Exception
{
String inputXml = "<conditionalRouter
xmlns=\"http://ws.apache.org/ns/synapse\";>" +
- "<conditionalRoute><condition><or xmlns=\"\" ><equal
type=\"url\" value=\"http://localhost:9000.*\"/>" +
+ "<conditionalRoute><condition><or><equal type=\"url\"
value=\"http://localhost:9000.*\"/>" +
"<match type=\"url\"
regex=\"http://localhost:9000.*\"/></or></condition><target>" +
"<sequence><log
level=\"full\"/></sequence></target></conditionalRoute>" +
"</conditionalRouter>";
@@ -64,7 +64,7 @@ public class ConditionalRouterMediatorSe
public void testRouterMediatorSerializationSenarioFour() throws Exception {
String inputXml = "<conditionalRouter
xmlns=\"http://ws.apache.org/ns/synapse\";>" +
- "<conditionalRoute><condition><not xmlns=\"\"><equal
type=\"url\" value=\"http://localhost:9000.*\"/></not>" +
+ "<conditionalRoute><condition><not><equal type=\"url\"
value=\"http://localhost:9000.*\"/></not>" +
"</condition><target><sequence><log
level=\"full\"/></sequence></target></conditionalRoute>" +
"</conditionalRouter>";
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/URLRewriteMediatorSerializationTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/URLRewriteMediatorSerializationTest.java?rev=1504963&r1=1504962&r2=1504963&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/URLRewriteMediatorSerializationTest.java
(original)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/URLRewriteMediatorSerializationTest.java
Fri Jul 19 18:46:49 2013
@@ -40,7 +40,7 @@ public class URLRewriteMediatorSerializa
public void testSerializationScenario2() {
String xml = "<rewrite xmlns=\"http://ws.apache.org/ns/synapse\";>" +
- "<rewriterule><condition><match xmlns=\"\" type=\"url\"
source=\"host\" regex=\"localhost\"/>" +
+ "<rewriterule><condition><match type=\"url\" source=\"host\"
regex=\"localhost\"/>" +
"</condition><action fragment=\"protocol\" value=\"https\"
type=\"set\"/>" +
"<action fragment=\"host\" value=\"www.test.com\"
type=\"set\"/><action " +
"fragment=\"port\" value=\"9090\" type=\"set\"/><action
fragment=\"path\" " +
@@ -52,12 +52,12 @@ public class URLRewriteMediatorSerializa
public void testSerializationScenario3() {
String xml = "<rewrite
xmlns=\"http://ws.apache.org/ns/synapse\";><rewriterule>" +
"<action fragment=\"full\"
value=\"http://localhost:8080/synapse\"; type=\"set\"/></rewriterule>" +
- "<rewriterule><condition><match xmlns=\"\" type=\"url\"
source=\"host\" regex=\"localhost\"/>" +
+ "<rewriterule><condition><match type=\"url\" source=\"host\"
regex=\"localhost\"/>" +
"</condition><action fragment=\"protocol\" value=\"https\"
type=\"set\"/>" +
"<action fragment=\"host\" value=\"www.test.com\"
type=\"set\"/>" +
"<action fragment=\"port\" xpath=\"get-property('port')\"
type=\"set\"/>" +
"<action fragment=\"path\" value=\"/services\"
type=\"prepend\"/></rewriterule><rewriterule>" +
- "<condition><and xmlns=\"\"><match type=\"url\"
source=\"host\" regex=\"www.test.com\"/>" +
+ "<condition><and><match type=\"url\" source=\"host\"
regex=\"www.test.com\"/>" +
"<equal type=\"url\" source=\"port\"
value=\"9090\"/></and></condition>" +
"<action fragment=\"path\" regex=\".*/FooService\"
type=\"replace\" " +
"value=\"/BarService\"/></rewriterule>" +
