Author: ruwan
Date: Mon Aug 17 19:42:32 2009
New Revision: 43585
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=43585
Log:
Making the synapse artifact repository the default configuration mechanism
Added:
trunk/esb/java/modules/distribution/src/main/conf/synapse-config/
trunk/esb/java/modules/distribution/src/main/conf/synapse-config/endpoints/
trunk/esb/java/modules/distribution/src/main/conf/synapse-config/event-sources/
trunk/esb/java/modules/distribution/src/main/conf/synapse-config/local-entries/
trunk/esb/java/modules/distribution/src/main/conf/synapse-config/proxy-services/
trunk/esb/java/modules/distribution/src/main/conf/synapse-config/registry.xml
trunk/esb/java/modules/distribution/src/main/conf/synapse-config/sequences/
trunk/esb/java/modules/distribution/src/main/conf/synapse-config/sequences/fault.xml
trunk/esb/java/modules/distribution/src/main/conf/synapse-config/sequences/main.xml
trunk/esb/java/modules/distribution/src/main/conf/synapse-config/synapse.xml
(contents, props changed)
- copied, changed from r43582,
/trunk/esb/java/modules/distribution/src/main/conf/synapse.xml
trunk/esb/java/modules/distribution/src/main/conf/synapse-config/tasks/
Removed:
trunk/esb/java/modules/distribution/src/main/conf/synapse.xml
Modified:
trunk/esb/java/modules/distribution/src/main/assembly/bin.xml
trunk/esb/java/modules/distribution/src/main/conf/axis2.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=43585&r1=43584&r2=43585&view=diff
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/assembly/bin.xml
(original)
+++ trunk/esb/java/modules/distribution/src/main/assembly/bin.xml Mon Aug
17 19:42:32 2009
@@ -94,6 +94,10 @@
<directory>../../modules/samples/src/main/conf/synapse</directory>
<outputDirectory>wso2esb-${pom.version}/repository/samples</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>src/main/conf/synapse-config</directory>
+
<outputDirectory>wso2esb-${pom.version}/conf/synapse-config</outputDirectory>
+ </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
@@ -135,11 +139,6 @@
<destName>axis2.xml</destName>
</file>
<file>
- <source>src/main/conf/synapse.xml</source>
- <outputDirectory>wso2esb-${pom.version}/conf</outputDirectory>
- <destName>synapse.xml</destName>
- </file>
- <file>
<source>src/main/conf/transports.xml</source>
<outputDirectory>wso2esb-${pom.version}/conf</outputDirectory>
<destName>transports.xml</destName>
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=43585&r1=43584&r2=43585&view=diff
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/conf/axis2.xml (original)
+++ trunk/esb/java/modules/distribution/src/main/conf/axis2.xml Mon Aug 17
19:42:32 2009
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- ~ Copyright (c) 2005-2008, WSO2 Inc. (http://www.wso2.org) All Rights
Reserved.
+ ~ Copyright (c) 2009, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~
~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
@@ -15,7 +15,6 @@
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
- ~
-->
<axisconfig name="AxisJava2.0">
@@ -74,7 +73,7 @@
<parameter name="ConfigContextTimeoutInterval"
locked="false">30000</parameter>
<!-- Synapse Configuration file location relative to CARBON_HOME -->
- <parameter name="SynapseConfig.ConfigurationFile"
locked="false">conf/synapse.xml</parameter>
+ <parameter name="SynapseConfig.ConfigurationFile"
locked="false">conf/synapse-config</parameter>
<!-- Synapse Home parameter -->
<parameter name="SynapseConfig.HomeDirectory" locked="false">.</parameter>
<!-- Resolve root used to resolve synapse references like schemas inside a
WSDL -->
Added:
trunk/esb/java/modules/distribution/src/main/conf/synapse-config/registry.xml
URL:
http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/distribution/src/main/conf/synapse-config/registry.xml?pathrev=43585
==============================================================================
--- (empty file)
+++
trunk/esb/java/modules/distribution/src/main/conf/synapse-config/registry.xml
Mon Aug 17 19:42:32 2009
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ Copyright (c) 2009, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ WSO2 Inc. licenses this file to you 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.
+ -->
+
+<!-- Registry declaration of the WSO2 ESB -->
+<registry provider="org.wso2.carbon.mediation.registry.WSO2Registry">
+ <!--all resources loaded from the URL registry would be
+ cached for this number of milli seconds -->
+ <parameter name="cachableDuration">15000</parameter>
+</registry>
\ No newline at end of file
Added:
trunk/esb/java/modules/distribution/src/main/conf/synapse-config/sequences/fault.xml
URL:
http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/distribution/src/main/conf/synapse-config/sequences/fault.xml?pathrev=43585
==============================================================================
--- (empty file)
+++
trunk/esb/java/modules/distribution/src/main/conf/synapse-config/sequences/fault.xml
Mon Aug 17 19:42:32 2009
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ Copyright (c) 2009, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ WSO2 Inc. licenses this file to you 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.
+ -->
+
+<!-- Default fault sequence shipped with the Apache Synapse -->
+<sequence xmlns="http://ws.apache.org/ns/synapse"; name="fault">
+
+ <!-- Log the message at the full log level with the ERROR_MESSAGE and the
ERROR_CODE-->
+ <log level="full">
+ <property name="MESSAGE" value="Executing default 'fault' sequence"/>
+ <property name="ERROR_CODE" expression="get-property('ERROR_CODE')"/>
+ <property name="ERROR_MESSAGE"
expression="get-property('ERROR_MESSAGE')"/>
+ </log>
+
+ <!-- Drops the messages by default if there is a fault -->
+ <drop/>
+
+</sequence>
\ No newline at end of file
Added:
trunk/esb/java/modules/distribution/src/main/conf/synapse-config/sequences/main.xml
URL:
http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/distribution/src/main/conf/synapse-config/sequences/main.xml?pathrev=43585
==============================================================================
--- (empty file)
+++
trunk/esb/java/modules/distribution/src/main/conf/synapse-config/sequences/main.xml
Mon Aug 17 19:42:32 2009
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ Copyright (c) 2009, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ WSO2 Inc. licenses this file to you 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.
+ -->
+
+<!-- Default main sequence shipped with the WSO2 ESB -->
+<sequence xmlns="http://ws.apache.org/ns/synapse"; name="main">
+ <in>
+ <!-- Log all messages passing through -->
+ <log level="full"/>
+
+ <!-- ensure that the default configuration only sends if it is one of
samples -->
+ <!-- Otherwise Synapse would be an open proxy by default (BAD!)
-->
+ <filter source="get-property('To')" regex="http://localhost:9000.*";>
+ <!-- Send the messages where they have been sent (i.e. implicit
"To" EPR) -->
+ <send/>
+ </filter>
+ </in>
+ <out>
+ <send/>
+ </out>
+</sequence>
\ No newline at end of file
Copied:
trunk/esb/java/modules/distribution/src/main/conf/synapse-config/synapse.xml
(from r43582, /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-config/synapse.xml?rev=43585&r1=43582&r2=43585&view=diff
==============================================================================
--- /trunk/esb/java/modules/distribution/src/main/conf/synapse.xml
(original)
+++
trunk/esb/java/modules/distribution/src/main/conf/synapse-config/synapse.xml
Mon Aug 17 19:42:32 2009
@@ -1,5 +1,6 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- ~ Copyright (c) 2005-2008, WSO2 Inc. (http://www.wso2.org) All Rights
Reserved.
+ ~ Copyright (c) 2009, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~
~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
@@ -14,33 +15,11 @@
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
- ~
-->
+<!-- An empty flat synapse configuration shipped with the WSO2 ESB -->
<definitions xmlns="http://ws.apache.org/ns/synapse";>
- <registry provider="org.wso2.carbon.mediation.registry.WSO2Registry">
- <!--all resources loaded from the URL registry would be cached for
this number of milli seconds -->
- <parameter name="cachableDuration">15000</parameter>
- </registry>
-
- <sequence name="main">
- <in>
- <!-- Log all messages passing through -->
- <log level="full"/>
-
- <!-- ensure that the default configuration only sends if it is one
of samples -->
- <!-- Otherwise Synapse would be an open proxy by default (BAD!)
-->
- <filter source="get-property('To')"
regex="http://localhost:9000.*";>
- <!-- Send the messages where they have been sent (i.e.
implicit "To" EPR) -->
- <send/>
- </filter>
- </in>
- <out>
- <send/>
- </out>
- </sequence>
- <sequence name="fault">
- <log/>
- </sequence>
+ <!-- You can add any flat sequences, endpoints, etc.. to this synapse.xml
file if you do
+ *not* want to keep the artifacts in several files -->
</definitions>
Deleted: trunk/esb/java/modules/distribution/src/main/conf/synapse.xml
URL: http://wso2.org/svn/browse/wso2/None?pathrev=43584
_______________________________________________
Esb-java-dev mailing list
[email protected]
https://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
