synapse-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asan...@apache.org
Subject svn commit: r468708 - in /incubator/synapse/branches/NIO: ./ modules/core/ modules/core/src/org/apache/synapse/config/xml/ modules/core/src/org/apache/synapse/core/axis2/ modules/core/test/org/apache/synapse/mediators/ modules/extensions/ modules/exten...
Date Sat, 28 Oct 2006 17:43:36 GMT
Author: asankha
Date: Sat Oct 28 10:43:34 2006
New Revision: 468708

URL: http://svn.apache.org/viewvc?view=rev&rev=468708
Log:
merge from trunk rev 462889 to 468705

Added:
    incubator/synapse/branches/NIO/modules/core/pom.xml
    incubator/synapse/branches/NIO/modules/extensions/pom.xml
    incubator/synapse/branches/NIO/modules/extensions/src/org/apache/synapse/mediators/bsf/
      - copied from r468705, incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/bsf/
    incubator/synapse/branches/NIO/modules/extensions/src/org/apache/synapse/mediators/bsf/InlineScriptMediator.java
      - copied unchanged from r468705, incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/bsf/InlineScriptMediator.java
    incubator/synapse/branches/NIO/modules/extensions/src/org/apache/synapse/mediators/bsf/ScriptMediator.java
      - copied unchanged from r468705, incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/bsf/ScriptMediator.java
    incubator/synapse/branches/NIO/modules/extensions/src/org/apache/synapse/mediators/bsf/ScriptMediatorFactory.java
      - copied unchanged from r468705, incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/bsf/ScriptMediatorFactory.java
    incubator/synapse/branches/NIO/modules/extensions/src/org/apache/synapse/mediators/bsf/ScriptMessageContext.java
      - copied unchanged from r468705, incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/bsf/ScriptMessageContext.java
    incubator/synapse/branches/NIO/modules/extensions/src/org/apache/synapse/mediators/bsf/ThreadLocalMessageContext.java
      - copied unchanged from r468705, incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/bsf/ThreadLocalMessageContext.java
    incubator/synapse/branches/NIO/modules/extensions/src/org/apache/synapse/mediators/bsf/convertors/
      - copied from r468705, incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/bsf/convertors/
    incubator/synapse/branches/NIO/modules/extensions/src/org/apache/synapse/mediators/bsf/convertors/DefaultOMElementConvertor.java
      - copied unchanged from r468705, incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/bsf/convertors/DefaultOMElementConvertor.java
    incubator/synapse/branches/NIO/modules/extensions/src/org/apache/synapse/mediators/bsf/convertors/JSOMElementConvertor.java
      - copied unchanged from r468705, incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/bsf/convertors/JSOMElementConvertor.java
    incubator/synapse/branches/NIO/modules/extensions/src/org/apache/synapse/mediators/bsf/convertors/OMElementConvertor.java
      - copied unchanged from r468705, incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/bsf/convertors/OMElementConvertor.java
    incubator/synapse/branches/NIO/modules/extensions/src/org/apache/synapse/mediators/bsf/convertors/RBOMElementConvertor.java
      - copied unchanged from r468705, incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/bsf/convertors/RBOMElementConvertor.java
    incubator/synapse/branches/NIO/modules/extensions/test/org/apache/synapse/mediators/bsf/
      - copied from r468705, incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/bsf/
    incubator/synapse/branches/NIO/modules/extensions/test/org/apache/synapse/mediators/bsf/InlineScriptMediatorTest.java
      - copied unchanged from r468705, incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/bsf/InlineScriptMediatorTest.java
    incubator/synapse/branches/NIO/modules/extensions/test/org/apache/synapse/mediators/bsf/ScriptMediatorFactoryTest.java
      - copied unchanged from r468705, incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/bsf/ScriptMediatorFactoryTest.java
    incubator/synapse/branches/NIO/modules/extensions/test/org/apache/synapse/mediators/bsf/ScriptMediatorTest.java
      - copied unchanged from r468705, incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/bsf/ScriptMediatorTest.java
    incubator/synapse/branches/NIO/modules/extensions/test/org/apache/synapse/mediators/bsf/ScriptMessageContextTest.java
      - copied unchanged from r468705, incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/bsf/ScriptMessageContextTest.java
    incubator/synapse/branches/NIO/modules/nhttp/pom.xml
    incubator/synapse/branches/NIO/modules/niohttp/maven.xml
    incubator/synapse/branches/NIO/modules/niohttp/pom.xml
    incubator/synapse/branches/NIO/modules/niohttp/project.properties
    incubator/synapse/branches/NIO/modules/niohttp/project.xml
    incubator/synapse/branches/NIO/modules/samples/pom.xml
    incubator/synapse/branches/NIO/pom.xml
    incubator/synapse/branches/NIO/repository/conf/sample/synapse_sample_js.xml
      - copied unchanged from r468705, incubator/synapse/trunk/java/repository/conf/sample/synapse_sample_js.xml
    incubator/synapse/branches/NIO/repository/conf/sample/synapse_sample_script.xml
      - copied unchanged from r468705, incubator/synapse/trunk/java/repository/conf/sample/synapse_sample_script.xml
    incubator/synapse/branches/NIO/repository/conf/sample/xmethodsStockquoteIn.js
      - copied unchanged from r468705, incubator/synapse/trunk/java/repository/conf/sample/xmethodsStockquoteIn.js
    incubator/synapse/branches/NIO/repository/conf/sample/xmethodsStockquoteOut.js
      - copied unchanged from r468705, incubator/synapse/trunk/java/repository/conf/sample/xmethodsStockquoteOut.js
Modified:
    incubator/synapse/branches/NIO/modules/core/project.xml
    incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/config/xml/MediatorFactoryFinder.java
    incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/config/xml/ProxyServiceFactory.java
    incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/config/xml/ProxyServiceSerializer.java
    incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/core/axis2/ProxyService.java
    incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java
    incubator/synapse/branches/NIO/modules/core/test/org/apache/synapse/mediators/TestUtils.java
    incubator/synapse/branches/NIO/modules/extensions/project.xml
    incubator/synapse/branches/NIO/modules/extensions/src/META-INF/services/org.apache.synapse.config.xml.MediatorFactory
    incubator/synapse/branches/NIO/project.properties

