You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by sa...@apache.org on 2006/05/18 17:07:48 UTC

svn commit: r407565 - in /incubator/synapse/trunk/java: etc/ modules/core/ modules/core/src/org/apache/synapse/config/xml/ modules/core/src/org/apache/synapse/mediators/builtin/ modules/core/test/org/apache/synapse/mediators/builtin/ modules/extensions...

Author: saminda
Date: Thu May 18 08:07:48 2006
New Revision: 407565

URL: http://svn.apache.org/viewvc?rev=407565&view=rev
Log:
checking in for asankha
move validate mediator into extensions

Added:
    incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/config/xml/ValidateMediatorFactory.java
      - copied, changed from r406952, incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ValidateMediatorFactory.java
    incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/ValidateMediator.java
      - copied, changed from r407499, incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/ValidateMediator.java
    incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/TestMediateHandler.java
      - copied, changed from r407499, incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spring/TestMediateHandler.java
    incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/TestMediator.java
    incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/ValidateMediatorTest.java
      - copied, changed from r406952, incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java
Removed:
    incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ValidateMediatorFactory.java
    incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/ValidateMediator.java
    incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java
    incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spring/TestMediateHandler.java
Modified:
    incubator/synapse/trunk/java/etc/project.xml
    incubator/synapse/trunk/java/modules/core/project.xml
    incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/Constants.java
    incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/MediatorFactoryFinder.java
    incubator/synapse/trunk/java/modules/extensions/project.xml
    incubator/synapse/trunk/java/modules/extensions/src/META-INF/services/org.apache.synapse.config.xml.MediatorFactory
    incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spring/SpringTestBean.java
    incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spring/TestMediateHandlerImpl.java

Modified: incubator/synapse/trunk/java/etc/project.xml
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/etc/project.xml?rev=407565&r1=407564&r2=407565&view=diff
==============================================================================
--- incubator/synapse/trunk/java/etc/project.xml (original)
+++ incubator/synapse/trunk/java/etc/project.xml Thu May 18 08:07:48 2006
@@ -2,11 +2,8 @@
 <project>
 
     <pomVersion>3</pomVersion>
-
     <id>Synapse-Incubating</id>
-
     <name>Apache Synpase</name>
-
     <currentVersion>M2-SNAPSHOT</currentVersion>
 
     <organization>
@@ -23,15 +20,13 @@
         framework based on Web services specifications.</description>
 
     <url>http://ws.apache.org/synapse/</url>
-    <issueTrackingUrl>
-        http://issues.apache.org/jira/browse/Synapse</issueTrackingUrl>
+    <issueTrackingUrl>http://issues.apache.org/jira/browse/Synapse</issueTrackingUrl>
     <siteAddress>ws.apache.org</siteAddress>
     <siteDirectory>/synapse/</siteDirectory>
     <distributionDirectory>/www/ws.apache.org/builds/</distributionDirectory>
 
 
     <!--any mailing lists for the project -->
-
     <mailingLists>
         <mailingList>
             <name>Synpase Developer List</name>
