Author: ruwan
Date: Tue Nov 13 03:58:38 2007
New Revision: 594498
URL: http://svn.apache.org/viewvc?rev=594498&view=rev
Log:
Merging the 1.1 branch back to the trunk
Added:
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_420.xml
- copied unchanged from r594465,
webservices/synapse/branches/1.1/repository/conf/sample/synapse_sample_420.xml
Modified:
webservices/synapse/trunk/java/modules/core/pom.xml
webservices/synapse/trunk/java/modules/core/src/main/resources/META-INF/LICENSE
(props changed)
webservices/synapse/trunk/java/modules/core/src/main/resources/META-INF/NOTICE
(contents, props changed)
webservices/synapse/trunk/java/modules/core/src/main/resources/patches.txt
(props changed)
webservices/synapse/trunk/java/modules/core/src/test/resources/esbservice.wsdl
(props changed)
webservices/synapse/trunk/java/modules/extensions/pom.xml
webservices/synapse/trunk/java/modules/extensions/src/main/resources/META-INF/LICENSE
(props changed)
webservices/synapse/trunk/java/modules/extensions/src/main/resources/META-INF/NOTICE
(contents, props changed)
webservices/synapse/trunk/java/modules/handler/pom.xml (contents, props
changed)
webservices/synapse/trunk/java/modules/mar/pom.xml
webservices/synapse/trunk/java/modules/samples/pom.xml
webservices/synapse/trunk/java/modules/samples/services/FastStockQuoteService/wsdl/FastStockQuoteService.wsdl
(props changed)
webservices/synapse/trunk/java/modules/samples/services/ReliableStockQuoteService/wsdl/ReliableStockQuoteService.wsdl
(props changed)
webservices/synapse/trunk/java/modules/samples/services/SecureStockQuoteService/wsdl/SimpleStockQuoteService.wsdl
(props changed)
webservices/synapse/trunk/java/modules/samples/services/SimpleStockQuoteService/wsdl/SimpleStockQuoteService.wsdl
(props changed)
webservices/synapse/trunk/java/modules/samples/src/main/resources/META-INF/LICENSE
(props changed)
webservices/synapse/trunk/java/modules/samples/src/main/resources/META-INF/NOTICE
(contents, props changed)
webservices/synapse/trunk/java/modules/transports/pom.xml
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/README.txt
(contents, props changed)
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
webservices/synapse/trunk/java/modules/war/pom.xml (contents, props
changed)
webservices/synapse/trunk/java/pom.xml
webservices/synapse/trunk/java/repository/conf/sample/README.txt (props
changed)
webservices/synapse/trunk/java/repository/conf/sample/resources/policy/throttle_policy.xml
webservices/synapse/trunk/java/repository/conf/sample/resources/proxy/sample_proxy_1.wsdl
(props changed)
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_255.xml
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_361.xml
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_362.xml
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_371.xml
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_372.xml
webservices/synapse/trunk/java/src/main/assembly/bin.xml
webservices/synapse/trunk/java/src/main/bin/install-synapse-service.bat
(props changed)
webservices/synapse/trunk/java/src/main/bin/run-synapse-service.bat
(contents, props changed)
webservices/synapse/trunk/java/src/main/bin/synapse-daemon.sh (props
changed)
webservices/synapse/trunk/java/src/main/bin/uninstall-synapse-service.bat
(props changed)
webservices/synapse/trunk/java/src/main/release/BUILDING.txt (contents,
props changed)
webservices/synapse/trunk/java/src/main/release/LICENSE (contents, props
changed)
webservices/synapse/trunk/java/src/main/release/NOTICE (contents, props
changed)
webservices/synapse/trunk/java/src/main/release/README.txt (contents,
props changed)
webservices/synapse/trunk/java/src/main/release/docs/endorsed_libs.txt
(contents, props changed)
webservices/synapse/trunk/java/src/main/release/docs/release_notes.txt
(contents, props changed)
webservices/synapse/trunk/java/src/site/resources/Synapse_Configuration_Language.html
webservices/synapse/trunk/java/src/site/resources/Synapse_QuickStart.html
(contents, props changed)
webservices/synapse/trunk/java/src/site/resources/Synapse_Samples.html
webservices/synapse/trunk/java/src/site/resources/Synapse_Samples_Setup.html
(contents, props changed)
webservices/synapse/trunk/java/src/site/resources/download/1.0/download.html
(props changed)
Modified: webservices/synapse/trunk/java/modules/core/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/pom.xml?rev=594498&r1=594497&r2=594498&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/pom.xml (original)
+++ webservices/synapse/trunk/java/modules/core/pom.xml Tue Nov 13 03:58:38 2007
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.synapse</groupId>
<artifactId>Apache-Synapse</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.synapse</groupId>
Propchange:
webservices/synapse/trunk/java/modules/core/src/main/resources/META-INF/LICENSE
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
webservices/synapse/trunk/java/modules/core/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/resources/META-INF/NOTICE?rev=594498&r1=594497&r2=594498&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/resources/META-INF/NOTICE
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/resources/META-INF/NOTICE
Tue Nov 13 03:58:38 2007
@@ -1,5 +1,5 @@
- Apache Synapse
- Copyright 2005-2006 The Apache Software Foundation
-
- This product includes software developed at
+ Apache Synapse
+ Copyright 2005-2006 The Apache Software Foundation
+
+ This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Propchange:
webservices/synapse/trunk/java/modules/core/src/main/resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/synapse/trunk/java/modules/core/src/main/resources/patches.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/synapse/trunk/java/modules/core/src/test/resources/esbservice.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/synapse/trunk/java/modules/extensions/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/pom.xml?rev=594498&r1=594497&r2=594498&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/pom.xml (original)
+++ webservices/synapse/trunk/java/modules/extensions/pom.xml Tue Nov 13
03:58:38 2007
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.synapse</groupId>
<artifactId>Apache-Synapse</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.synapse</groupId>
Propchange:
webservices/synapse/trunk/java/modules/extensions/src/main/resources/META-INF/LICENSE
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
webservices/synapse/trunk/java/modules/extensions/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/resources/META-INF/NOTICE?rev=594498&r1=594497&r2=594498&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/extensions/src/main/resources/META-INF/NOTICE
(original)
+++
webservices/synapse/trunk/java/modules/extensions/src/main/resources/META-INF/NOTICE
Tue Nov 13 03:58:38 2007
@@ -1,5 +1,5 @@
- Apache Synapse
- Copyright 2005-2006 The Apache Software Foundation
-
- This product includes software developed at
+ Apache Synapse
+ Copyright 2005-2006 The Apache Software Foundation
+
+ This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Propchange:
webservices/synapse/trunk/java/modules/extensions/src/main/resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/synapse/trunk/java/modules/handler/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/handler/pom.xml?rev=594498&r1=594497&r2=594498&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/handler/pom.xml (original)
+++ webservices/synapse/trunk/java/modules/handler/pom.xml Tue Nov 13 03:58:38
2007
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.synapse</groupId>
<artifactId>Apache-Synapse</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.synapse</groupId>
Propchange: webservices/synapse/trunk/java/modules/handler/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/synapse/trunk/java/modules/mar/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/mar/pom.xml?rev=594498&r1=594497&r2=594498&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/mar/pom.xml (original)
+++ webservices/synapse/trunk/java/modules/mar/pom.xml Tue Nov 13 03:58:38 2007
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.synapse</groupId>
<artifactId>Apache-Synapse</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.synapse</groupId>
Modified: webservices/synapse/trunk/java/modules/samples/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/samples/pom.xml?rev=594498&r1=594497&r2=594498&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/samples/pom.xml (original)
+++ webservices/synapse/trunk/java/modules/samples/pom.xml Tue Nov 13 03:58:38
2007
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.synapse</groupId>
<artifactId>Apache-Synapse</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.synapse</groupId>
Propchange:
webservices/synapse/trunk/java/modules/samples/services/FastStockQuoteService/wsdl/FastStockQuoteService.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/synapse/trunk/java/modules/samples/services/ReliableStockQuoteService/wsdl/ReliableStockQuoteService.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/synapse/trunk/java/modules/samples/services/SecureStockQuoteService/wsdl/SimpleStockQuoteService.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/synapse/trunk/java/modules/samples/services/SimpleStockQuoteService/wsdl/SimpleStockQuoteService.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/synapse/trunk/java/modules/samples/src/main/resources/META-INF/LICENSE
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
webservices/synapse/trunk/java/modules/samples/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/samples/src/main/resources/META-INF/NOTICE?rev=594498&r1=594497&r2=594498&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/samples/src/main/resources/META-INF/NOTICE
(original)
+++
webservices/synapse/trunk/java/modules/samples/src/main/resources/META-INF/NOTICE
Tue Nov 13 03:58:38 2007
@@ -1,5 +1,5 @@
- Apache Synapse
- Copyright 2005-2006 The Apache Software Foundation
-
- This product includes software developed at
+ Apache Synapse
+ Copyright 2005-2006 The Apache Software Foundation
+
+ This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Propchange:
webservices/synapse/trunk/java/modules/samples/src/main/resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/synapse/trunk/java/modules/transports/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/pom.xml?rev=594498&r1=594497&r2=594498&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/pom.xml (original)
+++ webservices/synapse/trunk/java/modules/transports/pom.xml Tue Nov 13
03:58:38 2007
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.synapse</groupId>
<artifactId>Apache-Synapse</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<artifactId>synapse-transports</artifactId>
Modified:
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/README.txt
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/README.txt?rev=594498&r1=594497&r2=594498&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/README.txt
(original)
+++
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/README.txt
Tue Nov 13 03:58:38 2007
@@ -1,54 +1,54 @@
-This is a new JMS (Java Messaging Service) Transport implementation for Apache
Axis2. The transport receiver must be configured as follows, with one or more
connection factories:
-
-Sample axis2.xml
-================
-
- <transportReceiver name="jms"
class="org.apache.axis2.transport.jms.JMSListener">
- <parameter name="myTopicConnectionFactory" locked="false">
- <parameter name="java.naming.factory.initial"
locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- <parameter name="java.naming.provider.url"
locked="false">tcp://localhost:61616</parameter>
- <parameter name="transport.jms.ConnectionFactoryJNDIName"
locked="false">TopicConnectionFactory</parameter>
- </parameter>
- <parameter name="myQueueConnectionFactory" locked="false">
- <parameter name="java.naming.factory.initial"
locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- <parameter name="java.naming.provider.url"
locked="false">tcp://localhost:61616</parameter>
- <parameter name="transport.jms.ConnectionFactoryJNDIName"
locked="false">QueueConnectionFactory</parameter>
- </parameter>
- <parameter name="default" locked="false">
- <parameter name="java.naming.factory.initial"
locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- <parameter name="java.naming.provider.url"
locked="false">tcp://localhost:61616</parameter>
- <parameter name="transport.jms.ConnectionFactoryJNDIName"
locked="false">QueueConnectionFactory</parameter>
- </parameter>
- </transportReceiver>
-
-If a connection factory named "default" (as shown above) is defined, this
would be used for services which does
-not explicitly specify the connection factory that should be used. The
services.xml of a service should indicate
-the connection factory and the destination name to be associated with. If a
destination is not specified, the
-implementation would create a JMS Queue with the service name. The JMS
destination should ideally be created
-and administered through the JMS provider utilities.
-
-Sample services.xml
-===================
-
-<service name="echo">
- <transports>
- ....
- <transport>jms</transport>
- </transports>
- ...
- <parameter name="transport.jms.ConnectionFactory"
locked="true">myTopicConnectionFactory</parameter>
- <parameter name="transport.jms.Destination"
locked="true">dynamicTopics/something.TestTopic</parameter>
-</service>
-
-Files Making Up This JMS Implementation
-=======================================
-
-* JMSListener.java
-* JMSConnectionFactory.java
-* JMSMessageReceiver.java
-* JMSOutTransportInfo.java
-* JMSSender.java
-* JMSConstants.java
-* JMSUtils.java
-* AxisJMSException.java
-* DefaultThreadFactory.java
+This is a new JMS (Java Messaging Service) Transport implementation for Apache
Axis2. The transport receiver must be configured as follows, with one or more
connection factories:
+
+Sample axis2.xml
+================
+
+ <transportReceiver name="jms"
class="org.apache.axis2.transport.jms.JMSListener">
+ <parameter name="myTopicConnectionFactory" locked="false">
+ <parameter name="java.naming.factory.initial"
locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url"
locked="false">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName"
locked="false">TopicConnectionFactory</parameter>
+ </parameter>
+ <parameter name="myQueueConnectionFactory" locked="false">
+ <parameter name="java.naming.factory.initial"
locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url"
locked="false">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName"
locked="false">QueueConnectionFactory</parameter>
+ </parameter>
+ <parameter name="default" locked="false">
+ <parameter name="java.naming.factory.initial"
locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url"
locked="false">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName"
locked="false">QueueConnectionFactory</parameter>
+ </parameter>
+ </transportReceiver>
+
+If a connection factory named "default" (as shown above) is defined, this
would be used for services which does
+not explicitly specify the connection factory that should be used. The
services.xml of a service should indicate
+the connection factory and the destination name to be associated with. If a
destination is not specified, the
+implementation would create a JMS Queue with the service name. The JMS
destination should ideally be created
+and administered through the JMS provider utilities.
+
+Sample services.xml
+===================
+
+<service name="echo">
+ <transports>
+ ....
+ <transport>jms</transport>
+ </transports>
+ ...
+ <parameter name="transport.jms.ConnectionFactory"
locked="true">myTopicConnectionFactory</parameter>
+ <parameter name="transport.jms.Destination"
locked="true">dynamicTopics/something.TestTopic</parameter>
+</service>
+
+Files Making Up This JMS Implementation
+=======================================
+
+* JMSListener.java
+* JMSConnectionFactory.java
+* JMSMessageReceiver.java
+* JMSOutTransportInfo.java
+* JMSSender.java
+* JMSConstants.java
+* JMSUtils.java
+* AxisJMSException.java
+* DefaultThreadFactory.java
Propchange:
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java?rev=594498&r1=594497&r2=594498&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java
(original)
+++
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java
Tue Nov 13 03:58:38 2007
@@ -40,6 +40,7 @@
import org.apache.http.nio.NHttpServiceHandler;
import org.apache.http.nio.reactor.IOEventDispatch;
import org.apache.http.nio.reactor.ListeningIOReactor;
+import org.apache.http.nio.reactor.IOReactorExceptionHandler;
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
@@ -55,7 +56,7 @@
/** The Axis2 configuration context */
private ConfigurationContext cfgCtx;
/** The IOReactor */
- private ListeningIOReactor ioReactor = null;
+ private DefaultListeningIOReactor ioReactor = null;
/** The EPR prefix for services available over this transport */
private String serviceEPRPrefix;
@@ -77,6 +78,20 @@
try {
ioReactor = new DefaultListeningIOReactor(
NHttpConfiguration.getInstance().getServerIOWorkers(), params);
+
+ ioReactor.setExceptionHandler(new IOReactorExceptionHandler() {
+ public boolean handle(IOException ioException) {
+ log.warn("System may be unstable: IOReactor encountered a
checked exception : " +
+ ioException.getMessage(), ioException);
+ return true;
+ }
+
+ public boolean handle(RuntimeException runtimeException) {
+ log.warn("System may be unstable: IOReactor encountered a
runtime exception : " +
+ runtimeException.getMessage(), runtimeException);
+ return true;
+ }
+ });
} catch (IOException e) {
log.error("Error starting the IOReactor", e);
}
Modified:
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java?rev=594498&r1=594497&r2=594498&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
(original)
+++
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
Tue Nov 13 03:58:38 2007
@@ -54,10 +54,7 @@
import org.apache.http.impl.nio.reactor.SSLIOSessionHandler;
import org.apache.http.nio.NHttpClientConnection;
import org.apache.http.nio.NHttpClientHandler;
-import org.apache.http.nio.reactor.ConnectingIOReactor;
-import org.apache.http.nio.reactor.IOEventDispatch;
-import org.apache.http.nio.reactor.SessionRequest;
-import org.apache.http.nio.reactor.SessionRequestCallback;
+import org.apache.http.nio.reactor.*;
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
@@ -75,7 +72,7 @@
/** The Axis2 configuration context */
private ConfigurationContext cfgCtx;
/** The IOReactor */
- private ConnectingIOReactor ioReactor = null;
+ private DefaultConnectingIOReactor ioReactor = null;
/** The client handler */
private NHttpClientHandler handler = null;
/** The session request callback that calls back to the message receiver
with errors */
@@ -117,6 +114,19 @@
try {
ioReactor = new DefaultConnectingIOReactor(
NHttpConfiguration.getInstance().getClientIOWorkers(), params);
+ ioReactor.setExceptionHandler(new IOReactorExceptionHandler() {
+ public boolean handle(IOException ioException) {
+ log.warn("System may be unstable: IOReactor encountered a
checked exception : " +
+ ioException.getMessage(), ioException);
+ return true;
+ }
+
+ public boolean handle(RuntimeException runtimeException) {
+ log.warn("System may be unstable: IOReactor encountered a
runtime exception : " +
+ runtimeException.getMessage(), runtimeException);
+ return true;
+ }
+ });
} catch (IOException e) {
log.error("Error starting the IOReactor", e);
}
Modified: webservices/synapse/trunk/java/modules/war/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/war/pom.xml?rev=594498&r1=594497&r2=594498&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/war/pom.xml (original)
+++ webservices/synapse/trunk/java/modules/war/pom.xml Tue Nov 13 03:58:38 2007
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.synapse</groupId>
@@ -62,7 +62,7 @@
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2</artifactId>
<version>${sandesha2.version}</version>
- <type>mar</type>
+ <type>mar</type>
<outputDirectory>target/temp/lib</outputDirectory>
</artifactItem>
<artifactItem>
@@ -93,9 +93,9 @@
<directory>repository</directory>
<targetPath>WEB-INF/repository</targetPath>
<excludes>
- <exclude>repository/conf/web.xml</exclude>
- <exclude>repository/conf/axis2.xml</exclude>
- <exclude>repository/conf/synapse.xml</exclude>
+ <exclude>conf/web.xml</exclude>
+ <exclude>conf/axis2.xml</exclude>
+ <exclude>conf/synapse.xml</exclude>
</excludes>
</resource>
<!--<resource>-->
@@ -119,6 +119,7 @@
<targetPath>WEB-INF/classes</targetPath>
<includes>
<include>log4j.properties</include>
+ <include>synapse.properties</include>
<include>identity.jks</include>
<include>trust.jks</include>
</includes>
@@ -223,23 +224,23 @@
</resource>
<resource>
<directory>repository/conf</directory>
- <targetPath>WEB-INF</targetPath>
+ <targetPath>WEB-INF/conf</targetPath>
<includes>
- <include>web.xml</include>
+ <include>axis2.xml</include>
+ <include>synapse.xml</include>
</includes>
</resource>
<resource>
<directory>repository/conf</directory>
- <targetPath>WEB-INF/conf</targetPath>
+ <targetPath>WEB-INF</targetPath>
<includes>
- <include>axis2.xml</include>
- <include>synapse.xml</include>
+ <include>web.xml</include>
</includes>
</resource>
</webResources>
</configuration>
</plugin>
-
+
</plugins>
</build>
</project>
Propchange: webservices/synapse/trunk/java/modules/war/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/synapse/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/pom.xml?rev=594498&r1=594497&r2=594498&view=diff
==============================================================================
--- webservices/synapse/trunk/java/pom.xml (original)
+++ webservices/synapse/trunk/java/pom.xml Tue Nov 13 03:58:38 2007
@@ -32,7 +32,7 @@
<groupId>org.apache.synapse</groupId>
<artifactId>Apache-Synapse</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<name>Apache Synapse</name>
<description>Apache Synapse</description>
@@ -228,12 +228,6 @@
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
<version>${axis2.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
@@ -379,12 +373,6 @@
</dependency>
<dependency>
- <groupId>jms</groupId>
- <artifactId>jms-1.0.2b-spec</artifactId>
- <version>${jms.spec.version}</version>
- </dependency>
-
- <dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>${commons.dbcp.version}</version>
@@ -656,11 +644,6 @@
<version>${httpcore.nio.version}</version>
</dependency>
<dependency>
- <groupId>jms</groupId>
- <artifactId>jms-1.0.2b-spec</artifactId>
- <version>${jms.spec.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs</artifactId>
<version>${commons.vfs.version}</version>
@@ -858,11 +841,6 @@
<!-- dependencies for Rampart -->
<dependency>
<groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk13</artifactId>
- <version>${bcprov.jdk13.version}</version>
- </dependency>
- <dependency>
- <groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
<version>${bcprov.jdk15.version}</version>
</dependency>
@@ -900,9 +878,9 @@
</dependency>
<dependency>
- <groupId>tomcat</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>${tomcat.version}</version>
+ <version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>
<!-- Wrapper jars -->
@@ -1003,9 +981,8 @@
<properties>
<!-- Synapse and related components -->
- <synapse.version>SNAPSHOT</synapse.version>
+ <synapse.version>1.1.1-SNAPSHOT</synapse.version>
<httpcore.nio.version>4.0-alpha6</httpcore.nio.version>
- <jms.spec.version>1.0</jms.spec.version>
<commons.dbcp.version>1.2.2</commons.dbcp.version>
<commons.pool.version>1.3</commons.pool.version>
<commons.vfs.version>1.1-587797</commons.vfs.version>
@@ -1032,7 +1009,6 @@
<wss4j.version>1.5.3</wss4j.version>
<opensaml.version>1.1</opensaml.version>
<xmlsec.version>1.4.0</xmlsec.version>
- <bcprov.jdk13.version>132</bcprov.jdk13.version>
<bcprov.jdk15.version>132</bcprov.jdk15.version>
<xerces.version>2.8.1</xerces.version>
@@ -1064,8 +1040,7 @@
<xbean.version>2.2.0</xbean.version>
<bsf.version>3.0-beta2</bsf.version>
<groovy.version>1.0</groovy.version>
- <tomcat.version>5.5.15</tomcat.version>
- <mx4j.version>3.0.1</mx4j.version>
+ <servlet-api.version>2.3</servlet-api.version>
</properties>
Propchange: webservices/synapse/trunk/java/repository/conf/sample/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
webservices/synapse/trunk/java/repository/conf/sample/resources/policy/throttle_policy.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/repository/conf/sample/resources/policy/throttle_policy.xml?rev=594498&r1=594497&r2=594498&view=diff
==============================================================================
---
webservices/synapse/trunk/java/repository/conf/sample/resources/policy/throttle_policy.xml
(original)
+++
webservices/synapse/trunk/java/repository/conf/sample/resources/policy/throttle_policy.xml
Tue Nov 13 03:58:38 2007
@@ -8,7 +8,7 @@
<wsp:All>
<throttle:MaximumCount>4</throttle:MaximumCount>
<throttle:UnitTime>800000</throttle:UnitTime>
- <throttle:ProhibitTimePeriod
wsp:Optional="true">10000</throttle:ProhibitTimePeriod>
+ <throttle:ProhibitTimePeriod
wsp:Optional="true">1000</throttle:ProhibitTimePeriod>
</wsp:All>
<throttle:IsAllow>true</throttle:IsAllow>
</wsp:ExactlyOne>
Propchange:
webservices/synapse/trunk/java/repository/conf/sample/resources/proxy/sample_proxy_1.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_255.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_255.xml?rev=594498&r1=594497&r2=594498&view=diff
==============================================================================
---
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_255.xml
(original)
+++
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_255.xml
Tue Nov 13 03:58:38 2007
@@ -18,19 +18,30 @@
-->
<!-- Switching from ftp transport listener to mail transport sender -->
+
<definitions xmlns="http://ws.apache.org/ns/synapse";>
- <proxy name="StockQuoteProxy">
- <target>
- <endpoint>
- <address uri="vfs:zip:file:///tmp/out/something.zip!out.xml"/>
- </endpoint>
- <outSequence>
- <send/>
- </outSequence>
- </target>
- <parameter name="transport.vfs.FileURI">file:///tmp/in</parameter>
- <parameter name="transport.vfs.ContentType">text/xml</parameter>
- <parameter name="transport.vfs.FileNamePattern">in.xml</parameter>
- <parameter name="transport.PollInterval">60</parameter>
- </proxy>
+ <proxy name="StockQuoteProxy" transports="vfs">
+ <parameter name="transport.vfs.FileURI">vfs:ftp://guest:[EMAIL
PROTECTED]/test?vfs.passive=true</parameter> <!--CHANGE-->
+ <parameter name="transport.vfs.ContentType">text/xml</parameter>
+ <parameter name="transport.vfs.FileNamePattern">.*\.xml</parameter>
+ <parameter name="transport.PollInterval">15</parameter>
+
+ <target>
+ <inSequence>
+ <header name="Action" value="urn:getQuote"/>
+ </inSequence>
+ <endpoint>
+ <address uri="http://localhost:9000/soap/SimpleStockQuoteService"/>
+ </endpoint>
+ <outSequence>
+ <property action="set" name="OUT_ONLY" value="true"/>
+ <send>
+ <endpoint>
+ <address uri="mailto:[EMAIL PROTECTED]"/> <!--CHANGE-->
+ </endpoint>
+ </send>
+ </outSequence>
+ </target>
+ <publishWSDL
uri="file:repository/conf/sample/resources/proxy/sample_proxy_1.wsdl"/>
+ </proxy>
</definitions>
Modified:
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_361.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_361.xml?rev=594498&r1=594497&r2=594498&view=diff
==============================================================================
---
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_361.xml
(original)
+++
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_361.xml
Tue Nov 13 03:58:38 2007
@@ -44,7 +44,7 @@
</pool>
</connection>
<statement>
- <sql>update company set prize=? where name =?</sql>
+ <sql>update company set price=? where name =?</sql>
<parameter expression="//m0:return/m0:last/child::text()"
xmlns:m0="http://services.samples/xsd";
type="DOUBLE"/>
<parameter expression="//m0:return/m0:symbol/child::text()"
Modified:
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_362.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_362.xml?rev=594498&r1=594497&r2=594498&view=diff
==============================================================================
---
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_362.xml
(original)
+++
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_362.xml
Tue Nov 13 03:58:38 2007
@@ -45,7 +45,7 @@
</pool>
</connection>
<statement>
- <sql>update company set prize=? where name =?</sql>
+ <sql>update company set price=? where name =?</sql>
<parameter expression="//m0:return/m0:last/child::text()"
xmlns:m0="http://services.samples/xsd";
type="DOUBLE"/>
<parameter expression="//m0:return/m0:symbol/child::text()"
@@ -69,12 +69,12 @@
<sql>select * from company where name =?</sql>
<parameter expression="//m0:return/m0:symbol/child::text()"
xmlns:m0="http://services.samples/xsd";
type="VARCHAR"/>
- <result name="stock_prize" column="prize"/>
+ <result name="stock_price" column="price"/>
</statement>
</dblookup>
<log level="custom">
<property name="text"
- expression="fn:concat('Stock Prize -
',get-property('stock_prize'))"/>
+ expression="fn:concat('Stock price -
',get-property('stock_price'))"/>
</log>
<send/>
</out>
Modified:
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_371.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_371.xml?rev=594498&r1=594497&r2=594498&view=diff
==============================================================================
---
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_371.xml
(original)
+++
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_371.xml
Tue Nov 13 03:58:38 2007
@@ -27,7 +27,6 @@
<wsp:Policy
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
xmlns:throttle="http://www.wso2.org/products/wso2commons/throttle";>
<throttle:ThrottleAssertion>
-
<throttle:MaximumConcurrentAccess>10</throttle:MaximumConcurrentAccess>
<wsp:All>
<throttle:ID
throttle:type="IP">Other</throttle:ID>
<wsp:ExactlyOne>
Modified:
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_372.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_372.xml?rev=594498&r1=594497&r2=594498&view=diff
==============================================================================
---
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_372.xml
(original)
+++
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_372.xml
Tue Nov 13 03:58:38 2007
@@ -17,19 +17,15 @@
~ under the License.
-->
-<!-- TODO: Find the topic -->
+<!-- Use of both concurrency throttling and request rate based throttling -->
<definitions xmlns="http://ws.apache.org/ns/synapse";>
<registry provider="org.apache.synapse.registry.url.SimpleURLRegistry">
<!-- the root property of the simple URL registry helps resolve a
resource URL as root + key -->
<parameter name="root">file:repository/</parameter>
<!-- all resources loaded from the URL registry would be cached for
this number of milli seconds -->
- <parameter name="cachableDuration">15000</parameter>
+ <parameter name="cachableDuration">150000</parameter>
</registry>
-
-
- <localEntry key="thottlePolicy"
-
src="file:./repository/conf/sample/resources/policy/throttle_policy.xml"/>
<sequence name="onAcceptSequence">
<log level="custom">
Modified: webservices/synapse/trunk/java/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/main/assembly/bin.xml?rev=594498&r1=594497&r2=594498&view=diff
==============================================================================
--- webservices/synapse/trunk/java/src/main/assembly/bin.xml (original)
+++ webservices/synapse/trunk/java/src/main/assembly/bin.xml Tue Nov 13
03:58:38 2007
@@ -119,7 +119,7 @@
</fileSet>
<fileSet>
<directory>src/main/release/docs</directory>
- <outputDirectory>synapse-${synapse.version}/docs</outputDirectory>
+ <outputDirectory>synapse-${synapse.version}</outputDirectory>
<includes>
<include>release_notes.txt</include>
</includes>
Propchange:
webservices/synapse/trunk/java/src/main/bin/install-synapse-service.bat
------------------------------------------------------------------------------
svn:eol-style = CRLF
Modified: webservices/synapse/trunk/java/src/main/bin/run-synapse-service.bat
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/main/bin/run-synapse-service.bat?rev=594498&r1=594497&r2=594498&view=diff
==============================================================================
--- webservices/synapse/trunk/java/src/main/bin/run-synapse-service.bat
(original)
+++ webservices/synapse/trunk/java/src/main/bin/run-synapse-service.bat Tue Nov
13 03:58:38 2007
@@ -1,56 +1,56 @@
[EMAIL PROTECTED] off
-setlocal
-
-rem Copyright (c) 1999, 2006 Tanuki Software Inc.
-rem
-rem Java Service Wrapper general startup script
-rem
-
-rem
-rem Resolve the real path of the wrapper.exe
-rem For non NT systems, the _REALPATH and _WRAPPER_CONF values
-rem can be hard-coded below and the following test removed.
-rem
-if "%OS%"=="Windows_NT" goto nt
-echo This script only works with NT-based versions of Windows.
-goto :eof
-
-:nt
-rem
-rem Find the application home.
-rem
-rem %~dp0 is location of current script under NT
-set _REALPATH=%~dp0..\
-
-rem Decide on the wrapper binary.
-set _WRAPPER_BASE=wrapper
-set _WRAPPER_DIR=%_REALPATH%bin\native\
-set _WRAPPER_EXE=%_WRAPPER_DIR%%_WRAPPER_BASE%-windows-x86-32.exe
-if exist "%_WRAPPER_EXE%" goto conf
-set _WRAPPER_EXE=%_WRAPPER_DIR%%_WRAPPER_BASE%-windows-x86-64.exe
-if exist "%_WRAPPER_EXE%" goto conf
-set _WRAPPER_EXE=%_WRAPPER_DIR%%_WRAPPER_BASE%.exe
-if exist "%_WRAPPER_EXE%" goto conf
-echo Unable to locate a Wrapper executable using any of the following names:
-echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
-echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
-echo %_REALPATH%%_WRAPPER_BASE%.exe
-pause
-goto :eof
-
-rem
-rem Find the wrapper.conf
-rem
-:conf
-set _WRAPPER_CONF="%~f1"
-if not %_WRAPPER_CONF%=="" goto startup
-set _WRAPPER_CONF="%_REALPATH%repository\conf\wrapper.conf"
-
-rem
-rem Start the Wrapper
-rem
-:startup
-"%_WRAPPER_EXE%" -c %_WRAPPER_CONF%
-if not errorlevel 1 goto :eof
-pause
-
[EMAIL PROTECTED] off
+setlocal
+
+rem Copyright (c) 1999, 2006 Tanuki Software Inc.
+rem
+rem Java Service Wrapper general startup script
+rem
+
+rem
+rem Resolve the real path of the wrapper.exe
+rem For non NT systems, the _REALPATH and _WRAPPER_CONF values
+rem can be hard-coded below and the following test removed.
+rem
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0..\
+
+rem Decide on the wrapper binary.
+set _WRAPPER_BASE=wrapper
+set _WRAPPER_DIR=%_REALPATH%bin\native\
+set _WRAPPER_EXE=%_WRAPPER_DIR%%_WRAPPER_BASE%-windows-x86-32.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_WRAPPER_DIR%%_WRAPPER_BASE%-windows-x86-64.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_WRAPPER_DIR%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+echo %_REALPATH%%_WRAPPER_BASE%.exe
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+set _WRAPPER_CONF="%~f1"
+if not %_WRAPPER_CONF%=="" goto startup
+set _WRAPPER_CONF="%_REALPATH%repository\conf\wrapper.conf"
+
+rem
+rem Start the Wrapper
+rem
+:startup
+"%_WRAPPER_EXE%" -c %_WRAPPER_CONF%
+if not errorlevel 1 goto :eof
+pause
+
Propchange: webservices/synapse/trunk/java/src/main/bin/run-synapse-service.bat
------------------------------------------------------------------------------
svn:eol-style = CRLF
Propchange: webservices/synapse/trunk/java/src/main/bin/synapse-daemon.sh
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange:
webservices/synapse/trunk/java/src/main/bin/uninstall-synapse-service.bat
------------------------------------------------------------------------------
svn:eol-style = CRLF
Modified: webservices/synapse/trunk/java/src/main/release/BUILDING.txt
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/main/release/BUILDING.txt?rev=594498&r1=594497&r2=594498&view=diff
==============================================================================
--- webservices/synapse/trunk/java/src/main/release/BUILDING.txt (original)
+++ webservices/synapse/trunk/java/src/main/release/BUILDING.txt Tue Nov 13
03:58:38 2007
@@ -1,19 +1,19 @@
-Building Synapse from Source
-
-The Synapse source code is available at
http://svn.apache.org/repos/asf/webservices/synapse/trunk/java
-
-To build Synapse, you will need JDK 1.5.x., Maven 2.0.6
-
-The Synapse JARs could be built with Maven 2 as follows:
-
- mvn clean install
-
-To build the Synapse distributions, use the following:
-
- mvn assembly:assembly -Drelease
-
-This will build the source and binary distributions in the target folder
created.
-
-To build the site, use:
-
- mvn site
+Building Synapse from Source
+
+The Synapse source code is available at
http://svn.apache.org/repos/asf/webservices/synapse/trunk/java
+
+To build Synapse, you will need JDK 1.5.x., Maven 2.0.6
+
+The Synapse JARs could be built with Maven 2 as follows:
+
+ mvn clean install
+
+To build the Synapse distributions, first build the jars using the above and
then use the following:
+
+ mvn assembly:assembly -Drelease -Dmaven.test.skip
+
+This will build the source and binary distributions in the target folder
created.
+
+To build the site, use:
+
+ mvn site
Propchange: webservices/synapse/trunk/java/src/main/release/BUILDING.txt
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