Added: incubator/synapse/branches/NIO/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/synapse/branches/NIO/modules/core/pom.xml?view=auto&rev=468708
==============================================================================
--- incubator/synapse/branches/NIO/modules/core/pom.xml (added)
+++ incubator/synapse/branches/NIO/modules/core/pom.xml Sat Oct 28 10:43:34 2006
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.synapse</groupId>
+    <artifactId>Apache-Synapse-Incubating</artifactId>
+    <version>SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>synapse-core</artifactId>
+  <name>Apache Synapse - Core</name>
+  <description>Apache Synapse - Core</description>
+  <packaging>jar</packaging>  
+  
+  <build>
+  	<sourceDirectory>src</sourceDirectory>
+  	<testSourceDirectory>test</testSourceDirectory>
+  	
+  	<plugins>
+    </plugins>
+    
+  </build>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.synapse</groupId>
+      <artifactId>synapse-nhttp</artifactId>
+    </dependency>
+  </dependencies>
+</project>

Modified: incubator/synapse/branches/NIO/modules/core/project.xml
URL: http://svn.apache.org/viewvc/incubator/synapse/branches/NIO/modules/core/project.xml?view=diff&rev=468708&r1=468707&r2=468708
==============================================================================
--- incubator/synapse/branches/NIO/modules/core/project.xml (original)
+++ incubator/synapse/branches/NIO/modules/core/project.xml Sat Oct 28 10:43:34 2006
@@ -27,6 +27,11 @@
             <groupId>synapse</groupId>
             <artifactId>synapse-nhttp</artifactId>
             <version>${synapse.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>synapse</groupId>
+            <artifactId>synapse-niohttp</artifactId>
+            <version>${synapse.version}</version>
         </dependency>        
     </dependencies>
     

Modified: incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/config/xml/MediatorFactoryFinder.java
URL: http://svn.apache.org/viewvc/incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/config/xml/MediatorFactoryFinder.java?view=diff&rev=468708&r1=468707&r2=468708
==============================================================================
--- incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/config/xml/MediatorFactoryFinder.java (original)
+++ incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/config/xml/MediatorFactoryFinder.java Sat Oct 28 10:43:34 2006
@@ -142,9 +142,17 @@
 	 */
 	public Mediator getMediator(OMElement element) {
 
-		QName qName = new QName(element.getNamespace().getName(), element.getLocalName());
+        String localName = element.getLocalName();
+		QName qName = new QName(element.getNamespace().getName(), localName);
         log.debug("getMediator(" + qName + ")");
         Class cls = (Class) factoryMap.get(qName);
+
+        if (cls == null && localName.indexOf('.') > -1) {
+            String newLocalName = localName.substring(0, localName.indexOf('.'));
+            qName = new QName(element.getNamespace().getName(), newLocalName);
+            log.debug("getMediator.2(" + qName + ")");
+            cls = (Class) factoryMap.get(qName);
+        }
 
         if (cls == null) {
             String msg = "Unknown mediator referenced by configuration element : " + qName;

Modified: incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/config/xml/ProxyServiceFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/config/xml/ProxyServiceFactory.java?view=diff&rev=468708&r1=468707&r2=468708
==============================================================================
--- incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/config/xml/ProxyServiceFactory.java (original)
+++ incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/config/xml/ProxyServiceFactory.java Sat Oct 28 10:43:34 2006
@@ -26,6 +26,8 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Iterator;
+import java.util.StringTokenizer;
+import java.util.ArrayList;
 
 /**
  * Creates a ProxyService instance using the XML fragment specification
@@ -55,14 +57,22 @@
             proxy.setName(name.getAttributeValue());
         }
 
-        OMAttribute desc = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "description"));
-        if (desc != null) {
-            proxy.setDescription(desc.getAttributeValue());
-        }
-
         OMAttribute trans = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "transports"));
         if (trans != null) {
-            proxy.setTransports(trans.getAttributeValue());
+            String transports = trans.getAttributeValue();
+            if (transports == null || ProxyService.ALL_TRANSPORTS.equals(transports)) {
+                        // default to all transports using service name as destination
+            } else {
+                StringTokenizer st = new StringTokenizer(transports, " ,");
+                ArrayList transportList = new ArrayList();
+                while(st.hasMoreTokens()) {
+                    String token = st.nextToken();
+                    if(token.length() != 0) {
+                        transportList.add(token);
+                    }
+                }
+                proxy.setTransports(transportList);
+            }
         }
 
         // read definition of the target of this proxy service. The target could be an 'endpoint'

Modified: incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/config/xml/ProxyServiceSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/config/xml/ProxyServiceSerializer.java?view=diff&rev=468708&r1=468707&r2=468708
==============================================================================
--- incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/config/xml/ProxyServiceSerializer.java (original)
+++ incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/config/xml/ProxyServiceSerializer.java Sat Oct 28 10:43:34 2006
@@ -25,6 +25,7 @@
 import org.apache.synapse.core.axis2.ProxyService;
 
 import java.util.Iterator;
+import java.util.ArrayList;
 
 /**
  * <proxy name="string" [description="string"] [transports="(http|https|jms)+|all"]>
@@ -60,10 +61,13 @@
                 "description", nullNS, service.getDescription()));
         }
 
-        if (service.getTransports() != null &&
-            !ProxyService.ALL_TRANSPORTS.equals(service.getTransports())) {
-            proxy.addAttribute(fac.createOMAttribute(
-                "transports", nullNS, service.getTransports()));
+        if (service.getTransports() != null && service.getTransports().size() != 0) {
+            ArrayList transports = service.getTransports();
+            String transportStr = "" + transports.get(0);
+            for(int i = 1; i < transports.size(); i++) {
+                transportStr = transportStr + " " + transports.get(i);
+            }
+            proxy.addAttribute(fac.createOMAttribute("transports", nullNS, transportStr));
         }
 
         if (service.getTargetEndpoint() != null) {

Modified: incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/core/axis2/ProxyService.java
URL: http://svn.apache.org/viewvc/incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/core/axis2/ProxyService.java?view=diff&rev=468708&r1=468707&r2=468708
==============================================================================
--- incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/core/axis2/ProxyService.java (original)
+++ incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/core/axis2/ProxyService.java Sat Oct 28 10:43:34 2006
@@ -58,7 +58,8 @@
     /** The proxy service description */
     private String description;
     /** The transport/s over which this service should be exposed */
-    private String transports;
+    //private String transports;
+    private ArrayList transports;
     /** The target endpoint, if assigned */
     private String targetEndpoint = null;
     /** The target sequence, if assigned */
@@ -148,15 +149,10 @@
         // process transports and expose over requested transports. If none
         // is specified, default to all transports using service name as
         // destination
-        if (transports == null || ALL_TRANSPORTS.equals(transports)) {
+        if (transports == null || transports.size() == 0) {
             // default to all transports using service name as destination
         } else {
-            StringTokenizer st = new StringTokenizer(transports, " ");
-            ArrayList transportList = new ArrayList();
-            for (int i=0; i<st.countTokens(); i++) {
-                transportList.add(st.nextToken());
-            }
-            proxyService.setExposedTransports(transportList);
+            proxyService.setExposedTransports(transports);
         }
 
         // process parameters
@@ -255,8 +251,8 @@
         this.description = description;
     }
 
-    public String getTransports() {
-        return transports != null ? transports : ALL_TRANSPORTS;
+    public ArrayList getTransports() {
+        return transports;
     }
 
     public void addProperty(String name, String value) {
@@ -267,7 +263,7 @@
         return this.properties;
     }
 
-    public void setTransports(String transports) {
+    public void setTransports(ArrayList transports) {
         this.transports = transports;
     }
 

Modified: incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java
URL: http://svn.apache.org/viewvc/incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java?view=diff&rev=468708&r1=468707&r2=468708
==============================================================================
--- incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java (original)
+++ incubator/synapse/branches/NIO/modules/core/src/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java Sat Oct 28 10:43:34 2006
@@ -121,6 +121,19 @@
             log.debug("Using default 'main' mediator for message mediation");
             synCtx.getEnvironment().injectMessage(synCtx);
         }
+
+        // Response handling mechanism for 200/202 and 5XX
+        // if smc.isResponse = true then the response will be handled with 200 OK
+        // else, response will be 202 OK without an http body
+        // if smc.isFaultRespose = true then the response is a fault with 500 Internal Server Error
+
+        if (synCtx.isResponse()) {
+            mc.getOperationContext().setProperty(Constants.RESPONSE_WRITTEN, Constants.VALUE_TRUE);
+        }
+        if (synCtx.isFaultResponse()) {
+            // todo: is there a better way to inject faultSoapEnv to the Axis2 Transport
+            throw new AxisFault("Synapse Encountered an Error - See Log for More Details");
+        }
     }
 
     /**

Modified: incubator/synapse/branches/NIO/modules/core/test/org/apache/synapse/mediators/TestUtils.java
URL: http://svn.apache.org/viewvc/incubator/synapse/branches/NIO/modules/core/test/org/apache/synapse/mediators/TestUtils.java?view=diff&rev=468708&r1=468707&r2=468708
==============================================================================
--- incubator/synapse/branches/NIO/modules/core/test/org/apache/synapse/mediators/TestUtils.java (original)
+++ incubator/synapse/branches/NIO/modules/core/test/org/apache/synapse/mediators/TestUtils.java Sat Oct 28 10:43:34 2006
@@ -15,26 +15,28 @@
 */
 package org.apache.synapse.mediators;
 
+import java.io.ByteArrayInputStream;
+import java.io.StringReader;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMDocument;
+import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.synapse.MessageContext;
 import org.apache.synapse.TestMessageContext;
-import org.apache.synapse.config.SynapseConfiguration;
 import org.apache.synapse.config.Property;
+import org.apache.synapse.config.SynapseConfiguration;
 import org.apache.synapse.core.SynapseEnvironment;
 import org.apache.synapse.core.axis2.Axis2MessageContext;
 import org.apache.synapse.core.axis2.Axis2SynapseEnvironment;
 import org.apache.synapse.registry.url.SimpleURLRegistry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-import java.io.StringReader;
-import java.util.Iterator;
-import java.util.Map;
 
 public class TestUtils {
 
@@ -74,7 +76,7 @@
     }
 
     public static MessageContext createLightweightSynapseMessageContext(
-            String paylod) throws Exception {
+            String payload) throws Exception {
         org.apache.axis2.context.MessageContext mc =
                 new org.apache.axis2.context.MessageContext();
         SynapseConfiguration config = new SynapseConfiguration();
@@ -86,14 +88,23 @@
                 OMAbstractFactory.getSOAP11Factory().createOMDocument();
         omDoc.addChild(envelope);
 
-        XMLStreamReader parser = XMLInputFactory.newInstance().
-                createXMLStreamReader(new StringReader(paylod));
-        StAXOMBuilder builder = new StAXOMBuilder(parser);
-
-        // set a dummy static message
-        envelope.getBody().addChild(builder.getDocumentElement());
+        envelope.getBody().addChild(createOMElement(payload));
 
         synMc.setEnvelope(envelope);
         return synMc;
     }
+
+    public static OMElement createOMElement(String xml) {
+        try {
+
+            XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(xml));
+            StAXOMBuilder builder = new StAXOMBuilder(reader);
+            OMElement omElement = builder.getDocumentElement();
+            return omElement;
+
+        } catch (XMLStreamException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
 }

Added: incubator/synapse/branches/NIO/modules/extensions/pom.xml
URL: http://svn.apache.org/viewvc/incubator/synapse/branches/NIO/modules/extensions/pom.xml?view=auto&rev=468708
==============================================================================
--- incubator/synapse/branches/NIO/modules/extensions/pom.xml (added)
+++ incubator/synapse/branches/NIO/modules/extensions/pom.xml Sat Oct 28 10:43:34 2006
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.synapse</groupId>
+    <artifactId>Apache-Synapse-Incubating</artifactId>
+    <version>SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>synapse-extensions</artifactId>
+  <name>Apache Synapse - Extensions</name>
+  <description>Apache Synapse - Extensions</description>
+  <packaging>jar</packaging>  
+  
+  <build>
+  	<sourceDirectory>src</sourceDirectory>
+  	<testSourceDirectory>test</testSourceDirectory>
+  </build>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.synapse</groupId>
+      <artifactId>synapse-core</artifactId>
+    </dependency>
+  </dependencies>
+</project>

Modified: incubator/synapse/branches/NIO/modules/extensions/project.xml
URL: http://svn.apache.org/viewvc/incubator/synapse/branches/NIO/modules/extensions/project.xml?view=diff&rev=468708&r1=468707&r2=468708
==============================================================================
--- incubator/synapse/branches/NIO/modules/extensions/project.xml (original)
+++ incubator/synapse/branches/NIO/modules/extensions/project.xml Sat Oct 28 10:43:34 2006
@@ -1,107 +1,116 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-
-    <pomVersion>3</pomVersion>
-    <extend>../../project.xml</extend>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-    <name>Apache Synapse - Extensions</name>
-    <id>synapse-extensions</id>
-    <groupId>synapse</groupId>
-
-    <dependencies>
-        <dependency>
-            <groupId>synapse</groupId>
-            <artifactId>synapse-core</artifactId>
-            <version>${synapse.version}</version>
-        </dependency>
-
-        <!-- external JARs -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring</artifactId>
-            <version>${spring.version}</version>
-            <properties>
-                <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>xalan</groupId>
-            <artifactId>xalan</artifactId>
-            <version>${xalan.version}</version>
-            <properties>
-                <module>true</module>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>rhino</groupId>
-            <artifactId>js</artifactId>
-            <version>${js.version}</version>
-            <properties>
-                <module>true</module>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-            <version>${xbean.version}</version>
-            <properties>
-                <module>true</module>
-            </properties>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <nagEmailAddress>synapse-dev@ws.apache.org</nagEmailAddress>
-        <sourceDirectory>src</sourceDirectory>
-        <unitTestSourceDirectory>test</unitTestSourceDirectory>
-
-        <unitTest>
-            <includes>
-                <include>**/*Test.java</include>                
-            </includes>
-            
-            <resources>
-                <resource>
-                    <directory>src</directory>
-                    <includes>
-                        <include>**/org.apache.synapse.config.xml.MediatorFactory</include>
-                        <include>**/org.apache.synapse.config.xml.ExtensionFactory</include>
-                    </includes>
-                </resource>
-                <resource>
-                    <directory>./../core/target/test-classes</directory>
-                    <includes>
-                        <include>**/*</include>
-                    </includes>
-                </resource>
-            </resources>
-        </unitTest>
-
-    </build>
-</project>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+
+    <pomVersion>3</pomVersion>
+    <extend>../../project.xml</extend>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+    <name>Apache Synapse - Extensions</name>
+    <id>synapse-extensions</id>
+    <groupId>synapse</groupId>
+
+    <dependencies>
+        <dependency>
+            <groupId>synapse</groupId>
+            <artifactId>synapse-core</artifactId>
+            <version>${synapse.version}</version>
+        </dependency>
+
+        <!-- external JARs -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring</artifactId>
+            <version>${spring.version}</version>
+            <properties>
+                <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>xalan</groupId>
+            <artifactId>xalan</artifactId>
+            <version>${xalan.version}</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>rhino</groupId>
+            <artifactId>js</artifactId>
+            <version>${js.version}</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+            <version>${xbean.version}</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+
+        <dependency>
+           <groupId>bsf</groupId>
+           <artifactId>bsf</artifactId>
+           <version>${bsf.version}</version>
+           <properties>
+              <module>true</module>
+           </properties>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <nagEmailAddress>synapse-dev@ws.apache.org</nagEmailAddress>
+        <sourceDirectory>src</sourceDirectory>
+        <unitTestSourceDirectory>test</unitTestSourceDirectory>
+
+        <unitTest>
+            <includes>
+                <include>**/*Test.java</include>                
+            </includes>
+            
+            <resources>
+                <resource>
+                    <directory>src</directory>
+                    <includes>
+                        <include>**/org.apache.synapse.config.xml.MediatorFactory</include>
+                        <include>**/org.apache.synapse.config.xml.ExtensionFactory</include>
+                    </includes>
+                </resource>
+                <resource>
+                    <directory>./../core/target/test-classes</directory>
+                    <includes>
+                        <include>**/*</include>
+                    </includes>
+                </resource>
+            </resources>
+        </unitTest>
+
+    </build>
+</project>
+

Modified: incubator/synapse/branches/NIO/modules/extensions/src/META-INF/services/org.apache.synapse.config.xml.MediatorFactory
URL: http://svn.apache.org/viewvc/incubator/synapse/branches/NIO/modules/extensions/src/META-INF/services/org.apache.synapse.config.xml.MediatorFactory?view=diff&rev=468708&r1=468707&r2=468708
==============================================================================
--- incubator/synapse/branches/NIO/modules/extensions/src/META-INF/services/org.apache.synapse.config.xml.MediatorFactory (original)
+++ incubator/synapse/branches/NIO/modules/extensions/src/META-INF/services/org.apache.synapse.config.xml.MediatorFactory Sat Oct 28 10:43:34 2006
@@ -3,3 +3,4 @@
 org.apache.synapse.mediators.spring.SpringMediatorFactory
 org.apache.synapse.mediators.json.JsonMediatorFactory
 org.apache.synapse.mediators.javascript.JavaScriptMediatorFactory
+org.apache.synapse.mediators.bsf.ScriptMediatorFactory

Added: incubator/synapse/branches/NIO/modules/nhttp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/synapse/branches/NIO/modules/nhttp/pom.xml?view=auto&rev=468708
==============================================================================
--- incubator/synapse/branches/NIO/modules/nhttp/pom.xml (added)
+++ incubator/synapse/branches/NIO/modules/nhttp/pom.xml Sat Oct 28 10:43:34 2006
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.synapse</groupId>
+    <artifactId>Apache-Synapse-Incubating</artifactId>
+    <version>SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>synapse-nhttp</artifactId>
+  <name>Apache Synapse - nhttp</name>
+  <description>Apache Synapse - nhttp</description>
+  <packaging>jar</packaging>  
+  
+  <build>
+  	<sourceDirectory>src</sourceDirectory>
+  </build>
+  
+  <dependencies>
+  </dependencies>
+</project>

Added: incubator/synapse/branches/NIO/modules/niohttp/maven.xml
URL: http://svn.apache.org/viewvc/incubator/synapse/branches/NIO/modules/niohttp/maven.xml?view=auto&rev=468708
==============================================================================
--- incubator/synapse/branches/NIO/modules/niohttp/maven.xml (added)
+++ incubator/synapse/branches/NIO/modules/niohttp/maven.xml Sat Oct 28 10:43:34 2006
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="jar"
+         xmlns:j="jelly:core"
+         xmlns:u="jelly:util"
+         xmlns:deploy="deploy"
+         xmlns:ant="jelly:ant"
+         xmlns:maven="jelly:maven"
+         xmlns:define="jelly:define">
+
+    <j:set var="dist.name" value="${pom.artifactId}-${pom.currentVersion}"/>
+    <!--<j:set var="dist.dir" value="target/dist"/>-->
+    <j:set var="niohttp.dir" value="target/niohttp"/>
+
+    <postGoal name="test:compile">
+        <mkdir dir="${niohttp.dir}"/>
+        <attainGoal name="niohttp"/>
+    </postGoal>
+
+    <goal name="niohttp">
+        <mkdir dir="${niohttp.dir}"/>
+        <mkdir dir="target/dist"/>
+        <mkdir dir="${niohttp.dir}/META-INF"/>
+        <ant:copy todir="${niohttp.dir}">
+            <ant:fileset dir="target/classes">
+                <ant:include name="**/**"/>
+            </ant:fileset>
+        </ant:copy>
+        <!--<ant:copy todir="${niohttp.dir}/META-INF">
+            <ant:fileset dir="src/META-INF">
+                <ant:include name="**/**"/>
+            </ant:fileset>
+            <ant:fileset file="../../LICENSE.txt"/>
+        </ant:copy>-->
+        
+        <ant:copy file="../../NOTICE-JAR.txt"
+                  tofile="src/META-INF/NOTICE.txt"/>
+
+        <manifest file="target/MANIFEST.MF">
+            <attribute name="Extension-Name" value="org.apache.synapse"/>
+            <attribute name="Specification-Title" value="${pom.artifactId}"/>
+            <attribute name="Specification-Vendor"
+                       value="Apache Software Foundation"/>
+            <attribute name="Specification-Version"
+                       value="${pom.currentVersion}"/>
+            <attribute name="Implementation-Title" value="Apache Synapse"/>
+            <attribute name="Implementation-Vendor-Id" value="org.apache"/>
+            <attribute name="Implementation-Vendor"
+                       value="Apache Software Foundation"/>
+            <attribute name="Implementation-Version"
+                       value="${pom.currentVersion}"/>
+        </manifest>
+
+        <jar jarfile="target/dist/niohttp.jar"
+             basedir="${niohttp.dir}" manifest="target/MANIFEST.MF">
+            <include name="**/**"/>
+        </jar>
+        <ant:delete dir="${niohttp.dir}"/>
+    </goal>
+</project>

Added: incubator/synapse/branches/NIO/modules/niohttp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/synapse/branches/NIO/modules/niohttp/pom.xml?view=auto&rev=468708
==============================================================================
--- incubator/synapse/branches/NIO/modules/niohttp/pom.xml (added)
+++ incubator/synapse/branches/NIO/modules/niohttp/pom.xml Sat Oct 28 10:43:34 2006
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.synapse</groupId>
+    <artifactId>Apache-Synapse-Incubating</artifactId>
+    <version>SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>synapse-niohttp</artifactId>
+  <name>Apache Synapse - niohttp</name>
+  <description>Apache Synapse - niohttp</description>
+  <packaging>jar</packaging>  
+  
+  <build>
+  	<sourceDirectory>src</sourceDirectory>
+  </build>
+  
+  <dependencies>
+  </dependencies>
+</project>

Added: incubator/synapse/branches/NIO/modules/niohttp/project.properties
URL: http://svn.apache.org/viewvc/incubator/synapse/branches/NIO/modules/niohttp/project.properties?view=auto&rev=468708
==============================================================================
--- incubator/synapse/branches/NIO/modules/niohttp/project.properties (added)
+++ incubator/synapse/branches/NIO/modules/niohttp/project.properties Sat Oct 28 10:43:34 2006
@@ -0,0 +1,17 @@
+# -------------------------------------------------------------------
+# Copyright 2001-2004 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.
+# -------------------------------------------------------------------
+
+maven.multiproject.type=jar

Added: incubator/synapse/branches/NIO/modules/niohttp/project.xml
URL: http://svn.apache.org/viewvc/incubator/synapse/branches/NIO/modules/niohttp/project.xml?view=auto&rev=468708
==============================================================================
--- incubator/synapse/branches/NIO/modules/niohttp/project.xml (added)
+++ incubator/synapse/branches/NIO/modules/niohttp/project.xml Sat Oct 28 10:43:34 2006
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	
+    <pomVersion>3</pomVersion>
+    <extend>../../project.xml</extend>
+
+
+    <name>Apache Synapse - niohttp</name>
+    <id>synapse-niohttp</id>
+    <groupId>synapse</groupId>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+    </dependencies>
+    
+    <build>
+        <nagEmailAddress>synapse-dev@ws.apache.org</nagEmailAddress>
+        <sourceDirectory>src</sourceDirectory>
+        <!--<unitTestSourceDirectory>test</unitTestSourceDirectory>
+        <unitTest>
+            <includes>
+                <include>**/*Test.java</include>
+            </includes>
+            <resources>
+                <resource>
+                    <directory>test-resources</directory>
+                </resource>
+            </resources>
+        </unitTest>
+
+        <resources>
+			<resource>
+				<directory>conf</directory>
+				<includes>
+					<include>**/*.properties</include>
+				</includes>
+			</resource>
+        </resources>-->
+    </build>
+</project>
+

Added: incubator/synapse/branches/NIO/modules/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/synapse/branches/NIO/modules/samples/pom.xml?view=auto&rev=468708
==============================================================================
--- incubator/synapse/branches/NIO/modules/samples/pom.xml (added)
+++ incubator/synapse/branches/NIO/modules/samples/pom.xml Sat Oct 28 10:43:34 2006
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.synapse</groupId>
+    <artifactId>Apache-Synapse-Incubating</artifactId>
+    <version>SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>synapse-samples</artifactId>
+  <name>Apache Synapse - Samples</name>
+  <description>Apache Synapse - Samples</description>
+  <packaging>jar</packaging>  
+  
+  <build>
+  	<sourceDirectory>src</sourceDirectory>
+  </build>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.synapse</groupId>
+      <artifactId>synapse-core</artifactId>
+    </dependency>
+  </dependencies>
+</project>

Added: incubator/synapse/branches/NIO/pom.xml
URL: http://svn.apache.org/viewvc/incubator/synapse/branches/NIO/pom.xml?view=auto&rev=468708
==============================================================================
--- incubator/synapse/branches/NIO/pom.xml (added)
+++ incubator/synapse/branches/NIO/pom.xml Sat Oct 28 10:43:34 2006
@@ -0,0 +1,607 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">  
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.synapse</groupId>  
+  <artifactId>Apache-Synapse-Incubating</artifactId>
+  <version>SNAPSHOT</version>
+  
+  <name>Apache Synapse</name>  
+  <description>Apache Synapse</description>
+  
+  <packaging>pom</packaging>  
+  <url>http://incubator.apache.org/synapse/</url>
+  
+  <issueManagement>
+    <url>http://issues.apache.org/jira/browse/SYNAPSE</url>
+  </issueManagement>
+  
+  <ciManagement>
+    <system>Continuum</system>
+    <url>unknown</url>
+    <notifiers>
+      <notifier>
+        <configuration>
+          <address>commons-dev@ws.apache.org</address>
+        </configuration>
+      </notifier>
+    </notifiers>
+  </ciManagement>
+  
+  <mailingLists>
+    <mailingList>
+      <name>Apache Synapse Developer List</name>
+      <subscribe>synapse-dev-subscribe@ws.apache.org</subscribe>
+      <unsubscribe>synapse-dev-unsubscribe@ws.apache.org</unsubscribe>
+      <post>synapse-dev@ws.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/ws-synapse-dev/</archive>
+    </mailingList>
+  </mailingLists>
+
+  <inceptionYear>2005</inceptionYear>
+  
+  <licenses>
+      <license>
+          <name>The Apache Software License, Version 2.0</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          <distribution>repo</distribution>
+      </license>
+  </licenses>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/synapse/trunk/java</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/synapse/trunk/java</developerConnection>
+    <url>http://svn.apache.org/viewvc/incubator/synapse/trunk/java/</url>
+  </scm>
+
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+  </organization>
+
+  <profiles>
+    <profile>
+      <id>release</id>
+      <activation>
+        <property>
+          <name>release</name>
+          <value></value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+			    <plugin>
+			      <artifactId>maven-site-plugin</artifactId>
+			      <inherited>false</inherited>
+			    </plugin>
+          <plugin>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <attach>true</attach>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  
+  <build>
+    <plugins>
+      <plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.0</version>
+				<configuration>
+					<source>1.4</source>
+					<target>1.4</target>
+				</configuration>
+			</plugin>
+			<!--
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <inherited>true</inherited>
+        <configuration>
+          <source>1.3</source>
+          <target>1.3</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/bin.xml</descriptor>
+            <descriptor>src/main/assembly/src.xml</descriptor>
+          </descriptors>
+          <tarLongFileMode>gnu</tarLongFileMode>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <attach>true</attach>
+        </configuration>
+      </plugin>
+      -->
+    </plugins>
+  </build>
+  
+  <pluginRepositories>
+    <pluginRepository>
+      <id>snapshot</id>
+      <name>Snapshot repository</name>
+      <url>http://snapshots.maven.codehaus.org/maven2/</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </pluginRepository>
+    <pluginRepository>
+      <id>snapshot-apache</id>
+      <name>Apache Snapshot repository</name>
+      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </pluginRepository>
+  </pluginRepositories>
+  
+  <dependencyManagement>
+    <dependencies>    
+      
+      <!-- Synapse modules -->
+      <dependency>
+        <groupId>org.apache.synapse</groupId>
+        <artifactId>synapse-nhttp</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.synapse</groupId>
+        <artifactId>synapse-niohttp</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.synapse</groupId>
+        <artifactId>synapse-core</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.synapse</groupId>
+        <artifactId>synapse-extensions</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.synapse</groupId>
+        <artifactId>synapse-samples</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+    
+    </dependencies>
+  </dependencyManagement>
+  
+  <dependencies>
+      <dependency>
+          <groupId>org.apache.axis2</groupId>
+          <artifactId>axis2</artifactId>
+          <version>${axis2.version}</version>
+      </dependency>
+      <dependency>
+          <groupId>org.apache.ws.commons.axiom</groupId>
+          <artifactId>axiom-api</artifactId>
+          <version>${axiom.version}</version>
+      </dependency>
+      <dependency>
+          <groupId>org.apache.ws.commons.axiom</groupId>
+          <artifactId>axiom-impl</artifactId>
+          <version>${axiom.version}</version>
+      </dependency>
+      <dependency>
+          <groupId>org.apache.ws.commons.axiom</groupId>
+          <artifactId>axiom-dom</artifactId>
+          <version>${axiom.version}</version>
+      </dependency>
+
+      <dependency>
+          <groupId>org.apache.axis2</groupId>
+          <artifactId>axis2-rahas</artifactId>
+          <version>${axis2.version}</version>
+      </dependency>
+
+      <dependency>
+          <groupId>org.apache.ws.commons.schema</groupId>
+          <artifactId>XmlSchema</artifactId>
+          <version>${XmlSchema.version}</version>
+      </dependency>
+
+      <dependency>
+          <groupId>org.apache.ws.commons.neethi</groupId>
+          <artifactId>neethi</artifactId>
+          <version>${neethi.version}</version>
+      </dependency>
+      
+      <dependency>
+          <groupId>wss4j</groupId>
+          <artifactId>wss4j</artifactId>
+          <version>${wss4j.version}</version>
+      </dependency>
+
+      <dependency>
+          <groupId>org.apache.axis2</groupId>
+          <artifactId>axis2-secpolicy</artifactId>
+          <version>${axis2.version}</version>
+      </dependency>
+      
+      <dependency>
+          <groupId>org.apache.axis2</groupId>
+          <artifactId>axis2-security</artifactId>
+          <version>${axis2.version}</version>
+      </dependency>
+      
+      <dependency>
+          <groupId>xml-security</groupId>
+          <artifactId>xmlsec</artifactId>
+          <version>${xmlsec.version}</version>
+      </dependency>
+
+      <dependency>
+          <groupId>incubator-woden</groupId>
+          <artifactId>woden</artifactId>
+          <version>${woden.version}</version>
+      </dependency>
+
+      <!-- external MARs -->
+      <dependency>
+          <groupId>axis2</groupId>
+          <artifactId>addressing</artifactId>
+          <version>${addressing.version}</version>
+          <type>mar</type>
+      </dependency>
+      
+      <dependency>
+          <groupId>sandesha2</groupId>
+          <artifactId>sandesha2</artifactId>
+          <version>${sandesha2.version}</version>
+          <type>mar</type>
+      </dependency>
+      
+      <dependency>
+          <groupId>axis2</groupId>
+          <artifactId>rampart</artifactId>
+          <version>${rampart.version}</version>
+          <type>mar</type>
+      </dependency>
+
+      <!-- external JARs -->
+      <dependency>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+          <version>${commons.logging.version}</version>
+      </dependency>
+      <dependency>
+          <groupId>commons-httpclient</groupId>
+          <artifactId>commons-httpclient</artifactId>
+          <version>${commons.httpclient.version}</version>
+      </dependency>
+      <dependency>
+          <groupId>commons-codec</groupId>
+          <artifactId>commons-codec</artifactId>
+          <version>${commons.codec.version}</version>
+      </dependency>
+      <dependency>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+          <version>${log4j.version}</version>
+      </dependency>
+      <dependency>
+          <groupId>${stax.impl.groupid}</groupId>
+          <artifactId>${stax.impl.artifactid}</artifactId>
+          <version>${stax.impl.version}</version>
+      </dependency>
+      <dependency>
+          <groupId>stax</groupId>
+          <artifactId>stax-api</artifactId>
+          <version>${stax.api.version}</version>
+      </dependency>
+      <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+          <version>${junit.version}</version>
+      </dependency>
+      <dependency>
+          <groupId>jaxen</groupId>
+          <artifactId>jaxen</artifactId>
+          <version>${jaxen.version}</version>
+      </dependency>
+
+			<dependency>
+          <groupId>wsdl4j</groupId>
+          <artifactId>wsdl4j</artifactId>
+          <version>${wsdl4j.version}</version>
+      </dependency>
+			<dependency>
+          <groupId>axis</groupId>
+          <artifactId>axis-wsdl4j</artifactId>
+          <version>${axis.wsdl4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-fileupload</groupId>
+        <artifactId>commons-fileupload</artifactId>
+        <version>${commons.fileupload.version}</version>
+     </dependency>
+     <dependency>
+	      <groupId>javax.servlet</groupId>
+  	    <artifactId>servlet-api</artifactId>
+    	  <version>${servletapi.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo-spec</groupId>
+        <artifactId>geronimo-spec-javamail</artifactId>
+        <version>${geronimo.spec.javamail.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo-spec</groupId>
+        <artifactId>geronimo-spec-activation</artifactId>
+        <version>${geronimo.spec.activation.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo-spec</groupId>
+        <artifactId>geronimo-spec-jms</artifactId>
+        <version>${geronimo.spec.jms.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>annogen</groupId>
+        <artifactId>annogen</artifactId>
+        <version>${annogen.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>backport-util-concurrent</groupId>
+        <artifactId>backport-util-concurrent</artifactId>
+        <version>${backport_util_concurrent.version}</version>
+    </dependency>
+
+    <dependency>
+        <groupId>httpcomponents-httpcore</groupId>
+        <artifactId>jakarta-httpcore</artifactId>
+        <version>${jakarta.httpcore.version}</version>
+    </dependency>
+    
+    <!-- For nhttp --> 
+    <dependency>
+        <groupId>directory-network</groupId>
+        <artifactId>mina</artifactId>
+        <version>${mina.version}</version>
+    </dependency>
+    <dependency>
+	      <groupId>concurrent</groupId>
+  		  <artifactId>concurrent</artifactId>
+  			<version>1.3.4</version>
+		</dependency>
+    <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-simple</artifactId>
+        <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>asyncweb</groupId>
+        <artifactId>asyncWeb</artifactId>
+        <version>${asyncWeb.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>asyncweb</groupId>
+        <artifactId>asyncWeb_API</artifactId>
+        <version>${asyncWeb.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>asyncweb</groupId>
+        <artifactId>asyncWeb_CommonCodecs</artifactId>
+        <version>${asyncWeb.version}</version>
+    </dependency>
+
+	</dependencies>
+  
+  <!--
+  <reporting>
+    <plugins>
+      <plugin>
+        <inherited>false</inherited>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <aggregate>true</aggregate>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-changes-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>changes-report</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>jdepend-maven-plugin</artifactId>
+        <version>2.0-beta-1-SNAPSHOT</version>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>jxr-maven-plugin</artifactId>
+        <version>2.0-beta-2-SNAPSHOT</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-site-plugin</artifactId>
+        <inherited>false</inherited>
+      </plugin>
+    </plugins>
+  </reporting>
+  -->
+
+  <distributionManagement>
+<!--
+    <repository>
+      <id>apache-repo</id>
+      <name>Maven Central Repository</name>
+      <url>scpexe://people.apache.org/www/www.apache.org/dist/maven-repository</url>
+    </repository>
+    <snapshotRepository>
+      <id>apache-snapshots</id>
+      <name>Apache Development Repository</name>
+      <url>scpexe://minotaur.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
+    </snapshotRepository>
+    -->
+    <site>
+      <id>website</id>
+      <url>scpexe://people.apache.org/www/ws.apache.org/commons/axiom</url>
+    </site>
+  </distributionManagement>
+  
+  <repositories>
+		<repository>
+			<id>ibiblio</id>
+			<name>Ibiblio Maven Repo</name>
+			<layout>legacy</layout>
+			<url>http://www.ibiblio.org/maven2</url>
+			<releases>
+				<updatePolicy>interval:1440</updatePolicy>
+			</releases>
+		</repository>
+		<repository>
+			<id>Apache People</id>
+			<name>Apache People Repo</name>
+			<layout>legacy</layout>
+			<url>http://people.apache.org/repository</url>
+			<releases>
+				<updatePolicy>interval:1440</updatePolicy>
+			</releases>
+		</repository>
+		<repository>
+			<id>Apache Dist</id>
+			<name>Apache Dist Repo</name>
+			<layout>legacy</layout>
+			<url>http://www.apache.org/dist/java-repository</url>
+			<releases>
+				<updatePolicy>interval:1440</updatePolicy>
+			</releases>
+		</repository>
+		<repository>
+			<id>openejb</id>
+			<name>Openejb Repo</name>
+			<layout>legacy</layout>
+			<url>http://www.openejb.org/maven</url>
+			<releases>
+				<updatePolicy>interval:1440</updatePolicy>
+			</releases>
+		</repository>
+		<repository>
+			<id>codehaus</id>
+			<name>Codehaus Repo</name>
+			<layout>legacy</layout>
+			<url>http://dist.codehaus.org</url>
+			<releases>
+				<updatePolicy>interval:1440</updatePolicy>
+			</releases>
+		</repository>
+		<repository>
+			<id>sunsite</id>
+			<name>Sunsite Repo</name>
+			<layout>legacy</layout>
+			<url>http://mirrors.sunsite.dk/maven</url>
+			<releases>
+				<updatePolicy>interval:1440</updatePolicy>
+			</releases>
+		</repository>
+		<repository>
+			<id>sourceforge</id>
+			<name>Sourceforge Repo</name>
+			<layout>legacy</layout>
+			<url>http://jibx.sourceforge.net/maven</url>
+			<releases>
+				<updatePolicy>interval:1440</updatePolicy>
+			</releases>
+		</repository>
+		<repository>
+			<id>asankha</id>
+			<name>Asankha Repo</name>
+			<layout>legacy</layout>
+			<url>http://people.apache.org/~asankha/maven</url>
+			<releases>
+				<updatePolicy>interval:1440</updatePolicy>
+			</releases>
+		</repository>
+	</repositories>
+  
+  <modules>
+    <module>modules/nhttp</module>
+    <module>modules/niohttp</module>
+    <module>modules/core</module>
+    <module>modules/extensions</module>
+    <module>modules/samples</module>
+  </modules>
+  
+  <properties>
+    <axis2.version>1.1-SNAPSHOT</axis2.version>
+    <axiom.version>SNAPSHOT</axiom.version>
+    <XmlSchema.version>SNAPSHOT</XmlSchema.version>
+		<neethi.version>SNAPSHOT</neethi.version>    
+		<wss4j.version>SNAPSHOT</wss4j.version>
+		<xmlsec.version>1.3.0</xmlsec.version>
+		<woden.version>SNAPSHOT</woden.version>
+		
+		<addressing.version>SNAPSHOT</addressing.version>
+		<sandesha2.version>SNAPSHOT</sandesha2.version>
+		<rampart.version>SNAPSHOT</rampart.version>
+		
+		<commons.logging.version>1.0.4</commons.logging.version>
+		<commons.httpclient.version>3.0</commons.httpclient.version>
+		<commons.codec.version>1.3</commons.codec.version>
+		<commons.fileupload.version>1.0</commons.fileupload.version>
+		<jakarta.httpcore.version>4.0-alpha2</jakarta.httpcore.version>
+
+		<log4j.version>1.2.13</log4j.version>
+		<junit.version>3.8.1</junit.version>
+		<jaxen.version>1.1-beta-8</jaxen.version>
+		<servletapi.version>2.3</servletapi.version>
+		<wsdl4j.version>1.5.2</wsdl4j.version>
+		<axis.wsdl4j.version>1.2</axis.wsdl4j.version>
+		<annogen.version>0.1.0</annogen.version>
+		<backport_util_concurrent.version>2.1</backport_util_concurrent.version>
+		
+		<geronimo.spec.javamail.version>1.3.1-rc5</geronimo.spec.javamail.version>
+		<geronimo.spec.activation.version>1.0.2-rc4</geronimo.spec.activation.version>
+		<geronimo.spec.jms.version>1.1-rc4</geronimo.spec.jms.version>
+		
+		<stax.impl.groupid>woodstox</stax.impl.groupid>
+		<stax.impl.artifactid>wstx</stax.impl.artifactid>
+		<stax.impl.version>asl-3.0rc1</stax.impl.version>
+		<stax.api.version>1.0.1</stax.api.version>
+		
+		<mina.version>0.8.0</mina.version>
+		<slf4j.version>1.0</slf4j.version>
+		<asyncWeb.version>0.8.2</asyncWeb.version>		
+  </properties>
+</project>

Modified: incubator/synapse/branches/NIO/project.properties
URL: http://svn.apache.org/viewvc/incubator/synapse/branches/NIO/project.properties?view=diff&rev=468708&r1=468707&r2=468708
==============================================================================
--- incubator/synapse/branches/NIO/project.properties (original)
+++ incubator/synapse/branches/NIO/project.properties Sat Oct 28 10:43:34 2006
@@ -5,6 +5,7 @@
 http://www.ibiblio.org/maven,\
 http://people.apache.org/repository/,\
 http://www.apache.org/dist/java-repository/,\
+http://ws.zones.apache.org/repository/,\
 http://www.openejb.org/maven,\
 http://dist.codehaus.org/,\
 http://mirrors.sunsite.dk/maven/,\
@@ -85,6 +86,8 @@
 js.version=1.6R2
 xbean.version=2.1.0
 
+bsf.version=2.4.0
+
 mina.version=0.8.0
 slf4j.version=1.0
 asyncWeb.version=0.8.2
@@ -97,6 +100,7 @@
 optional.includes=
 maven.multiproject.includes=\
 modules/nhttp/project.xml,\
+modules/niohttp/project.xml,\
 modules/core/project.xml,\
 modules/mediators/project.xml,\
 modules/samples/project.xml,\



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


Mime
View raw message