@@ -61,6 +56,15 @@
             <artifactId>axis2</artifactId>
             <version>${axis2.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>ws-commons</groupId>
+            <artifactId>axiom</artifactId>
+            <version>${axiom.version}</version>
+            <properties>
+                <module>false</module>
+            </properties>
+        </dependency>
         
         <dependency>
             <groupId>org.apache.ws.commons</groupId>
@@ -79,16 +83,6 @@
                 <module>false</module>
             </properties>
         </dependency>
-        <dependency>
-            <groupId>ws-commons</groupId>
-            <artifactId>axiom</artifactId>
-            <version>${axiom.version}</version>
-            <properties>
-                <module>false</module>
-            </properties>
-        </dependency>
-
-
 
         <!-- external JARs -->
         <dependency>
@@ -99,7 +93,6 @@
                 <module>true</module>
             </properties>
         </dependency>
-
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
@@ -149,6 +142,23 @@
             </properties>
         </dependency>
         <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <properties>
+                <classloader>root</classloader>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>jaxen</groupId>
+            <artifactId>jaxen</artifactId>
+            <version>${jaxen.version}</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+
+				<dependency>
             <groupId>axis</groupId>
             <artifactId>axis-wsdl4j</artifactId>
             <version>${axis.wsdl4j.version}</version>
@@ -181,22 +191,6 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <properties>
-                <classloader>root</classloader>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>jaxen</groupId>
-            <artifactId>jaxen</artifactId>
-            <version>${jaxen.version}</version>
-            <properties>
-                <module>true</module>
-            </properties>
-        </dependency>
-        <dependency>
             <groupId>xalan</groupId>
             <artifactId>xalan</artifactId>
             <version>2.6.0</version>
@@ -204,24 +198,6 @@
                 <module>true</module>
             </properties>
         </dependency>
-
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>${xerces.version}</version>
-            <properties>
-                <module>true</module>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-            <version>${xml_apis.version}</version>
-            <properties>
-                <module>true</module>
-            </properties>
-        </dependency>
-
         <dependency>
             <groupId>annogen</groupId>
             <artifactId>annogen</artifactId>
@@ -230,7 +206,6 @@
                 <module>true</module>
             </properties>
         </dependency>
-
         <dependency>
             <groupId>backport-util-concurrent</groupId>
             <artifactId>backport-util-concurrent</artifactId>
@@ -239,6 +214,7 @@
                 <module>true</module>
             </properties>
         </dependency>
+
     </dependencies>
 
     <!-- ================================= -->
@@ -253,9 +229,6 @@
             <includes>
                 <include>**/*Test.java</include>
             </includes>
-            <!--<excludes>-->
-            <!--<exclude>**/AddressingInProcessorTest.java</exclude>-->
-            <!--</excludes>-->
             <resources>
 				<resource>
 					<directory>conf</directory>

Modified: incubator/synapse/trunk/java/modules/core/project.xml
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/project.xml?rev=407565&r1=407564&r2=407565&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/project.xml (original)
+++ incubator/synapse/trunk/java/modules/core/project.xml Thu May 18 08:07:48 2006
@@ -23,10 +23,6 @@
             <includes>
                 <include>**/*Test.java</include>
             </includes>
-            <!--<excludes>
-                <exclude>**/*ValidateMediatorTest.java</exclude>
-                <exclude>**/*TransformMediatorTest.java</exclude>
-            </excludes>-->
             <resources>
                 <resource>
                     <directory>test-resources</directory>
@@ -42,7 +38,6 @@
 				</includes>
 			</resource>
         </resources>
-
     </build>
 </project>
 

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/Constants.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/Constants.java?rev=407565&r1=407564&r2=407565&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/Constants.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/Constants.java Thu May 18 08:07:48 2006
@@ -18,19 +18,15 @@
 import javax.xml.namespace.QName;
 
 /**
- * <p/>
  * Constants used in the XML processing
  */
 public interface Constants {
-    public static final QName DEFINITIONS_ELT = new QName("definitions");
-    public static final QName SEQUENCE_ELT = new QName("sequence");
-    public static final QName ENDPOINT_ELT = new QName("endpoint");
-    public static final QName CONFIG_ELT = new QName("configuration");
-    public static final QName PROPERTY_ELT = new QName("set-property");
-
-    public static final QName RULES_ELT = new QName("rules");
+    public static final QName DEFINITIONS_ELT   = new QName(Constants.SYNAPSE_NAMESPACE, "definitions");
+    public static final QName SEQUENCE_ELT      = new QName(Constants.SYNAPSE_NAMESPACE, "sequence");
+    public static final QName ENDPOINT_ELT      = new QName(Constants.SYNAPSE_NAMESPACE, "endpoint");
+    public static final QName PROPERTY_ELT      = new QName(Constants.SYNAPSE_NAMESPACE, "set-property");
+    public static final QName RULES_ELT         = new QName(Constants.SYNAPSE_NAMESPACE, "rules");
 
     public static final String SYNAPSE_NAMESPACE = org.apache.synapse.Constants.SYNAPSE_NAMESPACE;
-    public static final String SYNAPSE = "synapse";
-    public static final String NULL_NAMESPACE = "";
+    public static final String NULL_NAMESPACE    = "";
 }

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/MediatorFactoryFinder.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/MediatorFactoryFinder.java?rev=407565&r1=407564&r2=407565&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/MediatorFactoryFinder.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/MediatorFactoryFinder.java Thu May 18 08:07:48 2006
@@ -56,7 +56,6 @@
         HeaderMediatorFactory.class,
         FaultMediatorFactory.class,
         TransformMediatorFactory.class,
-        ValidateMediatorFactory.class,
         PropertyMediatorFactory.class,
         SwitchMediatorFactory.class,
         SwitchCaseMediatorFactory.class,

Modified: incubator/synapse/trunk/java/modules/extensions/project.xml
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/project.xml?rev=407565&r1=407564&r2=407565&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/project.xml (original)
+++ incubator/synapse/trunk/java/modules/extensions/project.xml Thu May 18 08:07:48 2006
@@ -27,6 +27,25 @@
                 <module>true</module>
             </properties>
         </dependency>
+
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>${xerces.version}</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+            <version>${xml_apis.version}</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -37,9 +56,7 @@
             <includes>
                 <include>**/*Test.java</include>
             </includes>
-            <!--<excludes>-->
-                <!--<exclude>**/*Test.java</exclude>-->
-            <!--</excludes>-->
+
             <resources>
                 <resource>
                     <directory>src</directory>

Modified: incubator/synapse/trunk/java/modules/extensions/src/META-INF/services/org.apache.synapse.config.xml.MediatorFactory
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/META-INF/services/org.apache.synapse.config.xml.MediatorFactory?rev=407565&r1=407564&r2=407565&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/META-INF/services/org.apache.synapse.config.xml.MediatorFactory (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/META-INF/services/org.apache.synapse.config.xml.MediatorFactory Thu May 18 08:07:48 2006
@@ -1 +1,2 @@
-org.apache.synapse.config.xml.SpringMediatorFactory
\ No newline at end of file
+org.apache.synapse.config.xml.SpringMediatorFactory
+org.apache.synapse.config.xml.ValidateMediatorFactory
\ No newline at end of file

Copied: incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/config/xml/ValidateMediatorFactory.java (from r406952, incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ValidateMediatorFactory.java)
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/config/xml/ValidateMediatorFactory.java?p2=incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/config/xml/ValidateMediatorFactory.java&p1=incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ValidateMediatorFactory.java&r1=406952&r2=407565&rev=407565&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ValidateMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/config/xml/ValidateMediatorFactory.java Thu May 18 08:07:48 2006
@@ -15,32 +15,32 @@
 */
 package org.apache.synapse.config.xml;
 
-import org.apache.synapse.api.Mediator;
-import org.apache.synapse.mediators.builtin.ValidateMediator;
-import org.apache.synapse.SynapseException;
-import org.apache.synapse.Util;
-import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMAttribute;
+import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.xpath.AXIOMXPath;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.SynapseException;
+import org.apache.synapse.Util;
+import org.apache.synapse.api.Mediator;
+import org.apache.synapse.mediators.ValidateMediator;
 import org.jaxen.JaxenException;
 
 import javax.xml.namespace.QName;
 
 /**
  * Creates a validation mediator from the XML configuration
- *
+ * <p/>
  * <validate schema="url" [source="xpath"]>
- *   <on-fail>
- *     mediator+
- *   </on-fail>
+ * <on-fail>
+ * mediator+
+ * </on-fail>
  * </validate>
  */
 public class ValidateMediatorFactory extends AbstractListMediatorFactory {
 
     private static final Log log = LogFactory.getLog(TransformMediatorFactory.class);
-    private static final QName VALIDATE_Q    = new QName(Constants.SYNAPSE_NAMESPACE, "validate");
+    private static final QName VALIDATE_Q = new QName(Constants.SYNAPSE_NAMESPACE, "validate");
 
     public Mediator createMediator(OMElement elem) {
 

Copied: incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/ValidateMediator.java (from r407499, incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/ValidateMediator.java)
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/ValidateMediator.java?p2=incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/ValidateMediator.java&p1=incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/ValidateMediator.java&r1=407499&r2=407565&rev=407565&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/ValidateMediator.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/ValidateMediator.java Thu May 18 08:07:48 2006
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.synapse.mediators.builtin;
+package org.apache.synapse.mediators;
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMNamespace;
@@ -139,6 +139,7 @@
     public boolean mediate(MessageContext synCtx) {
 
         ByteArrayInputStream baisFromSource = null;
+        OMNode sourceNode = null;
 
         try {
             // create a byte array output stream and serialize the source node into it
@@ -146,7 +147,7 @@
             XMLStreamWriter xsWriterForSource = XMLOutputFactory.newInstance().createXMLStreamWriter(baosForSource);
 
             // serialize the validation target and get an input stream into it
-            OMNode sourceNode = getValidateSource(synCtx);
+            sourceNode = getValidateSource(synCtx);
             sourceNode.serialize(xsWriterForSource);
             baisFromSource = new ByteArrayInputStream(baosForSource.toByteArray());
 
@@ -198,7 +199,7 @@
             validator.validate(source);
 
             if (handler.isValidationError()) {
-                log.debug("Validation of element : " + source + " failed against : " + schemaUrl +
+                log.debug("Validation of element : " + sourceNode + " failed against : " + schemaUrl +
                     " Message : " + handler.getSaxParseException().getMessage() + " Executing 'on-fail' sequence");
                 log.debug("Failed message envelope : " + synCtx.getEnvelope());
                 // super.mediate() invokes the "on-fail" sequence of mediators

Copied: incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/TestMediateHandler.java (from r407499, incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spring/TestMediateHandler.java)
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/TestMediateHandler.java?p2=incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/TestMediateHandler.java&p1=incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spring/TestMediateHandler.java&r1=407499&r2=407565&rev=407565&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spring/TestMediateHandler.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/TestMediateHandler.java Thu May 18 08:07:48 2006
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.synapse.spring;
+package org.apache.synapse;
 
 import org.apache.synapse.MessageContext;
 

Added: incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/TestMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/TestMediator.java?rev=407565&view=auto
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/TestMediator.java (added)
+++ incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/TestMediator.java Thu May 18 08:07:48 2006
@@ -0,0 +1,49 @@
+/*
+* Copyright 2004,2005 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.synapse;
+
+import org.apache.synapse.api.Mediator;
+import org.apache.synapse.TestMediateHandler;
+
+/**
+ * Test mediator class.
+ */
+public class TestMediator implements Mediator {
+
+    private org.apache.synapse.TestMediateHandler handlerTest = null;
+
+    public TestMediator() {
+    }
+
+    public boolean mediate(MessageContext synCtx) {
+        if (handlerTest != null) {
+            handlerTest.handle(synCtx);
+        }
+        return true;
+    }
+
+    public String getType() {
+        return null;
+    }
+
+    public TestMediateHandler getHandler() {
+        return handlerTest;
+    }
+
+    public void setHandler(TestMediateHandler handlerTest) {
+        this.handlerTest = handlerTest;
+    }
+}

Copied: incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/ValidateMediatorTest.java (from r406952, incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java)
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/ValidateMediatorTest.java?p2=incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/ValidateMediatorTest.java&p1=incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java&r1=406952&r2=407565&rev=407565&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/ValidateMediatorTest.java Thu May 18 08:07:48 2006
@@ -13,14 +13,15 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.synapse.mediators.builtin;
+package org.apache.synapse;
 
 import junit.framework.TestCase;
 import org.apache.axiom.om.xpath.AXIOMXPath;
 import org.apache.synapse.MessageContext;
-import org.apache.synapse.mediators.TestMediateHandler;
-import org.apache.synapse.mediators.TestMediator;
-import org.apache.synapse.mediators.TestUtils;
+import org.apache.synapse.TestMediateHandler;
+import org.apache.synapse.TestMediator;
+import org.apache.synapse.TestUtils;
+import org.apache.synapse.mediators.ValidateMediator;
 
 public class ValidateMediatorTest extends TestCase {
 
@@ -56,12 +57,12 @@
 
     private static final String VALID_ENVELOPE_NO_NS =
             "<CheckPriceRequest xmlns=\"http://www.apache-synapse.org/test\">\n" +
-            "\t<Code>String</Code>\n" +
+            "<Code>String</Code>\n" +
             "</CheckPriceRequest>\n";
 
     private static final String IN_VALID_ENVELOPE_NO_NS =
             "<CheckPriceRequest xmlns=\"http://www.apache-synapse.org/test\">\n" +
-            "\t<Code>String</Code>\n" +
+            "<Codes>String</Codes>\n" +
             "</CheckPriceRequest>\n";
 
     private boolean onFailInvoked = false;
@@ -88,7 +89,7 @@
         ValidateMediator validate = new ValidateMediator();
 
         // set the schema url, source xpath and any name spaces
-        validate.setSchemaUrl("test-resources/misc/validate.xsd");
+        validate.setSchemaUrl("../core/test-resources/misc/validate.xsd");
         AXIOMXPath source = new AXIOMXPath("//m0:CheckPriceRequest");
         source.addNamespace("m0", "http://www.apache-synapse.org/test");
         validate.setSource(source);
@@ -109,7 +110,7 @@
         ValidateMediator validate = new ValidateMediator();
 
         // set the schema url, source xpath and any name spaces
-        validate.setSchemaUrl("test-resources/misc/validate.xsd test-resources/misc/validate2.xsd");
+        validate.setSchemaUrl("../core/test-resources/misc/validate.xsd ../core/test-resources/misc/validate2.xsd");
         AXIOMXPath source = new AXIOMXPath("//m0:Outer");
         source.addNamespace("m0", "http://www.apache-synapse.org/test2");
         validate.setSource(source);
@@ -130,7 +131,7 @@
         ValidateMediator validate = new ValidateMediator();
 
         // set the schema url, source xpath and any name spaces
-        validate.setSchemaUrl("test-resources/misc/validate.xsd test-resources/misc/validate2.xsd");
+        validate.setSchemaUrl("../core/test-resources/misc/validate.xsd ../core/test-resources/misc/validate2.xsd");
         AXIOMXPath source = new AXIOMXPath("//m0:Outer");
         source.addNamespace("m0", "http://www.apache-synapse.org/test2");
         validate.setSource(source);
@@ -151,7 +152,7 @@
         ValidateMediator validate = new ValidateMediator();
 
         // set the schema url, source xpath and any name spaces
-        validate.setSchemaUrl("modules/core/test-resources/misc/validate.xsd");
+        validate.setSchemaUrl("../core/test-resources/misc/validate.xsd");
         AXIOMXPath source = new AXIOMXPath("//m0:CheckPriceRequest");
         source.addNamespace("m0", "http://www.apache-synapse.org/test");
         validate.setSource(source);
@@ -172,7 +173,7 @@
         ValidateMediator validate = new ValidateMediator();
 
         // set the schema url, source xpath and any name spaces
-        validate.setSchemaUrl("test-resources/misc/validate.xsd");
+        validate.setSchemaUrl("../core/test-resources/misc/validate.xsd");
         AXIOMXPath source = new AXIOMXPath("//m0:CheckPriceRequest");
         source.addNamespace("m0", "http://www.apache-synapse.org/test");
         validate.setSource(source);
@@ -193,7 +194,7 @@
         ValidateMediator validate = new ValidateMediator();
 
         // set the schema url, source xpath and any name spaces
-        validate.setSchemaUrl("modules/core/test-resources/misc/validate.xsd");
+        validate.setSchemaUrl("../core/test-resources/misc/validate.xsd");
         AXIOMXPath source = new AXIOMXPath("//m0:CheckPriceRequest");
         source.addNamespace("m0", "http://www.apache-synapse.org/test");
         validate.setSource(source);

Modified: incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spring/SpringTestBean.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spring/SpringTestBean.java?rev=407565&r1=407564&r2=407565&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spring/SpringTestBean.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spring/SpringTestBean.java Thu May 18 08:07:48 2006
@@ -17,6 +17,7 @@
 
 import org.apache.synapse.api.Mediator;
 import org.apache.synapse.MessageContext;
+import org.apache.synapse.TestMediateHandler;
 
 /**
  * This is a very simple Spring bean, that has one int property, and a

Modified: incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spring/TestMediateHandlerImpl.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spring/TestMediateHandlerImpl.java?rev=407565&r1=407564&r2=407565&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spring/TestMediateHandlerImpl.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spring/TestMediateHandlerImpl.java Thu May 18 08:07:48 2006
@@ -16,6 +16,7 @@
 package org.apache.synapse.spring;
 
 import org.apache.synapse.MessageContext;
+import org.apache.synapse.TestMediateHandler;
 
 public class TestMediateHandlerImpl implements TestMediateHandler {
 



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