You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/01/31 15:36:47 UTC
svn commit: r373823 [2/3] - in /incubator/servicemix/trunk: etc/
servicemix-assembly/
servicemix-assembly/src/main/release/examples/servicemix-web/
servicemix-assembly/src/sandbox/xfire-binding/ servicemix-components/
servicemix-components/src/main/jav...
Modified: incubator/servicemix/trunk/servicemix-components/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/project.xml?rev=373823&r1=373822&r2=373823&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/project.xml Tue Jan 31 06:36:22 2006
@@ -1,607 +1,607 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
- Copyright 2005 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.
-
--->
-
-<project>
- <pomVersion>3</pomVersion>
- <extend>${basedir}/../etc/project.xml</extend>
-
- <name>ServiceMix :: Components</name>
- <id>servicemix-components</id>
-
- <dependencies>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>servicemix-jbi</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <eclipse.dependency>true</eclipse.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>servicemix-core</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <eclipse.dependency>true</eclipse.dependency>
- </properties>
- </dependency>
-
- <!-- MX4J -->
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- <version>${mx4j_version}</version>
- </dependency>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-remote</artifactId>
- <version>${mx4j_remote_version}</version>
- </dependency>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-tools</artifactId>
- <version>${mx4j_tools_version}</version>
- </dependency>
-
- <!--For remote management tasks-->
-
- <dependency>
- <id>ant</id>
- <version>${ant_version}</version>
- </dependency>
-
- <dependency>
- <id>regexp</id>
- <version>${regexp_version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons_logging_version}</version>
- <url>http://jakarta.apache.org/commons/logging/</url>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j_version}</version>
- </dependency>
-
- <dependency>
- <id>concurrent</id>
- <version>${concurrent_version}</version>
- </dependency>
-
- <dependency>
- <id>wsdl4j</id>
- <version>${wsdl4j_version}</version>
- </dependency>
-
- <dependency>
- <id>commons-beanutils</id>
- <version>${commons_beanutils_version}</version>
- </dependency>
-
-
- <!-- for DOM, SAX, StAX and XPath support -->
-
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>jaxp</artifactId>
- <version>${jaxp_version}</version>
- <properties>
- <lib>true</lib>
- </properties>
- </dependency>
-
- <dependency>
- <id>stax+api</id>
- <version>${stax_api_version}</version>
- </dependency>
-
- <dependency>
- <id>jaxen</id>
- <version>${jaxen_version}</version>
- </dependency>
-
- <!-- possible StAX implementations: START -->
-
- <!-- fast implementation of StAX -->
- <dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>${woodstox_version}</version>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xercesImpl_version}</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>${xerces_version}</version>
- </dependency>
-
- <!-- mostly included for some DOM/SAX tools we could maybe replace with JAXP versions -->
- <dependency>
- <id>xalan</id>
- <version>${xalan_version}</version>
- </dependency>
-
-
- <!-- for spring integration -->
- <dependency>
- <groupId>springframework</groupId>
- <artifactId>spring</artifactId>
- <version>${spring_version}</version>
- </dependency>
-
-
- <!-- utility library for adapting StAX to SAX and JAXP Source -->
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>stax-utils</artifactId>
- <version>${stax_utils_version}</version>
- </dependency>
-
-
- <!--
- || Optional Components
- -->
-
- <!-- http binding -->
-
- <!-- FTP binding -->
- <dependency>
- <id>commons-net</id>
- <version>${commons_net_version}</version>
- </dependency>
- <dependency>
- <id>oro</id>
- <version>${oro_version}</version>
- </dependency>
-
-
- <!-- VFS binding -->
- <dependency>
- <groupId>commons-vfs</groupId>
- <artifactId>commons-vfs</artifactId>
- <version>${commons_vfs_version}</version>
- </dependency>
-
-
- <!-- for drools component -->
- <dependency>
- <groupId>drools</groupId>
- <artifactId>drools-all-jdk1.4</artifactId>
- <version>${drools_version}</version>
- </dependency>
-
- <dependency>
- <groupId>janino</groupId>
- <artifactId>janino</artifactId>
- <version>${janino_version}</version>
- </dependency>
- <dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>${antlr_version}</version>
- </dependency>
-
- <!-- for quartz binding -->
- <dependency>
- <id>quartz</id>
- <version>${quartz_version}</version>
- </dependency>
-
- <!-- SAAJ / JAX-RPC binding -->
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>saaj-api</artifactId>
- <version>${saaj_version}</version>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>saaj-impl</artifactId>
- <version>${saaj_version}</version>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-jaxrpc</artifactId>
- <version>${axis_version}</version>
- </dependency>
- <dependency>
- <id>axis</id>
- <version>${axis_version}</version>
- </dependency>
- <dependency>
- <id>commons-discovery</id>
- <version>${commons_discovery_version}</version>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>${xml_apis_version}</version>
- </dependency>
-
- <!-- HTTP client -->
- <dependency>
- <id>commons-httpclient</id>
- <version>${commons_httpclient_version}</version>
- </dependency>
- <dependency>
- <id>commons-codec</id>
- <version>${commons_codec_version}</version>
- </dependency>
-
- <!-- Rome RSS Reader -->
- <dependency>
- <id>rome</id>
- <version>${rome_version}</version>
- </dependency>
-
-
- <dependency>
- <id>jdom</id>
- <version>${jdom_version}</version>
- </dependency>
-
-
- <!-- J2EE JARs -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>${geronimo_spec_jms_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- <version>${geronimo_spec_jta_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
- <version>${geronimo_spec_j2ee_management_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- <version>${geronimo_spec_j2ee_connector_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.0.2_spec</artifactId>
- <version>${geronimo_spec_activation_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
- <version>${geronimo_spec_javamail_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.4_spec</artifactId>
- <version>${geronimo_spec_servlet_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-activation</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
-
- <!-- for custom XML parsing -->
- <dependency>
- <groupId>org.xbean</groupId>
- <artifactId>xbean-spring</artifactId>
- <version>${xbean_version}</version>
- <url>http://www.xbean.org</url>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>org.xbean</groupId>
- <artifactId>xbean-server</artifactId>
- <version>${xbean_version}</version>
- <url>http://www.xbean.org</url>
- </dependency>
- <dependency>
- <groupId>org.xbean</groupId>
- <artifactId>xbean-kernel</artifactId>
- <version>${xbean_version}</version>
- <url>http://www.xbean.org</url>
- </dependency>
- <dependency>
- <groupId>annogen</groupId>
- <artifactId>annogen</artifactId>
- <version>${annogen_version}</version>
- </dependency>
-
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>${cglib_version}</version>
- </dependency>
-
- <!-- JCA container and transaction manaqer -->
- <dependency>
- <id>jencks+all</id>
- <version>${jencks_version}</version>
- </dependency>
-
-
- <!-- default JMS provider used for implementation -->
- <dependency>
- <groupId>incubator-activemq</groupId>
- <artifactId>activemq</artifactId>
- <version>${activemq_version}</version>
- </dependency>
- <dependency>
- <groupId>incubator-activemq</groupId>
- <artifactId>activemq-ra</artifactId>
- <version>${activemq_version}</version>
- </dependency>
-
- <!-- For clustering services -->
- <dependency>
- <id>activecluster</id>
- <version>${activecluster_version}</version>
- </dependency>
-
- <!-- Jabber component -->
- <dependency>
- <groupId>activemq</groupId>
- <artifactId>smack</artifactId>
- <version>${smack_version}</version>
- </dependency>
- <dependency>
- <groupId>activemq</groupId>
- <artifactId>smackx</artifactId>
- <version>${smack_version}</version>
- </dependency>
-
-
- <!-- Lingo components -->
- <dependency>
- <id>lingo</id>
- <version>${lingo_version}</version>
- </dependency>
-
-
- <!-- for ActiveSOAP bindings -->
- <dependency>
- <id>activesoap</id>
- <version>${activesoap_version}</version>
- </dependency>
-
- <!-- For XMLBeans -->
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>${xmlbeans_version}</version>
- </dependency>
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean_xpath</artifactId>
- <version>${xmlbeans_version}</version>
- </dependency>
-
- <!-- for WSIF binding -->
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>wsif</artifactId>
- <version>${wsif_version}</version>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>wsif-j2c</artifactId>
- <version>${wsif_version}</version>
- </dependency>
-
- <!-- used for mule component -->
- <dependency>
- <id>mule</id>
- <version>${mule_version}</version>
- </dependency>
-
- <!-- used for script component -->
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>jsr-223</artifactId>
- <version>${jsr_223_version}</version>
- <url>http://www.jcp.org/en/jsr/detail?id=223</url>
- </dependency>
-
- <dependency>
- <groupId>groovy</groupId>
- <artifactId>groovy-all-1.0-jsr</artifactId>
- <version>${groovy_version}</version>
- </dependency>
-
- <!-- for XStream component -->
- <!-- optional jars for XStream marshalling -->
- <dependency>
- <id>xstream</id>
- <version>${xstream_version}</version>
- </dependency>
-
- <!-- for XFire component -->
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>xfire-all</artifactId>
- <version>${xfire_version}</version>
- </dependency>
- <dependency>
- <groupId>yom</groupId>
- <artifactId>yom</artifactId>
- <version>${yom_version}</version>
- </dependency>
-
- <!--
- || Dependencies for running test cases
- -->
-
- <!-- for pooling JMS and other resources -->
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons_collections_version}</version>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>${commons_pool_version}</version>
- </dependency>
-
- <!-- example database for testing -->
- <dependency>
- <id>hsqldb</id>
- <version>${hsqldb_version}</version>
- </dependency>
- <dependency>
- <id>axion</id>
- <version>${axion_version}</version>
- </dependency>
- <dependency>
- <groupId>commons-primitives</groupId>
- <artifactId>commons-primitives</artifactId>
- <version>${commons_primitives_version}</version>
- </dependency>
-
- <!-- optional used for in-web container testing -->
- <dependency>
- <groupId>jetty</groupId>
- <artifactId>org.mortbay.jetty</artifactId>
- <version>${org.mortbay.jetty_version}</version>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler-jdt</artifactId>
- <version>${jasper_version}</version>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- <version>${jasper_version}</version>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- <version>${jasper_version}</version>
- </dependency>
-
-
- <!-- default database for ActiveMQ -->
- <!-- To create Pooled DataSources for the JDBC message store -->
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>${commons_dbcp_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby_version}</version>
- </dependency>
-
- <!-- JNDI provider for binary release -->
- <dependency>
- <groupId>simple-jndi</groupId>
- <artifactId>simple-jndi</artifactId>
- <version>${simple_jndi_version}</version>
- </dependency>
-
- <!-- for unit test cases -->
- <dependency>
- <id>junit</id>
- <version>${junit_version}</version>
- </dependency>
- <dependency>
- <groupId>httpunit</groupId>
- <artifactId>httpunit</artifactId>
- <version>${httpunit_version}</version>
- <url>http://httpunit.sourceforge.net/</url>
- <properties>
- <scope>test</scope>
- </properties>
- </dependency>
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>${backport_util_concurrent_version}</version>
- </dependency>
-
- </dependencies>
-
-<build>
- <nagEmailAddress>servicemix-dev-subscribe@geronimo.apache.org</nagEmailAddress>
- <sourceDirectory>src/main/java</sourceDirectory>
- <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
-
- <integrationUnitTestSourceDirectory />
- <aspectSourceDirectory />
-
- <unitTest>
- <excludes>
- <!-- exclude abstract tests -->
- <exclude>**/Abstract*Test.*</exclude>
-
- <!-- Geronimo javamail bug -->
- <exclude>**/HttpSoapAttachmentsTest.*</exclude>
-
- <!-- need a jabber test server... -->
- <exclude>**/Jabber*.*</exclude>
-
- <!-- need a ftp server... -->
- <exclude>**/FTP*.*</exclude>
-
- <!-- need to check why it fails -->
- <exclude>**/JmsOverJcaWithFullXATest.*</exclude>
- </excludes>
- </unitTest>
- </build>
-
- <reports>
- <report>maven-jdepend-plugin</report>
- <!-- re-enable when we can get the warnings down to less than a few Mb!
- <report>maven-checkstyle-plugin</report>
- <report>maven-simian-plugin</report>
- <report>maven-faq-plugin</report>
- -->
- <report>maven-changes-plugin</report>
-
- <!-- clover seems to break the CI tool
- <report>maven-clover-plugin</report>
- -->
- <report>maven-changelog-plugin</report>
- <report>maven-file-activity-plugin</report>
- <report>maven-developer-activity-plugin</report>
- <report>maven-javadoc-plugin</report>
- <report>maven-jxr-plugin</report>
- <report>maven-junit-report-plugin</report>
- <report>maven-tasklist-plugin</report>
- <report>maven-pmd-plugin</report>
-
- </reports>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+ Copyright 2005 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.
+
+-->
+
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>${basedir}/../etc/project.xml</extend>
+
+ <name>ServiceMix :: Components</name>
+ <id>servicemix-components</id>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>servicemix-jbi</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <eclipse.dependency>true</eclipse.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>servicemix-core</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <eclipse.dependency>true</eclipse.dependency>
+ </properties>
+ </dependency>
+
+ <!-- MX4J -->
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
+ <version>${mx4j_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-remote</artifactId>
+ <version>${mx4j_remote_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-tools</artifactId>
+ <version>${mx4j_tools_version}</version>
+ </dependency>
+
+ <!--For remote management tasks-->
+
+ <dependency>
+ <id>ant</id>
+ <version>${ant_version}</version>
+ </dependency>
+
+ <dependency>
+ <id>regexp</id>
+ <version>${regexp_version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons_logging_version}</version>
+ <url>http://jakarta.apache.org/commons/logging/</url>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j_version}</version>
+ </dependency>
+
+ <dependency>
+ <id>concurrent</id>
+ <version>${concurrent_version}</version>
+ </dependency>
+
+ <dependency>
+ <id>wsdl4j</id>
+ <version>${wsdl4j_version}</version>
+ </dependency>
+
+ <dependency>
+ <id>commons-beanutils</id>
+ <version>${commons_beanutils_version}</version>
+ </dependency>
+
+
+ <!-- for DOM, SAX, StAX and XPath support -->
+
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jaxp</artifactId>
+ <version>${jaxp_version}</version>
+ <properties>
+ <lib>true</lib>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>stax+api</id>
+ <version>${stax_api_version}</version>
+ </dependency>
+
+ <dependency>
+ <id>jaxen</id>
+ <version>${jaxen_version}</version>
+ </dependency>
+
+ <!-- possible StAX implementations: START -->
+
+ <!-- fast implementation of StAX -->
+ <dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>${woodstox_version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xercesImpl_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>${xerces_version}</version>
+ </dependency>
+
+ <!-- mostly included for some DOM/SAX tools we could maybe replace with JAXP versions -->
+ <dependency>
+ <id>xalan</id>
+ <version>${xalan_version}</version>
+ </dependency>
+
+
+ <!-- for spring integration -->
+ <dependency>
+ <groupId>springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>${spring_version}</version>
+ </dependency>
+
+
+ <!-- utility library for adapting StAX to SAX and JAXP Source -->
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>stax-utils</artifactId>
+ <version>${stax_utils_version}</version>
+ </dependency>
+
+
+ <!--
+ || Optional Components
+ -->
+
+ <!-- http binding -->
+
+ <!-- FTP binding -->
+ <dependency>
+ <id>commons-net</id>
+ <version>${commons_net_version}</version>
+ </dependency>
+ <dependency>
+ <id>oro</id>
+ <version>${oro_version}</version>
+ </dependency>
+
+
+ <!-- VFS binding -->
+ <dependency>
+ <groupId>commons-vfs</groupId>
+ <artifactId>commons-vfs</artifactId>
+ <version>${commons_vfs_version}</version>
+ </dependency>
+
+
+ <!-- for drools component -->
+ <dependency>
+ <groupId>drools</groupId>
+ <artifactId>drools-all-jdk1.4</artifactId>
+ <version>${drools_version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>janino</groupId>
+ <artifactId>janino</artifactId>
+ <version>${janino_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>${antlr_version}</version>
+ </dependency>
+
+ <!-- for quartz binding -->
+ <dependency>
+ <id>quartz</id>
+ <version>${quartz_version}</version>
+ </dependency>
+
+ <!-- SAAJ / JAX-RPC binding -->
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>saaj-api</artifactId>
+ <version>${saaj_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <version>${saaj_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-jaxrpc</artifactId>
+ <version>${axis_version}</version>
+ </dependency>
+ <dependency>
+ <id>axis</id>
+ <version>${axis_version}</version>
+ </dependency>
+ <dependency>
+ <id>commons-discovery</id>
+ <version>${commons_discovery_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>${xml_apis_version}</version>
+ </dependency>
+
+ <!-- HTTP client -->
+ <dependency>
+ <id>commons-httpclient</id>
+ <version>${commons_httpclient_version}</version>
+ </dependency>
+ <dependency>
+ <id>commons-codec</id>
+ <version>${commons_codec_version}</version>
+ </dependency>
+
+ <!-- Rome RSS Reader -->
+ <dependency>
+ <id>rome</id>
+ <version>${rome_version}</version>
+ </dependency>
+
+
+ <dependency>
+ <id>jdom</id>
+ <version>${jdom_version}</version>
+ </dependency>
+
+
+ <!-- J2EE JARs -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>${geronimo_spec_jms_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <version>${geronimo_spec_jta_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+ <version>${geronimo_spec_j2ee_management_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <version>${geronimo_spec_j2ee_connector_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.0.2_spec</artifactId>
+ <version>${geronimo_spec_activation_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+ <version>${geronimo_spec_javamail_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ <version>${geronimo_spec_servlet_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-activation</artifactId>
+ <version>${geronimo_version}</version>
+ </dependency>
+
+ <!-- for custom XML parsing -->
+ <dependency>
+ <groupId>org.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <version>${xbean_version}</version>
+ <url>http://www.xbean.org</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.xbean</groupId>
+ <artifactId>xbean-server</artifactId>
+ <version>${xbean_version}</version>
+ <url>http://www.xbean.org</url>
+ </dependency>
+ <dependency>
+ <groupId>org.xbean</groupId>
+ <artifactId>xbean-kernel</artifactId>
+ <version>${xbean_version}</version>
+ <url>http://www.xbean.org</url>
+ </dependency>
+ <dependency>
+ <groupId>annogen</groupId>
+ <artifactId>annogen</artifactId>
+ <version>${annogen_version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>${cglib_version}</version>
+ </dependency>
+
+ <!-- JCA container and transaction manaqer -->
+ <dependency>
+ <id>jencks+all</id>
+ <version>${jencks_version}</version>
+ </dependency>
+
+
+ <!-- default JMS provider used for implementation -->
+ <dependency>
+ <groupId>incubator-activemq</groupId>
+ <artifactId>activemq</artifactId>
+ <version>${activemq_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>incubator-activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ <version>${activemq_version}</version>
+ </dependency>
+
+ <!-- For clustering services -->
+ <dependency>
+ <id>activecluster</id>
+ <version>${activecluster_version}</version>
+ </dependency>
+
+ <!-- Jabber component -->
+ <dependency>
+ <groupId>activemq</groupId>
+ <artifactId>smack</artifactId>
+ <version>${smack_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>activemq</groupId>
+ <artifactId>smackx</artifactId>
+ <version>${smack_version}</version>
+ </dependency>
+
+
+ <!-- Lingo components -->
+ <dependency>
+ <id>lingo</id>
+ <version>${lingo_version}</version>
+ </dependency>
+
+
+ <!-- for ActiveSOAP bindings -->
+ <dependency>
+ <id>activesoap</id>
+ <version>${activesoap_version}</version>
+ </dependency>
+
+ <!-- For XMLBeans -->
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>${xmlbeans_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean_xpath</artifactId>
+ <version>${xmlbeans_version}</version>
+ </dependency>
+
+ <!-- for WSIF binding -->
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>wsif</artifactId>
+ <version>${wsif_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>wsif-j2c</artifactId>
+ <version>${wsif_version}</version>
+ </dependency>
+
+ <!-- used for mule component -->
+ <dependency>
+ <id>mule</id>
+ <version>${mule_version}</version>
+ </dependency>
+
+ <!-- used for script component -->
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jsr-223</artifactId>
+ <version>${jsr_223_version}</version>
+ <url>http://www.jcp.org/en/jsr/detail?id=223</url>
+ </dependency>
+
+ <dependency>
+ <groupId>groovy</groupId>
+ <artifactId>groovy-all-1.0-jsr</artifactId>
+ <version>${groovy_version}</version>
+ </dependency>
+
+ <!-- for XStream component -->
+ <!-- optional jars for XStream marshalling -->
+ <dependency>
+ <id>xstream</id>
+ <version>${xstream_version}</version>
+ </dependency>
+
+ <!-- for XFire component -->
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>xfire-all</artifactId>
+ <version>${xfire_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>yom</groupId>
+ <artifactId>yom</artifactId>
+ <version>${yom_version}</version>
+ </dependency>
+
+ <!--
+ || Dependencies for running test cases
+ -->
+
+ <!-- for pooling JMS and other resources -->
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons_collections_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>${commons_pool_version}</version>
+ </dependency>
+
+ <!-- example database for testing -->
+ <dependency>
+ <id>hsqldb</id>
+ <version>${hsqldb_version}</version>
+ </dependency>
+ <dependency>
+ <id>axion</id>
+ <version>${axion_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-primitives</groupId>
+ <artifactId>commons-primitives</artifactId>
+ <version>${commons_primitives_version}</version>
+ </dependency>
+
+ <!-- optional used for in-web container testing -->
+ <dependency>
+ <groupId>jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>${jetty_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler-jdt</artifactId>
+ <version>${jasper_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ <version>${jasper_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ <version>${jasper_version}</version>
+ </dependency>
+
+
+ <!-- default database for ActiveMQ -->
+ <!-- To create Pooled DataSources for the JDBC message store -->
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>${commons_dbcp_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby_version}</version>
+ </dependency>
+
+ <!-- JNDI provider for binary release -->
+ <dependency>
+ <groupId>simple-jndi</groupId>
+ <artifactId>simple-jndi</artifactId>
+ <version>${simple_jndi_version}</version>
+ </dependency>
+
+ <!-- for unit test cases -->
+ <dependency>
+ <id>junit</id>
+ <version>${junit_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>${httpunit_version}</version>
+ <url>http://httpunit.sourceforge.net/</url>
+ <properties>
+ <scope>test</scope>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>${backport_util_concurrent_version}</version>
+ </dependency>
+
+ </dependencies>
+
+<build>
+ <nagEmailAddress>servicemix-dev-subscribe@geronimo.apache.org</nagEmailAddress>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
+
+ <integrationUnitTestSourceDirectory />
+ <aspectSourceDirectory />
+
+ <unitTest>
+ <excludes>
+ <!-- exclude abstract tests -->
+ <exclude>**/Abstract*Test.*</exclude>
+
+ <!-- Geronimo javamail bug -->
+ <exclude>**/HttpSoapAttachmentsTest.*</exclude>
+
+ <!-- need a jabber test server... -->
+ <exclude>**/Jabber*.*</exclude>
+
+ <!-- need a ftp server... -->
+ <exclude>**/FTP*.*</exclude>
+
+ <!-- need to check why it fails -->
+ <exclude>**/JmsOverJcaWithFullXATest.*</exclude>
+ </excludes>
+ </unitTest>
+ </build>
+
+ <reports>
+ <report>maven-jdepend-plugin</report>
+ <!-- re-enable when we can get the warnings down to less than a few Mb!
+ <report>maven-checkstyle-plugin</report>
+ <report>maven-simian-plugin</report>
+ <report>maven-faq-plugin</report>
+ -->
+ <report>maven-changes-plugin</report>
+
+ <!-- clover seems to break the CI tool
+ <report>maven-clover-plugin</report>
+ -->
+ <report>maven-changelog-plugin</report>
+ <report>maven-file-activity-plugin</report>
+ <report>maven-developer-activity-plugin</report>
+ <report>maven-javadoc-plugin</report>
+ <report>maven-jxr-plugin</report>
+ <report>maven-junit-report-plugin</report>
+ <report>maven-tasklist-plugin</report>
+ <report>maven-pmd-plugin</report>
+
+ </reports>
+</project>
Modified: incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpClientMarshaler.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpClientMarshaler.java?rev=373823&r1=373822&r2=373823&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpClientMarshaler.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpClientMarshaler.java Tue Jan 31 06:36:22 2006
@@ -17,6 +17,7 @@
import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HttpMethod;
+import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.StringRequestEntity;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
@@ -24,7 +25,9 @@
import javax.jbi.messaging.MessageExchange;
import javax.jbi.messaging.NormalizedMessage;
+import javax.xml.transform.Source;
import javax.xml.transform.TransformerException;
+import javax.xml.transform.stream.StreamSource;
import java.util.Iterator;
@@ -35,18 +38,44 @@
*/
public class HttpClientMarshaler {
- protected SourceTransformer sourceTransformer = new SourceTransformer();
+ protected SourceTransformer sourceTransformer;
+ private boolean streaming;
+
+ public HttpClientMarshaler() {
+ this(false);
+ }
+
+ public HttpClientMarshaler(boolean streaming) {
+ this.sourceTransformer = new SourceTransformer();
+ this.streaming = streaming;
+ }
public void toNMS(NormalizedMessage normalizedMessage, HttpMethod method) throws Exception {
addNmsProperties(normalizedMessage, method);
-
- normalizedMessage.setContent(new StringSource(method.getResponseBodyAsString()));
+ if (streaming) {
+ normalizedMessage.setContent(new StreamSource(method.getResponseBodyAsStream()));
+ } else {
+ normalizedMessage.setContent(new StringSource(method.getResponseBodyAsString()));
+ }
}
public void fromNMS(PostMethod method, MessageExchange exchange, NormalizedMessage normalizedMessage) throws Exception, TransformerException {
addHttpHeaders(method, exchange);
- String text = sourceTransformer.toString(normalizedMessage.getContent());
- method.setRequestEntity(new StringRequestEntity(text));
+ if (streaming) {
+ method.setContentChunked(true);
+ Source src = normalizedMessage.getContent();
+ if (src instanceof StreamSource && ((StreamSource) src).getInputStream() != null) {
+ method.setRequestEntity(new InputStreamRequestEntity(
+ ((StreamSource) src).getInputStream(), -1));
+ } else {
+ String text = sourceTransformer.toString(normalizedMessage.getContent());
+ method.setRequestEntity(new StringRequestEntity(text));
+
+ }
+ } else {
+ String text = sourceTransformer.toString(normalizedMessage.getContent());
+ method.setRequestEntity(new StringRequestEntity(text));
+ }
}
protected void addHttpHeaders(HttpMethod method, MessageExchange exchange) {
Modified: incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpConnector.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpConnector.java?rev=373823&r1=373822&r2=373823&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpConnector.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpConnector.java Tue Jan 31 06:36:22 2006
@@ -15,14 +15,17 @@
*/
package org.apache.servicemix.components.http;
-import org.mortbay.http.HttpContext;
-import org.mortbay.http.SocketListener;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.servlet.ServletHandler;
-
import javax.jbi.JBIException;
import javax.jbi.component.ComponentContext;
-import java.net.UnknownHostException;
+
+import org.mortbay.jetty.Connector;
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.bio.SocketConnector;
+import org.mortbay.jetty.handler.ContextHandler;
+import org.mortbay.jetty.servlet.ServletHandler;
+import org.mortbay.jetty.servlet.ServletHolder;
+import org.mortbay.jetty.servlet.ServletMapping;
+import org.mortbay.thread.BoundedThreadPool;
/**
* An embedded Servlet engine to implement a HTTP connector
@@ -30,7 +33,7 @@
* @version $Revision$
*/
public class HttpConnector extends HttpInOutBinding {
- private SocketListener listener = new SocketListener();
+ private Connector listener = new SocketConnector();
/**
* The maximum number of threads for the Jetty SocketListener. It's set
@@ -61,7 +64,7 @@
*
* @param listener
*/
- public HttpConnector(SocketListener listener) {
+ public HttpConnector(Connector listener) {
this.listener = listener;
}
@@ -75,32 +78,38 @@
super.init(cc);
//should set all ports etc here - from the naming context I guess ?
if (listener == null) {
- listener = new SocketListener();
- }
- try {
- listener.setHost(host);
- listener.setMaxThreads(getMaxThreads());
- }
- catch (UnknownHostException e) {
- throw new JBIException("init failed", e);
+ listener = new SocketConnector();
}
+ listener.setHost(host);
listener.setPort(port);
server = new Server();
+ BoundedThreadPool btp = new BoundedThreadPool();
+ btp.setMaxThreads(getMaxThreads());
+ server.setThreadPool(btp);
}
-
+
/**
* start the Component
*
* @throws JBIException
*/
public void start() throws JBIException {
- server.addListener(listener);
- HttpContext context = server.addContext("/");
+ server.setConnectors(new Connector[] { listener });
+ ContextHandler context = new ContextHandler();
+ context.setContextPath("/");
+ ServletHolder holder = new ServletHolder();
+ holder.setName("jbiServlet");
+ holder.setClassName(BindingServlet.class.getName());
ServletHandler handler = new ServletHandler();
- handler.addServlet("jbiServlet", "/*", BindingServlet.class.getName());
- context.addHandler(handler);
+ handler.setServlets(new ServletHolder[] { holder });
+ ServletMapping mapping = new ServletMapping();
+ mapping.setServletName("jbiServlet");
+ mapping.setPathSpec("/*");
+ handler.setServletMappings(new ServletMapping[] { mapping });
+ context.setHandler(handler);
+ server.setHandler(context);
+ context.setAttribute("binding", this);
try {
- context.setAttribute("binding", this);
server.start();
}
catch (Exception e) {
@@ -113,9 +122,11 @@
*/
public void stop() throws JBIException {
try {
- server.stop();
+ if (server != null) {
+ server.stop();
+ }
}
- catch (InterruptedException e) {
+ catch (Exception e) {
throw new JBIException("Stop failed: " + e, e);
}
}
Modified: incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpInvoker.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpInvoker.java?rev=373823&r1=373822&r2=373823&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpInvoker.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpInvoker.java Tue Jan 31 06:36:22 2006
@@ -101,4 +101,12 @@
public void setDefaultInOut(boolean defaultInOut) {
this.defaultInOut = defaultInOut;
}
+
+ public HttpClientMarshaler getMarshaler() {
+ return marshaler;
+ }
+
+ public void setMarshaler(HttpClientMarshaler marshaler) {
+ this.marshaler = marshaler;
+ }
}
Modified: incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpSoapConnector.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpSoapConnector.java?rev=373823&r1=373822&r2=373823&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpSoapConnector.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpSoapConnector.java Tue Jan 31 06:36:22 2006
@@ -15,18 +15,20 @@
*/
package org.apache.servicemix.components.http;
-import java.net.UnknownHostException;
-
import javax.jbi.JBIException;
import javax.jbi.component.ComponentContext;
-import org.mortbay.http.HttpContext;
-import org.mortbay.http.SocketListener;
+import org.mortbay.jetty.Connector;
import org.mortbay.jetty.Server;
+import org.mortbay.jetty.bio.SocketConnector;
+import org.mortbay.jetty.handler.ContextHandler;
import org.mortbay.jetty.servlet.ServletHandler;
+import org.mortbay.jetty.servlet.ServletHolder;
+import org.mortbay.jetty.servlet.ServletMapping;
+import org.mortbay.thread.BoundedThreadPool;
public class HttpSoapConnector extends HttpSoapInOutBinding {
- private SocketListener listener;
+ private Connector listener = new SocketConnector();
/**
* The maximum number of threads for the Jetty SocketListener. It's set
@@ -60,7 +62,7 @@
*
* @param listener
*/
- public HttpSoapConnector(SocketListener listener) {
+ public HttpSoapConnector(Connector listener) {
this.listener = listener;
}
@@ -74,16 +76,14 @@
super.init(cc);
//should set all ports etc here - from the naming context I guess ?
if (listener == null) {
- listener = new SocketListener();
- }
- try {
- listener.setHost(host);
- listener.setMaxThreads(getMaxThreads());
- } catch (UnknownHostException e) {
- throw new JBIException("init failed", e);
+ listener = new SocketConnector();
}
+ listener.setHost(host);
listener.setPort(port);
server = new Server();
+ BoundedThreadPool btp = new BoundedThreadPool();
+ btp.setMaxThreads(getMaxThreads());
+ server.setThreadPool(btp);
}
/**
@@ -92,32 +92,41 @@
* @throws JBIException
*/
public void start() throws JBIException {
- server.addListener(listener);
- HttpContext context = server.addContext("/");
- ServletHandler handler = new ServletHandler();
- handler.addServlet("jbiServlet", "/*", BindingServlet.class
- .getName());
- context.addHandler(handler);
- try {
- context.setAttribute("binding", this);
- server.start();
- } catch (Exception e) {
- throw new JBIException("Start failed: " + e, e);
- }
+ server.setConnectors(new Connector[] { listener });
+ ContextHandler context = new ContextHandler();
+ context.setContextPath("/");
+ ServletHolder holder = new ServletHolder();
+ holder.setName("jbiServlet");
+ holder.setClassName(BindingServlet.class.getName());
+ ServletHandler handler = new ServletHandler();
+ handler.setServlets(new ServletHolder[] { holder });
+ ServletMapping mapping = new ServletMapping();
+ mapping.setServletName("jbiServlet");
+ mapping.setPathSpec("/*");
+ handler.setServletMappings(new ServletMapping[] { mapping });
+ context.setHandler(handler);
+ server.setHandler(context);
+ context.setAttribute("binding", this);
+ try {
+ server.start();
+ }
+ catch (Exception e) {
+ throw new JBIException("Start failed: " + e, e);
+ }
}
/**
* stop
*/
public void stop() throws JBIException {
- try {
- if (server != null) {
- server.stop();
- }
- } catch (InterruptedException e) {
- throw new JBIException("Stop failed: " + e, e);
- }
- }
+ try {
+ if (server != null) {
+ server.stop();
+ }
+ } catch (Exception e) {
+ throw new JBIException("Stop failed: " + e, e);
+ }
+ }
/**
* shutdown
Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapTest.java?rev=373823&r1=373822&r2=373823&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapTest.java Tue Jan 31 06:36:22 2006
@@ -55,11 +55,10 @@
public class HttpSoapTest extends TestCase {
- private static final int PORT = 7012;
-
protected JBIContainer container;
protected void setUp() throws Exception {
+ System.setProperty("DEBUG", "true");
container = new JBIContainer();
container.setMonitorInstallationDirectory(false);
container.setUseMBeanServer(false);
@@ -76,6 +75,7 @@
}
public void testInOut() throws Exception {
+ int PORT = 7012;
ActivationSpec as = new ActivationSpec();
as.setId("echo");
as.setComponent(new EchoComponent());
@@ -86,7 +86,7 @@
as.setComponent(new HttpSoapConnector(null, PORT, true));
as.setDestinationService(new QName("echo"));
container.activateComponent(as);
-
+
URLConnection connection = new URL("http://localhost:" + PORT).openConnection();
connection.setDoOutput(true);
connection.setDoInput(true);
@@ -102,6 +102,7 @@
}
public void testInOnly() throws Exception {
+ int PORT = 7013;
ActivationSpec as = new ActivationSpec();
as.setId("trace");
as.setComponent(new TraceComponent());
@@ -118,7 +119,7 @@
WebResponse response = new WebConversation().getResponse(req);
System.out.println(response.getText());
}
-
+
public void testMarhaler() throws Exception {
String url = "http://64.124.140.30/soap";
HttpSoapClientMarshaler marshaler = new HttpSoapClientMarshaler();
Modified: incubator/servicemix/trunk/servicemix-core/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/project.xml?rev=373823&r1=373822&r2=373823&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-core/project.xml Tue Jan 31 06:36:22 2006
@@ -1,458 +1,458 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
- Copyright 2005 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.
-
--->
-
-<project>
- <pomVersion>3</pomVersion>
- <extend>${basedir}/../etc/project.xml</extend>
-
- <name>ServiceMix :: Core</name>
- <id>servicemix-core</id>
-
- <dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>servicemix-jbi</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <eclipse.dependency>true</eclipse.dependency>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- <version>${mx4j_version}</version>
- </dependency>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-remote</artifactId>
- <version>${mx4j_remote_version}</version>
- </dependency>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-tools</artifactId>
- <version>${mx4j_tools_version}</version>
- </dependency>
-
- <!--For remote management tasks-->
-
- <dependency>
- <id>ant</id>
- <version>${ant_version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons_logging_version}</version>
- <url>http://jakarta.apache.org/commons/logging/</url>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j_version}</version>
- </dependency>
-
- <dependency>
- <id>lucene</id>
- <version>${lucene_version}</version>
- </dependency>
-
- <dependency>
- <id>concurrent</id>
- <version>${concurrent_version}</version>
- </dependency>
-
- <dependency>
- <id>backport-util-concurrent</id>
- <version>${backport_util_concurrent_version}</version>
- </dependency>
-
- <dependency>
- <id>wsdl4j</id>
- <version>${wsdl4j_version}</version>
- </dependency>
-
- <dependency>
- <id>commons-beanutils</id>
- <version>${commons_beanutils_version}</version>
- </dependency>
-
-
- <!-- for DOM, SAX, StAX and XPath support -->
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>jaxp</artifactId>
- <version>${jaxp_version}</version>
- </dependency>
-
- <dependency>
- <id>stax+api</id>
- <version>${stax_api_version}</version>
- </dependency>
-
- <dependency>
- <id>jaxen</id>
- <version>${jaxen_version}</version>
- </dependency>
-
- <!-- possible StAX implementations: START -->
-
- <!-- fast implementation of StAX -->
- <dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>${woodstox_version}</version>
- </dependency>
-
-
- <!-- possible StAX implementations: END -->
-
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xercesImpl_version}</version>
- </dependency>
-
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>${xml_apis_version}</version>
- </dependency>
-
- <!-- mostly included for some DOM/SAX tools we could maybe replace with JAXP versions -->
- <dependency>
- <id>xalan</id>
- <version>${xalan_version}</version>
- </dependency>
-
-
- <!-- for spring integration -->
- <dependency>
- <groupId>springframework</groupId>
- <artifactId>spring</artifactId>
- <version>${spring_version}</version>
- </dependency>
-
-
- <!-- utility library for adapting StAX to SAX and JAXP Source -->
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>stax-utils</artifactId>
- <version>${stax_utils_version}</version>
- </dependency>
-
-
- <!-- J2EE JARs -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>${geronimo_spec_jms_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.4_spec</artifactId>
- <version>${geronimo_spec_servlet_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- <version>${geronimo_spec_jta_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
- <version>${geronimo_spec_j2ee_management_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- <version>${geronimo_spec_j2ee_connector_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.0.2_spec</artifactId>
- <version>${geronimo_spec_activation_version}</version>
- </dependency>
-
-
- <!-- for custom XML parsing -->
- <dependency>
- <groupId>org.xbean</groupId>
- <artifactId>xbean-spring</artifactId>
- <version>${xbean_version}</version>
- <url>http://www.xbean.org</url>
- </dependency>
- <dependency>
- <groupId>annogen</groupId>
- <artifactId>annogen</artifactId>
- <version>${annogen_version}</version>
- </dependency>
- <dependency>
- <groupId>qdox</groupId>
- <artifactId>qdox</artifactId>
- <version>${qdox_version}</version>
- </dependency>
-
- <!-- JCA container and transaction manaqer -->
- <dependency>
- <id>jencks+all</id>
- <version>${jencks_version}</version>
- </dependency>
-
- <dependency>
- <id>lingo</id>
- <version>${lingo_version}</version>
- </dependency>
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xmlpublic</artifactId>
- <version>${xmlbeans_version}</version>
- </dependency>
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>${xmlbeans_version}</version>
- </dependency>
-
-
- <!-- default JMS provider used for implementation -->
-
-
- <!-- for ActiveMQ 4.x -->
- <dependency>
- <groupId>incubator-activemq</groupId>
- <artifactId>activemq</artifactId>
- <version>${activemq_version}</version>
- </dependency>
- <dependency>
- <groupId>incubator-activemq</groupId>
- <artifactId>activemq-ra</artifactId>
- <version>${activemq_version}</version>
- </dependency>
-
- <!-- For clustering services -->
- <dependency>
- <id>activecluster</id>
- <version>${activecluster_version}</version>
- </dependency>
-
-
- <!-- for XStream component -->
- <!-- optional jars for XStream marshalling -->
- <dependency>
- <id>xstream</id>
- <version>${xstream_version}</version>
- </dependency>
-
- <!--
- || Dependencies for running test cases
- -->
-
- <!-- for pooling JMS and other resources -->
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons_collections_version}</version>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>${commons_pool_version}</version>
- </dependency>
-
- <!-- optional used for in-web container testing -->
- <dependency>
- <groupId>jetty</groupId>
- <artifactId>org.mortbay.jetty</artifactId>
- <version>${org.mortbay.jetty_version}</version>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler-jdt</artifactId>
- <version>${jasper_version}</version>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- <version>${jasper_version}</version>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- <version>${jasper_version}</version>
- </dependency>
-
-
- <!-- default database for ActiveMQ -->
- <!-- To create Pooled DataSources for the JDBC message store -->
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>${commons_dbcp_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby_version}</version>
- </dependency>
-
- <!-- JNDI provider for binary release -->
- <dependency>
- <groupId>simple-jndi</groupId>
- <artifactId>simple-jndi</artifactId>
- <version>${simple_jndi_version}</version>
- </dependency>
-
- <!-- for unit test cases -->
- <dependency>
- <id>junit</id>
- <version>${junit_version}</version>
- </dependency>
-
- <!-- example database for testing -->
- <dependency>
- <id>hsqldb</id>
- <version>${hsqldb_version}</version>
- </dependency>
- <dependency>
- <id>axion</id>
- <version>${axion_version}</version>
- </dependency>
- <dependency>
- <groupId>commons-primitives</groupId>
- <artifactId>commons-primitives</artifactId>
- <version>${commons_primitives_version}</version>
- </dependency>
-
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>ddlutils</artifactId>
- <version>${ddlutils_version}</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons_lang_version}</version>
- </dependency>
- <dependency>
- <groupId>commons-betwixt</groupId>
- <artifactId>commons-betwixt</artifactId>
- <version>${commons_betwixt_version}</version>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>${commons_digester_version}</version>
- </dependency>
- <dependency>
- <groupId>easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>${easymock_version}</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <unitTest>
- <resources>
- <resource>
- <directory>src/test/resources</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.x*</include>
- <include>**/*.wsdl</include>
- <include>**/*.zip</include>
- </includes>
- </resource>
- <resource>
- <directory>src/test/components</directory>
- <includes>
- <include>**/*.jar</include>
- <include>**/*.x*</include>
- <include>**/*.zip</include>
- </includes>
- </resource>
- <resource>
- <directory>src/test/assemblies</directory>
- <includes>
- <include>**/*.jar</include>
- <include>**/*.zip</include>
- </includes>
- </resource>
- </resources>
- <includes>
- <include>**/*Test.*</include>
- </includes>
- <excludes>
- <!-- exclude abstract tests -->
- <exclude>**/Abstract*Test.*</exclude>
-
- <!-- fails on some platforms due to ActiveCluster issue -->
- <exclude>**/ClusterFlow*.*</exclude>
- <exclude>**/JmsFlow*.*</exclude>
- <exclude>**/JcaFlowPersistentTest.*</exclude>
- <exclude>**/JcaFlowTransactionTest.*</exclude>
-
- <!-- test cases hangs
- <exclude>**/SimpleClusterSendSyncTest.*</exclude>
- -->
-
- <!-- fails in some linux platform due to missing lib libXp.so.6 -->
- <exclude>**/ServiceMixComponentTest.*</exclude>
- <exclude>**/ExplodedComponentInstallationTest.*</exclude>
- <exclude>**/ComponentInstallationTest.*</exclude>
- <exclude>**/ComponentAssemblyInstallationTest.*</exclude>
- <exclude>**/DeploymentTest.*</exclude>
-
- <!-- Succeed in Eclipse, but fail with maven, why ?
- This may be related to activemq jmx stuff
- -->
- <exclude>**/AdminServiceTest.*</exclude>
- <exclude>**/ManagementAttributesTest.*</exclude>
- <exclude>**/ManagementContextTest.*</exclude>
-
- <!-- fail on non windows platform, why ? -->
- <exclude>**/HotDeployTest.*</exclude>
-
- </excludes>
- </unitTest>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*</include>
- </includes>
- </resource>
- <resource>
- <directory>target/generated</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- </resources>
- </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+ Copyright 2005 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.
+
+-->
+
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>${basedir}/../etc/project.xml</extend>
+
+ <name>ServiceMix :: Core</name>
+ <id>servicemix-core</id>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>servicemix-jbi</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <eclipse.dependency>true</eclipse.dependency>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
+ <version>${mx4j_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-remote</artifactId>
+ <version>${mx4j_remote_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-tools</artifactId>
+ <version>${mx4j_tools_version}</version>
+ </dependency>
+
+ <!--For remote management tasks-->
+
+ <dependency>
+ <id>ant</id>
+ <version>${ant_version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons_logging_version}</version>
+ <url>http://jakarta.apache.org/commons/logging/</url>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j_version}</version>
+ </dependency>
+
+ <dependency>
+ <id>lucene</id>
+ <version>${lucene_version}</version>
+ </dependency>
+
+ <dependency>
+ <id>concurrent</id>
+ <version>${concurrent_version}</version>
+ </dependency>
+
+ <dependency>
+ <id>backport-util-concurrent</id>
+ <version>${backport_util_concurrent_version}</version>
+ </dependency>
+
+ <dependency>
+ <id>wsdl4j</id>
+ <version>${wsdl4j_version}</version>
+ </dependency>
+
+ <dependency>
+ <id>commons-beanutils</id>
+ <version>${commons_beanutils_version}</version>
+ </dependency>
+
+
+ <!-- for DOM, SAX, StAX and XPath support -->
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jaxp</artifactId>
+ <version>${jaxp_version}</version>
+ </dependency>
+
+ <dependency>
+ <id>stax+api</id>
+ <version>${stax_api_version}</version>
+ </dependency>
+
+ <dependency>
+ <id>jaxen</id>
+ <version>${jaxen_version}</version>
+ </dependency>
+
+ <!-- possible StAX implementations: START -->
+
+ <!-- fast implementation of StAX -->
+ <dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>${woodstox_version}</version>
+ </dependency>
+
+
+ <!-- possible StAX implementations: END -->
+
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xercesImpl_version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>${xml_apis_version}</version>
+ </dependency>
+
+ <!-- mostly included for some DOM/SAX tools we could maybe replace with JAXP versions -->
+ <dependency>
+ <id>xalan</id>
+ <version>${xalan_version}</version>
+ </dependency>
+
+
+ <!-- for spring integration -->
+ <dependency>
+ <groupId>springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>${spring_version}</version>
+ </dependency>
+
+
+ <!-- utility library for adapting StAX to SAX and JAXP Source -->
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>stax-utils</artifactId>
+ <version>${stax_utils_version}</version>
+ </dependency>
+
+
+ <!-- J2EE JARs -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>${geronimo_spec_jms_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ <version>${geronimo_spec_servlet_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <version>${geronimo_spec_jta_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+ <version>${geronimo_spec_j2ee_management_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <version>${geronimo_spec_j2ee_connector_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.0.2_spec</artifactId>
+ <version>${geronimo_spec_activation_version}</version>
+ </dependency>
+
+
+ <!-- for custom XML parsing -->
+ <dependency>
+ <groupId>org.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <version>${xbean_version}</version>
+ <url>http://www.xbean.org</url>
+ </dependency>
+ <dependency>
+ <groupId>annogen</groupId>
+ <artifactId>annogen</artifactId>
+ <version>${annogen_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>qdox</groupId>
+ <artifactId>qdox</artifactId>
+ <version>${qdox_version}</version>
+ </dependency>
+
+ <!-- JCA container and transaction manaqer -->
+ <dependency>
+ <id>jencks+all</id>
+ <version>${jencks_version}</version>
+ </dependency>
+
+ <dependency>
+ <id>lingo</id>
+ <version>${lingo_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xmlpublic</artifactId>
+ <version>${xmlbeans_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>${xmlbeans_version}</version>
+ </dependency>
+
+
+ <!-- default JMS provider used for implementation -->
+
+
+ <!-- for ActiveMQ 4.x -->
+ <dependency>
+ <groupId>incubator-activemq</groupId>
+ <artifactId>activemq</artifactId>
+ <version>${activemq_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>incubator-activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ <version>${activemq_version}</version>
+ </dependency>
+
+ <!-- For clustering services -->
+ <dependency>
+ <id>activecluster</id>
+ <version>${activecluster_version}</version>
+ </dependency>
+
+
+ <!-- for XStream component -->
+ <!-- optional jars for XStream marshalling -->
+ <dependency>
+ <id>xstream</id>
+ <version>${xstream_version}</version>
+ </dependency>
+
+ <!--
+ || Dependencies for running test cases
+ -->
+
+ <!-- for pooling JMS and other resources -->
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons_collections_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>${commons_pool_version}</version>
+ </dependency>
+
+ <!-- optional used for in-web container testing -->
+ <dependency>
+ <groupId>jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>${jetty_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler-jdt</artifactId>
+ <version>${jasper_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ <version>${jasper_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ <version>${jasper_version}</version>
+ </dependency>
+
+
+ <!-- default database for ActiveMQ -->
+ <!-- To create Pooled DataSources for the JDBC message store -->
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>${commons_dbcp_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby_version}</version>
+ </dependency>
+
+ <!-- JNDI provider for binary release -->
+ <dependency>
+ <groupId>simple-jndi</groupId>
+ <artifactId>simple-jndi</artifactId>
+ <version>${simple_jndi_version}</version>
+ </dependency>
+
+ <!-- for unit test cases -->
+ <dependency>
+ <id>junit</id>
+ <version>${junit_version}</version>
+ </dependency>
+
+ <!-- example database for testing -->
+ <dependency>
+ <id>hsqldb</id>
+ <version>${hsqldb_version}</version>
+ </dependency>
+ <dependency>
+ <id>axion</id>
+ <version>${axion_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-primitives</groupId>
+ <artifactId>commons-primitives</artifactId>
+ <version>${commons_primitives_version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>ddlutils</artifactId>
+ <version>${ddlutils_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons_lang_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-betwixt</groupId>
+ <artifactId>commons-betwixt</artifactId>
+ <version>${commons_betwixt_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>${commons_digester_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>${easymock_version}</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <unitTest>
+ <resources>
+ <resource>
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.x*</include>
+ <include>**/*.wsdl</include>
+ <include>**/*.zip</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/test/components</directory>
+ <includes>
+ <include>**/*.jar</include>
+ <include>**/*.x*</include>
+ <include>**/*.zip</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/test/assemblies</directory>
+ <includes>
+ <include>**/*.jar</include>
+ <include>**/*.zip</include>
+ </includes>
+ </resource>
+ </resources>
+ <includes>
+ <include>**/*Test.*</include>
+ </includes>
+ <excludes>
+ <!-- exclude abstract tests -->
+ <exclude>**/Abstract*Test.*</exclude>
+
+ <!-- fails on some platforms due to ActiveCluster issue -->
+ <exclude>**/ClusterFlow*.*</exclude>
+ <exclude>**/JmsFlow*.*</exclude>
+ <exclude>**/JcaFlowPersistentTest.*</exclude>
+ <exclude>**/JcaFlowTransactionTest.*</exclude>
+
+ <!-- test cases hangs
+ <exclude>**/SimpleClusterSendSyncTest.*</exclude>
+ -->
+
+ <!-- fails in some linux platform due to missing lib libXp.so.6 -->
+ <exclude>**/ServiceMixComponentTest.*</exclude>
+ <exclude>**/ExplodedComponentInstallationTest.*</exclude>
+ <exclude>**/ComponentInstallationTest.*</exclude>
+ <exclude>**/ComponentAssemblyInstallationTest.*</exclude>
+ <exclude>**/DeploymentTest.*</exclude>
+
+ <!-- Succeed in Eclipse, but fail with maven, why ?
+ This may be related to activemq jmx stuff
+ -->
+ <exclude>**/AdminServiceTest.*</exclude>
+ <exclude>**/ManagementAttributesTest.*</exclude>
+ <exclude>**/ManagementContextTest.*</exclude>
+
+ <!-- fail on non windows platform, why ? -->
+ <exclude>**/HotDeployTest.*</exclude>
+
+ </excludes>
+ </unitTest>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>target/generated</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </build>
+
+</project>
Modified: incubator/servicemix/trunk/servicemix-http/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/project.xml?rev=373823&r1=373822&r2=373823&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-http/project.xml Tue Jan 31 06:36:22 2006
@@ -95,8 +95,8 @@
</dependency>
<dependency>
<groupId>jetty</groupId>
- <artifactId>org.mortbay.jetty</artifactId>
- <version>${org.mortbay.jetty_version}</version>
+ <artifactId>jetty</artifactId>
+ <version>${jetty_version}</version>
<properties>
<jbi.bundle>true</jbi.bundle>
</properties>
Modified: incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpBridgeServlet.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpBridgeServlet.java?rev=373823&r1=373822&r2=373823&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpBridgeServlet.java (original)
+++ incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpBridgeServlet.java Tue Jan 31 06:36:22 2006
@@ -58,6 +58,8 @@
throw e;
} catch (ServletException e) {
throw e;
+ } catch (RuntimeException e) {
+ throw e;
} catch (Exception e) {
throw new ServletException("Failed to process request: " + e, e);
}
@@ -69,6 +71,8 @@
} catch (IOException e) {
throw e;
} catch (ServletException e) {
+ throw e;
+ } catch (RuntimeException e) {
throw e;
} catch (Exception e) {
throw new ServletException("Failed to process request: " + e, e);
Modified: incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpConfiguration.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpConfiguration.java?rev=373823&r1=373822&r2=373823&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpConfiguration.java (original)
+++ incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpConfiguration.java Tue Jan 31 06:36:22 2006
@@ -19,7 +19,14 @@
public class HttpConfiguration extends PersistentConfiguration implements HttpConfigurationMBean {
- private boolean streamingEnabled;
+ private boolean streamingEnabled = true;
+ private String jettyConnectorClassName = "org.mortbay.jetty.nio.SelectChannelConnector";
+
+ /**
+ * The maximum number of threads for the Jetty thread pool. It's set
+ * to 255 by default to match the default value in Jetty.
+ */
+ private int jettyThreadPoolSize = 255;
public boolean isStreamingEnabled() {
return streamingEnabled;
@@ -29,4 +36,21 @@
this.streamingEnabled = streamingEnabled;
save();
}
+
+ public String getJettyConnectorClassName() {
+ return jettyConnectorClassName;
+ }
+
+ public void setJettyConnectorClassName(String jettyConnectorClassName) {
+ this.jettyConnectorClassName = jettyConnectorClassName;
+ }
+
+ public int getJettyThreadPoolSize() {
+ return jettyThreadPoolSize;
+ }
+
+ public void setJettyThreadPoolSize(int jettyThreadPoolSize) {
+ this.jettyThreadPoolSize = jettyThreadPoolSize;
+ }
+
}
Modified: incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpConfigurationMBean.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpConfigurationMBean.java?rev=373823&r1=373822&r2=373823&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpConfigurationMBean.java (original)
+++ incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpConfigurationMBean.java Tue Jan 31 06:36:22 2006
@@ -20,4 +20,13 @@
public boolean isStreamingEnabled();
public void setStreamingEnabled(boolean streamingEnabled);
+
+ public String getJettyConnectorClassName();
+
+ public void setJettyConnectorClassName(String jettyConnectorClassName);
+
+ public int getJettyThreadPoolSize();
+
+ public void setJettyThreadPoolSize(int jettyThreadPoolSize);
+
}