You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by as...@apache.org on 2007/03/29 21:24:05 UTC

svn commit: r523809 - in /webservices/synapse/trunk/java: ./ modules/core/src/main/java/org/apache/synapse/config/xml/ modules/core/src/main/java/org/apache/synapse/mediators/transform/ modules/core/src/main/java/org/apache/synapse/mediators/validate/ ...

Author: asankha
Date: Thu Mar 29 12:24:04 2007
New Revision: 523809

URL: http://svn.apache.org/viewvc?view=rev&rev=523809
Log:
Fix SYNAPSE-80
move XSLT and validate mediators to core from extensions
include xerces, xalan and rhino into dist

Added:
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
      - copied unchanged from r523786, webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediatorFactory.java
      - copied unchanged from r523786, webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/transform/XSLTMediatorFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediatorSerializer.java
      - copied unchanged from r523786, webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/transform/XSLTMediatorSerializer.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/validate/
      - copied from r523786, webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/
Removed:
    webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/transform/
    webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/
Modified:
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorSerializerFinder.java
    webservices/synapse/trunk/java/modules/extensions/pom.xml
    webservices/synapse/trunk/java/modules/extensions/src/main/resources/META-INF/services/org.apache.synapse.config.xml.MediatorFactory
    webservices/synapse/trunk/java/modules/extensions/src/main/resources/META-INF/services/org.apache.synapse.config.xml.MediatorSerializer
    webservices/synapse/trunk/java/pom.xml

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java?view=diff&rev=523809&r1=523808&r2=523809
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java Thu Mar 29 12:24:04 2007
@@ -26,6 +26,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.synapse.SynapseException;
 import org.apache.synapse.Mediator;
+import org.apache.synapse.mediators.transform.XSLTMediatorFactory;
+import org.apache.synapse.mediators.validate.ValidateMediatorFactory;
 import org.apache.synapse.config.XMLToObjectMapper;
 import sun.misc.Service;
 
@@ -60,7 +62,9 @@
         OutMediatorFactory.class,
         RMSequenceMediatorFactory.class,          
         ClassMediatorFactory.class,
-      };
+        ValidateMediatorFactory.class,
+        XSLTMediatorFactory.class
+    };
 
     private static MediatorFactoryFinder instance = null;
 

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorSerializerFinder.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorSerializerFinder.java?view=diff&rev=523809&r1=523808&r2=523809
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorSerializerFinder.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorSerializerFinder.java Thu Mar 29 12:24:04 2007
@@ -23,6 +23,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.synapse.SynapseException;
 import org.apache.synapse.Mediator;
+import org.apache.synapse.mediators.validate.ValidateMediatorSerializer;
+import org.apache.synapse.mediators.transform.XSLTMediatorSerializer;
 import sun.misc.Service;
 
 import java.util.HashMap;
@@ -47,7 +49,9 @@
         InMediatorSerializer.class,
         OutMediatorSerializer.class,
         RMSequenceMediatorSerializer.class,     
-        ClassMediatorSerializer.class
+        ClassMediatorSerializer.class,
+        ValidateMediatorSerializer.class,
+        XSLTMediatorSerializer.class        
     };
 
     private static MediatorSerializerFinder instance = null;

