[esb-java-dev] svn commit r23762 - in trunk/esb/java/modules/distribution/src/main: assembly conf

[ruwan at wso2.com]

Author: ruwan
Date: Wed Nov 12 21:26:10 2008
New Revision: 23762
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=23762

Log:
Specifying the synapse.xml through axis2.xml to the synapse

Modified:
   trunk/esb/java/modules/distribution/src/main/assembly/bin.xml
   trunk/esb/java/modules/distribution/src/main/conf/axis2.xml
   trunk/esb/java/modules/distribution/src/main/conf/synapse.xml

Modified: trunk/esb/java/modules/distribution/src/main/assembly/bin.xml
URL: http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/distribution/src/main/assembly/bin.xml?rev=23762&r1=23761&r2=23762&view=diff
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/assembly/bin.xml	(original)
+++ trunk/esb/java/modules/distribution/src/main/assembly/bin.xml	Wed Nov 12 21:26:10 2008
@@ -41,12 +41,11 @@
                 <include>org.wso2.carbon:org.wso2.carbon.spring.xml:jar</include>
                 <include>org.wso2.caching:wso2caching-core:jar</include>
                 <!-- Synapse bundles -->
-                <include>org.apache.axis2:axis2-transport-base:jar</include>
-                <include>org.apache.axis2:axis2-transport-jms:jar</include>
-                <include>org.apache.axis2:axis2-transport-mail:jar</include>
                 <include>org.apache.synapse:synapse-transports:jar</include>
                 <include>org.apache.synapse:synapse-core:jar</include>
                 <include>org.apache.synapse:synapse:jar</include>
+                <include>org.apache.synapse:synapse-utils:jar</include>
+                <include>org.apache.synapse:synapse-tasks:jar</include>
                 <!-- ESB bundles -->
                 <include>org.wso2.esb:org.wso2.esb.styles:jar</include>
                 <!-- Component bundles-->
@@ -104,8 +103,6 @@
                 <include>org.wso2.carbon:org.wso2.carbon.user.mgt.stub:jar</include>
                 <include>org.wso2.carbon:org.wso2.carbon.user.mgt.ui:jar</include>
 
-                <include>org.apache.synapse:synapse-utils:jar</include>
-                <include>org.apache.synapse:synapse-tasks:jar</include>
                 <include>org.wso2.carbon:org.wso2.carbon.task.ui:jar</include>
                 <include>org.wso2.carbon:org.wso2.carbon.task:jar</include>
                 <include>org.wso2.carbon:org.wso2.carbon.geronimo.jta.1.1.spec:jar</include>

Modified: trunk/esb/java/modules/distribution/src/main/conf/axis2.xml
URL: http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/distribution/src/main/conf/axis2.xml?rev=23762&r1=23761&r2=23762&view=diff
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/conf/axis2.xml	(original)
+++ trunk/esb/java/modules/distribution/src/main/conf/axis2.xml	Wed Nov 12 21:26:10 2008
@@ -82,6 +82,18 @@
     <!--        <parameter name="RSS_URL" locked="false">http://127.0.0.1/rss</parameter>-->
     <!--    </listener>-->
 
+    <!-- Synapse Configuration file -->
+    <parameter name="SynapseConfig.ConfigurationFile" locked="false">repository/synapse.xml</parameter>
+
+    <!-- Synapse Home parameter -->
+    <parameter name="SynapseConfig.HomeDirectory" locked="false">.</parameter>
+
+    <!-- Resolve root used to resolve synapse references like schemas inside a WSDL -->
+    <parameter name="SynapseConfig.ResolveRoot" locked="false">.</parameter>
+
+    <!-- Synapse Server name parameter -->
+    <parameter name="SynapseConfig.ServerName" locked="false">WSO2 ESB Server</parameter>
+
     <!-- ================================================= -->
     <!-- Message Receivers -->
     <!-- ================================================= -->

Modified: trunk/esb/java/modules/distribution/src/main/conf/synapse.xml
URL: http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/distribution/src/main/conf/synapse.xml?rev=23762&r1=23761&r2=23762&view=diff
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/conf/synapse.xml	(original)
+++ trunk/esb/java/modules/distribution/src/main/conf/synapse.xml	Wed Nov 12 21:26:10 2008
@@ -20,10 +20,10 @@
 <definitions xmlns="http://ws.apache.org/ns/synapse">
 
     <!-- the SimpleURLRegistry allows access to a URL based registry (e.g. file:/// or http://) -->
-    <registry provider="org.wso2.esb.registry.WSO2Registry">
+    <!--<registry provider="org.wso2.esb.registry.WSO2Registry">-->
          <!-- all resources loaded from the URL registry would be cached for this number of milli seconds -->
         <!--<parameter name="cachableDuration">15000</parameter>-->
-    </registry>
+    <!--</registry>-->
 
     <sequence name="main">
         <in>