Modified: webservices/synapse/trunk/java/modules/extensions/pom.xml
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/pom.xml?view=diff&rev=523809&r1=523808&r2=523809
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/pom.xml (original)
+++ webservices/synapse/trunk/java/modules/extensions/pom.xml Thu Mar 29 12:24:04 2007
@@ -73,30 +73,6 @@
             <version>${spring.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>${xerces.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-            <version>${xml_apis.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>xalan</groupId>
-            <artifactId>xalan</artifactId>
-            <version>${xalan.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>rhino</groupId>
-            <artifactId>js</artifactId>
-            <version>${js.version}</version>
-        </dependency>
-
         <!--For Axiom/E4X -->
         <!--<dependency>
             <groupId>org.wso2.javascript.rhino</groupId>
@@ -140,10 +116,6 @@
     <properties>
         <wso2commons.version>1.2-SNAPSHOT</wso2commons.version>
         <spring.version>1.2.6</spring.version>
-        <xerces.version>2.8.1</xerces.version>
-        <xml_apis.version>1.3.03</xml_apis.version>
-        <xalan.version>2.7.0</xalan.version>
-        <js.version>1.6R5</js.version>
         <xbean.version>2.2.0</xbean.version>
         <bsf.version>3.0-beta1-SNAPSHOT</bsf.version>
         <groovy.version>1.0</groovy.version>

Modified: webservices/synapse/trunk/java/modules/extensions/src/main/resources/META-INF/services/org.apache.synapse.config.xml.MediatorFactory
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/resources/META-INF/services/org.apache.synapse.config.xml.MediatorFactory?view=diff&rev=523809&r1=523808&r2=523809
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/src/main/resources/META-INF/services/org.apache.synapse.config.xml.MediatorFactory (original)
+++ webservices/synapse/trunk/java/modules/extensions/src/main/resources/META-INF/services/org.apache.synapse.config.xml.MediatorFactory Thu Mar 29 12:24:04 2007
@@ -1,5 +1,3 @@
-org.apache.synapse.mediators.validate.ValidateMediatorFactory
-org.apache.synapse.mediators.transform.XSLTMediatorFactory
 org.apache.synapse.mediators.spring.SpringMediatorFactory
 org.apache.synapse.mediators.bsf.ScriptMediatorFactory
 org.apache.synapse.mediators.attachment.AttachmentMediatorFactory

Modified: webservices/synapse/trunk/java/modules/extensions/src/main/resources/META-INF/services/org.apache.synapse.config.xml.MediatorSerializer
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/resources/META-INF/services/org.apache.synapse.config.xml.MediatorSerializer?view=diff&rev=523809&r1=523808&r2=523809
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/src/main/resources/META-INF/services/org.apache.synapse.config.xml.MediatorSerializer (original)
+++ webservices/synapse/trunk/java/modules/extensions/src/main/resources/META-INF/services/org.apache.synapse.config.xml.MediatorSerializer Thu Mar 29 12:24:04 2007
@@ -1,5 +1,3 @@
-org.apache.synapse.mediators.validate.ValidateMediatorSerializer
-org.apache.synapse.mediators.transform.XSLTMediatorSerializer
 org.apache.synapse.mediators.spring.SpringMediatorSerializer
 org.apache.synapse.mediators.bsf.ScriptMediatorSerializer
 org.apache.synapse.mediators.throttle.ThrottleMediatorSerializer

Modified: webservices/synapse/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/pom.xml?view=diff&rev=523809&r1=523808&r2=523809
==============================================================================
--- webservices/synapse/trunk/java/pom.xml (original)
+++ webservices/synapse/trunk/java/pom.xml Thu Mar 29 12:24:04 2007
@@ -427,6 +427,30 @@
             <version>${backport_util_concurrent.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>${xerces.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+            <version>${xml_apis.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+            <version>${xalan.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>rhino</groupId>
+            <artifactId>js</artifactId>
+            <version>${js.version}</version>
+        </dependency>
+
         <!-- dependencies for nhttp transport -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -490,7 +514,7 @@
     </distributionManagement>
 
     <repositories>
-        <repository>
+        <!--<repository>
             <id>asankha-m2</id>
             <name>asankha-m2</name>
             <url>http://people.apache.org/~asankha/maven2/</url>
@@ -500,7 +524,7 @@
             <snapshots>
                 <updatePolicy>interval:1440</updatePolicy>
             </snapshots>
-        </repository>
+        </repository>-->
         <!--for Axiom/E4X
         <repository>
             <id>thilina</id>
@@ -590,7 +614,7 @@
       <!-- Axis2 1.1.1 and its dependencies -->
         <axis2.version>SNAPSHOT</axis2.version>
         <rampart.version>SNAPSHOT</rampart.version>
-        <axiom.version>1.2.3-RC1</axiom.version>
+        <axiom.version>SNAPSHOT</axiom.version>
         <xml_schema.version>SNAPSHOT</xml_schema.version>
 
         <stax.impl.groupid>org.codehaus.woodstox</stax.impl.groupid>
@@ -620,6 +644,11 @@
         <neethi.version>SNAPSHOT</neethi.version>
         <wss4j.version>SNAPSHOT</wss4j.version>
         <xmlsec.version>1.3.0</xmlsec.version>
+
+        <xerces.version>2.8.1</xerces.version>
+        <xml_apis.version>1.3.03</xml_apis.version>
+        <xalan.version>2.7.0</xalan.version>
+        <js.version>1.6R5</js.version>        
 
         <!-- misc -->
         <junit.version>3.8.2</junit.version>



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