- Revision
- 1069
- Author
- bsnyder
- Date
- 2006-05-02 02:26:28 -0400 (Tue, 02 May 2006)
Log Message
Update everything to Apache ActiveMQ 4.0 and Apache ServiceMix 3.0.
Modified Paths
- trunk/etc/project.properties
- trunk/etc/project.xml
- trunk/tooling/jboss-deployer/project.xml
- trunk/tooling/jboss-deployer/src/main/java/org/servicemix/jboss/deployment/JBIService.java
- trunk/tooling/servicemix-web/project.xml
- trunk/tooling/servicemix-web/src/main/java/org/servicemix/components/HelloWorldComponent.java
- trunk/tooling/servicemix-web/src/main/java/org/servicemix/web/jmx/ManagementContext.java
Diff
Modified: trunk/etc/project.properties (1068 => 1069)
--- trunk/etc/project.properties 2006-01-25 11:50:43 UTC (rev 1068) +++ trunk/etc/project.properties 2006-05-02 06:26:28 UTC (rev 1069) @@ -68,18 +68,17 @@ # dependency versions # --------------------------------------------------------------------# http://activecluster.codehaus.org/, ASL 2activecluster_version=1.1-SNAPSHOT # http://activeio.codehaus.org/, part of AMQ, ASL 2-activeio_version=2.1+activeio_version=3.0-beta1 # http://activemq.codehaus.org/, ASL 2-activemq_version=4.0-M2+activemq_version=4.0-SNAPSHOT # http://activesoap.codehaus.org/, ASL 2-activesoap_version=1.0-SNAPSHOT+activesoap_version=1.0-20050615.083700 # http://annogen.codehaus.org/, ASL 2 annogen_version=0.1.0 # http://ant.apache.org/, ASL 2-ant_version=1.6+ant_version=1.6.5 # http://www.antlr.org/license.html (used in Geronimo) antlr_version=2.7.5 # http://directory.apache.org/subprojects/apacheds/, ASL 2 @@ -93,7 +92,7 @@ # http://backport175.codehaus.org/, ASL 2 backport175_version=1.0.RC1 # http://www.mathcs.emory.edu/dcl/util/backport-util-concurrent/, public domain-backport_util_concurrent_version=2.0_01_pd+backport_util_concurrent_version=2.1 # http://beehive.apache.org/, ASL 2 beehive_wsm_version=1.0-alpha # http://castor.codehaus.org/, ASL 2 (> 0.9.7, see http://castor.codehaus.org/license.html) (used in Geronimo) @@ -101,7 +100,7 @@ # http://cglib.sourceforge.net/, ASL 2 cglib_version=2.1_3 cglib_full_version=2.0-# http://classworlds.codehaus.org/, http://classworlds.codehaus.org/license.html+# http://classworlds.codehaus.org/, http://classworlds.codehaus.org/license.html - BSD classworlds_version = 1.0.1 # http://jakarta.apache.org/commons/, ASL 2 commons_attributes_version=2.1 @@ -113,71 +112,71 @@ commons_digester_version=1.7 commons_discovery_version=0.2 commons_el_version = 1.0-commons_httpclient_version=3.0-rc2+commons_fileupload_version=1.1 +commons_httpclient_version=3.0 commons_io_version=1.0-commons_jelly_tags_velocity_version=SNAPSHOT -commons_jelly_tags_xml_version=1.1 -commons_jelly_tags_util_version=1.1.1 -commons_jelly_tags_interaction_version=1.0 -commons_lang_version=2.0+commons_lang_version=2.1 commons_logging_version=1.0.4-commons_net_version=1.4.0+commons_net_version=1.4.1 commons_pool_version=1.2 commons_primitives_version=1.0 commons_vfs_version=20050307052300 # http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html, public domain (used in Geronimo) concurrent_version=1.3.4 # http://db.apache.org/ddlutils/, ASL 2-ddlutils_version=1.0-dev+ddlutils_version=1.0-20060223 # http://db.apache.org/derby/, ASL 2 derby_version=10.1.1.0 derbynet_version=10.1.1.0-# http://drools.org/, http://drools.org/The+License+# http://drools.org/, http://drools.org/The+License - BSD drools_core_version=2.1 drools_version=2.1-# http://howl.objectweb.org/, http://howl.objectweb.org/license.html (used in Geronimo)+# http://howl.objectweb.org/, http://howl.objectweb.org/license.html (used in Geronimo) - BSD howl_logger_version=0.1.8 # http://www.easymock.org/, http://www.easymock.org/License.html, MIT easymock_version=1.2_Java1.3 +# Repository in http://ibiblio.org/maven/ +eclipse_emf_version=2.2.0-I200602160000 +eclipse_xsd_version=2.2.0-I200602160000 # http://geronimo.apache.org/, ASL 2-geronimo_kernel_version=1.0-SNAPSHOT -geronimo_system_version=1.0-SNAPSHOT -geronimo_remoting_version=1.0-SNAPSHOT -geronimo_network_version=1.0-SNAPSHOT -geronimo_common_version=1.0-SNAPSHOT -geronimo_connector_version=1.0-SNAPSHOT -geronimo_core_version=1.0-SNAPSHOT -geronimo_deployment_version=1.0-SNAPSHOT -geronimo_deployment_plugin_version=1.0-SNAPSHOT -geronimo_j2ee_version=1.0-SNAPSHOT -geronimo_security_version=1.0-SNAPSHOT -geronimo_spec_activation_version=1.0.2-rc4 -geronimo_spec_ejb_version=2.1-rc4 -geronimo_spec_j2ee_management_version=1.0-rc4 -geronimo_spec_j2ee_jacc_version=1.0-rc4 -geronimo_spec_j2ee_jaxrpc_version=1.1-rc4 -geronimo_spec_j2ee_connector_version=1.5-rc4 -geronimo_spec_j2ee_version=1.4-rc4 -geronimo_spec_javamail_version=1.3.1-rc5 -geronimo_spec_jms_version=1.1-rc4 -geronimo_spec_jta_version=1.0.1B-rc4 -geronimo_spec_jsp_version=2.0-rc4 -geronimo_spec_servlet_version=2.4-rc4 -geronimo_transaction_version=1.0-SNAPSHOT -geronimo_version=1.0-SNAPSHOT -# http://groovy.codehaus.org/, http://groovy.codehaus.org/license.html -groovy_version=1.0-jsr-03+geronimo_kernel_version=1.0 +geronimo_system_version=1.0 +geronimo_remoting_version=1.0 +geronimo_network_version=1.0 +geronimo_common_version=1.0 +geronimo_connector_version=1.0 +geronimo_core_version=1.0 +geronimo_deployment_version=1.0 +geronimo_deployment_plugin_version=1.0.0 +geronimo_j2ee_version=1.0 +geronimo_security_version=1.0 +geronimo_spec_activation_version=1.0 +geronimo_spec_ejb_version=1.0 +geronimo_spec_j2ee_management_version=1.0 +geronimo_spec_j2ee_jacc_version=1.0 +geronimo_spec_j2ee_jaxrpc_version=1.0 +geronimo_spec_j2ee_connector_version=1.0 +geronimo_spec_j2ee_version=1.0 +geronimo_spec_javamail_version=1.1-20060323 +geronimo_spec_jms_version=1.0 +geronimo_spec_jta_version=1.0 +geronimo_spec_jsp_version=1.0 +geronimo_spec_servlet_version=1.0 +geronimo_transaction_version=1.0 +geronimo_version=1.0 +# http://groovy.codehaus.org/, http://groovy.codehaus.org/license.html - BSD +groovy_version=04 # http://httpunit.sourceforge.net/, http://httpunit.sourceforge.net/doc/license.html httpunit_version=1.6-# http://hsqldb.org/, http://hsqldb.org/web/hsqlLicense.html (used in Geronimo)+# http://hsqldb.org/, http://hsqldb.org/web/hsqlLicense.html (used in Geronimo) - BSD hsqldb_version=1.7.3.3 # http://www.janino.net/, http://www.janino.net/javadoc/org/codehaus/janino/doc-files/new_bsd_license.txt janino_version=2.3.2 # (used in Geronimo) jasper_version = 5.5.9-# ? -jaxb_version=20051114 -# http://jaxen.org/, http://jaxen.org/license.html+# CDDL +jaxb_version=2.0-JAXWS-2.0-EA3 +# http://jaxen.org/, http://jaxen.org/license.html - BSD jaxen_version=1.1-beta-8 # SM build jaxp_version=1.3 @@ -194,26 +193,25 @@ # http://www.junit.org/, CPL (used everywhere) junit_version=3.8.1 # http://lingo.codehaus.org/, ASL 2-lingo_version=1.1+lingo_version=1.0 # http://logging.apache.org/log4j/docs/, ASL 2 log4j_version=1.2.12 # http://lucene.apache.org/java/, ASL 2 lucene_version=1.4.3 # http://mule.codehaus.org/, http://mule.codehaus.org/License mule_version=1.0 +# MSV http://msv.dev.java.net +msv_xsdlib_version = 20030807 # http://mx4j.sourceforge.net/, (Used in Geronimo)-mx4j_version=2.1.1 -mx4j_remote_version=2.1.1+mx4j_version=3.0.1 +mx4j_remote_version=3.0.1 mx4j_tools_version=2.1.1-# oracle -oracle_ojdbc14_jar=ojdbc14.jar -oracle_oraclexsql_jar=oraclexsql.jar -oracle_xmlparserv2_jar=xmlparserv2.jar -oracle_xsu12_jar=xsu12.jar -# http://openejb.codehaus.org/, (Used in Geronimo) -openejb_core_version=2.0-SNAPSHOT+# http://openejb.codehaus.org/, (Used in Geronimo) - BSD +openejb_core_version=2.0 # http://jetty.mortbay.org/, ASL 2-org.mortbay.jetty_version=5.1.6+org.mortbay.jetty_version=6.0.0beta10 +# http://incubator.apache.org/ode +ode_bpe_version=1.0-20060316 # http://jakarta.apache.org/oro/, ASL 2 oro_version=2.0.8 # http://portals.apache.org/pluto/, ASL 2 @@ -223,13 +221,17 @@ # http://qdox.codehaus.org/, http://qdox.codehaus.org/license.html, ASL style qdox_version=1.5 # http://www.opensymphony.com/quartz/, ASL 2-quartz_version=1.4.5+quartz_version=1.5.1 # http://jakarta.apache.org/regexp/, ASL 2 regexp_version=1.3 # https://rome.dev.java.net/, ASL 2 rome_version=0.5 # ?-saaj_version=20050915+saaj_version=20051127 +# servlet api +servlet_api_version=2.4 +# http://www.slf4j.org/license.html +slf4j_jcl_version=1.0-rc5 # http://www.osjava.org/simple-jndi/, http://www.osjava.org/simple-jndi/license.html simple_jndi_version=0.11.1 # ? @@ -242,36 +244,30 @@ stax_api_version=1.0 # https://stax-utils.dev.java.net/, BSD license stax_utils_version=snapshot-20040917 +# http://incubator.apache.org/tuscany, ASL 2 +tuscany_version=20060317 # http://woodstox.codehaus.org/, ? woodstox_version=2.0.3 # http://sourceforge.net/projects/wsdl4j, CPL (Used in Geronimo)-wsdl4j_version=1.5.1+wsdl4j_version=1.5.2 # http://ws.apache.org/wsif/, ASL 2 wsif_version=2.0.1_IB3 # http://xml.apache.org/xalan-j/, ASL 2 xalan_version=2.7.0 # http://xerces.apache.org/xerces-j/, ASL 2-xerces_version=2.6.2+xerces_version=2.2.1 xercesImpl_version=2.7.1 # http://www.xbean.org/, ASL 2-xbean_version=2.1-SNAPSHOT -# http://xfire.codehaus.org/, http://xfire.codehaus.org/License -xfire_version=1.0-20051129.225317 -xfire_jaxws_version=1.0-20051130.145319 -#xfire_version=1.0-SNAPSHOT -#xfire_jaxws_version=1.0-SNAPSHOT -# from ws-commons ? -xfire_xmlschema_version=20051110+xbean_version=2.1 +# http://xfire.codehaus.org/, http://xfire.codehaus.org/License - BSD +xfire_version=1.0 # ? xml_apis_version=1.3.02 # http://xmlbeans.apache.org/, ASL 2 xmlbeans_version=2.0.0 +# http://ws.apache.org/commons/XmlSchema/, ASL 2 +xmlschema_version=1.0 # http://xstream.codehaus.org/, http://xstream.codehaus.org/license.html, BSD, (Used in Geronimo) xstream_version=1.1.2-# codehaus ?+#BSD yom_version=1.0-alpha-2- - - - -
Modified: trunk/etc/project.xml (1068 => 1069)
--- trunk/etc/project.xml 2006-01-25 11:50:43 UTC (rev 1068) +++ trunk/etc/project.xml 2006-05-02 06:26:28 UTC (rev 1069) @@ -5,7 +5,7 @@ <name>ServiceMix</name> <id>servicemix</id> <groupId>servicemix</groupId>- <currentVersion>2.1-SNAPSHOT</currentVersion>+ <currentVersion>3.0-SNAPSHOT</currentVersion> <organization> <name>LogicBlaze, Inc.</name>
Modified: trunk/tooling/jboss-deployer/project.xml (1068 => 1069)
--- trunk/tooling/jboss-deployer/project.xml 2006-01-25 11:50:43 UTC (rev 1068) +++ trunk/tooling/jboss-deployer/project.xml 2006-05-02 06:26:28 UTC (rev 1069) @@ -1,251 +1,253 @@ <?xml version="1.0" encoding="UTF-8"?> <project>- <pomVersion>3</pomVersion>+ <pomVersion>3</pomVersion> <extend>${basedir}/../../etc/project.xml</extend>- <name>ServiceMix JBoss Deployer</name> - <id>jboss-deployer</id>+ <name>ServiceMix JBoss Deployer</name> + <id>jboss-deployer</id>- <inceptionYear>2005</inceptionYear>+ <inceptionYear>2005</inceptionYear>- <shortDescription> - JBoss compatible deployer that allows your to hot-deploy JBI - packages to a ServiceMix container. - </shortDescription>+ <shortDescription> + JBoss compatible deployer that allows your to hot-deploy JBI + packages to a ServiceMix container. + </shortDescription>- <description> - JBoss compatible deployer that allows your to hot-deploy JBI - packages to a ServiceMix container. - </description>+ <description> + JBoss compatible deployer that allows your to hot-deploy JBI + packages to a ServiceMix container. + </description>- <developers> - <developer> - <name>Philip Dodds</name> - <id>pdodds</id> - <email>[EMAIL PROTECTED]</email> - <organization>Unity Systems</organization> - </developer> - </developers>+ <developers> + <developer> + <name>Philip Dodds</name> + <id>pdodds</id> + <email>[EMAIL PROTECTED]</email> + <organization>Unity Systems</organization> + </developer> + </developers>- <contributors></contributors>+ <contributors></contributors>- <dependencies>+ <dependencies>- <!-- JBoss 4.0.2 libs --> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-system</artifactId> - <version>4.0.2</version> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - <version>4.0.2</version> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common</artifactId> - <version>4.0.2</version> - </dependency>+ <!-- JBoss 4.0.2 libs --> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-system</artifactId> + <version>4.0.2</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-jmx</artifactId> + <version>4.0.2</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-common</artifactId> + <version>4.0.2</version> + </dependency>- <!-- JCA container and transaction manaqer --> - <dependency> - <id>jencks+all</id> - <version>${jencks_version}</version> - <properties> - <lib>true</lib> - <sar.bundle>true</sar.bundle> - </properties> - </dependency>+ <!-- JCA container and transaction manaqer --> + <dependency> + <id>jencks+all</id> + <version>${jencks_version}</version> + <properties> + <lib>true</lib> + <sar.bundle>true</sar.bundle> + </properties> + </dependency>- <!-- Required to support XDoclet gen --> - <dependency> - <id>xjavadoc</id> - <groupId>xdoclet</groupId> - <artifactId>maven-xdoclet-plugin</artifactId> - <version>1.2</version> - <type>plugin</type> - <url>http://xdoclet.sf.net</url> - </dependency> - <dependency> - <id>xjavadoc</id> - <groupId>xdoclet</groupId> - <artifactId>xjavadoc</artifactId> - <version>1.0.3</version> - <type>jar</type> - <url>http://xdoclet.sf.net</url> - </dependency> - <dependency> - <id>xdoclet</id> - <groupId>xdoclet</groupId> - <artifactId>xdoclet</artifactId> - <version>1.2</version> - <type>jar</type> - <url>http://xdoclet.sf.net</url> - </dependency> - <dependency> - <groupId>xdoclet</groupId> - <artifactId>xdoclet-jmx-module</artifactId> - <version>1.2</version> - <type>jar</type> - <url>http://xdoclet.sourceforge.net</url> - </dependency>+ <!-- Required to support XDoclet gen --> + <dependency> + <id>xjavadoc</id> + <groupId>xdoclet</groupId> + <artifactId>maven-xdoclet-plugin</artifactId> + <version>1.2</version> + <type>plugin</type> + <url>http://xdoclet.sf.net</url> + </dependency> + <dependency> + <id>xjavadoc</id> + <groupId>xdoclet</groupId> + <artifactId>xjavadoc</artifactId> + <version>1.0.3</version> + <type>jar</type> + <url>http://xdoclet.sf.net</url> + </dependency> + <dependency> + <id>xdoclet</id> + <groupId>xdoclet</groupId> + <artifactId>xdoclet</artifactId> + <version>1.2</version> + <type>jar</type> + <url>http://xdoclet.sf.net</url> + </dependency> + <dependency> + <groupId>xdoclet</groupId> + <artifactId>xdoclet-jmx-module</artifactId> + <version>1.2</version> + <type>jar</type> + <url>http://xdoclet.sourceforge.net</url> + </dependency>- <!-- Pulled over from ServiceMix --> - <dependency> - <id>servicemix+jbi</id> - <version>${pom.currentVersion}</version> - <properties> - <sar.bundle>true</sar.bundle> - </properties> - </dependency>+ <!-- Pulled over from ServiceMix --> + <dependency> + <groupId>incubator-servicemix</groupId> + <artifactId>servicemix-jbi</artifactId> + <version>${pom.currentVersion}</version> + <properties> + <sar.bundle>true</sar.bundle> + </properties> + </dependency>- <dependency> - <id>servicemix+core</id> - <version>${pom.currentVersion}</version> - <properties> - <sar.bundle>true</sar.bundle> - </properties> - </dependency>+ <dependency> + <groupId>incubator-servicemix</groupId> + <id>servicemix-core</id> + <version>${pom.currentVersion}</version> + <properties> + <sar.bundle>true</sar.bundle> + </properties> + </dependency>- <dependency> - <id>concurrent</id> - <version>${concurrent_version}</version> - <properties> - <lib>true</lib> - <sar.bundle>true</sar.bundle> - </properties> - </dependency>+ <dependency> + <id>concurrent</id> + <version>${concurrent_version}</version> + <properties> + <lib>true</lib> + <sar.bundle>true</sar.bundle> + </properties> + </dependency>- <dependency> - <id>backport-util-concurrent</id> - <version>${backport_util_concurrent_version}</version> - <properties> - <lib>true</lib> - <sar.bundle>true</sar.bundle> - </properties> - </dependency>+ <dependency> + <id>backport-util-concurrent</id> + <version>${backport_util_concurrent_version}</version> + <properties> + <lib>true</lib> + <sar.bundle>true</sar.bundle> + </properties> + </dependency>- <dependency> - <id>wsdl4j</id> - <version>${wsdl4j_version}</version> - <properties> - <optional>true</optional> - <sar.bundle>true</sar.bundle> - </properties> - </dependency>+ <dependency> + <id>wsdl4j</id> + <version>${wsdl4j_version}</version> + <properties> + <optional>true</optional> + <sar.bundle>true</sar.bundle> + </properties> + </dependency>- <dependency> - <id>commons-beanutils</id> - <version>${commons_beanutils_version}</version> - <properties> - <lib>true</lib> - <sar.bundle>true</sar.bundle> - </properties> - </dependency>+ <dependency> + <id>commons-beanutils</id> + <version>${commons_beanutils_version}</version> + <properties> + <lib>true</lib> + <sar.bundle>true</sar.bundle> + </properties> + </dependency>- <dependency> - <id>xml-apis</id> - <version>${xml_apis_version}</version> - <properties> - <lib>true</lib> - <sar.bundle>true</sar.bundle> - </properties> - </dependency>+ <dependency> + <id>xml-apis</id> + <version>${xml_apis_version}</version> + <properties> + <lib>true</lib> + <sar.bundle>true</sar.bundle> + </properties> + </dependency>- <dependency> - <id>stax+api</id> - <version>${stax_api_version}</version> - <properties> - <lib>true</lib> - <sar.bundle>true</sar.bundle> - </properties> - </dependency>+ <dependency> + <id>stax+api</id> + <version>${stax_api_version}</version> + <properties> + <lib>true</lib> + <sar.bundle>true</sar.bundle> + </properties> + </dependency>- <dependency> - <id>jaxen</id> - <version>${jaxen_version}</version> - <properties> - <optional>true</optional> - <sar.bundle>true</sar.bundle> - </properties> - </dependency>+ <dependency> + <id>jaxen</id> + <version>${jaxen_version}</version> + <properties> + <optional>true</optional> + <sar.bundle>true</sar.bundle> + </properties> + </dependency>- <!-- for spring integration --> - <dependency> - <groupId>springframework</groupId> - <artifactId>spring</artifactId> - <version>${spring_version}</version> - <properties> - <lib>true</lib> - <sar.bundle>true</sar.bundle> - <sar.bundle>true</sar.bundle> - </properties> - </dependency>+ <!-- for spring integration --> + <dependency> + <groupId>springframework</groupId> + <artifactId>spring</artifactId> + <version>${spring_version}</version> + <properties> + <lib>true</lib> + <sar.bundle>true</sar.bundle> + <sar.bundle>true</sar.bundle> + </properties> + </dependency>- <!-- utility library for adapting StAX to SAX and JAXP Source --> - <dependency> - <id>stax-utils</id> - <version>${stax_utils_version}</version> - <properties> - <lib>true</lib> - </properties> - </dependency>+ <!-- utility library for adapting StAX to SAX and JAXP Source --> + <dependency> + <id>stax-utils</id> + <version>${stax_utils_version}</version> + <properties> + <lib>true</lib> + </properties> + </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> - <sar.bundle>true</sar.bundle> - </properties> - </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>+ <!-- for custom XML parsing --> + <dependency> + <groupId>org.xbean</groupId> + <artifactId>xbean-spring</artifactId> + <version>${xbean_version}</version> + <url>http://www.xbean.org</url> + <properties> + <sar.bundle>true</sar.bundle> + </properties> + </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>- <!-- for ActiveMQ 3.x --> - <dependency> - <id>activemq</id> - <version>${activemq_version}</version> - <properties> - <lib>true</lib> - <sar.bundle>true</sar.bundle> - </properties> - </dependency> - <dependency> - <id>activemq+ra</id> - <version>${activemq_version}</version> - <properties> - <lib>true</lib> - <sar.bundle>true</sar.bundle> - </properties> - </dependency>+ <!-- for ActiveMQ 3.x --> + <dependency> + <id>activemq</id> + <version>${activemq_version}</version> + <properties> + <lib>true</lib> + <sar.bundle>true</sar.bundle> + </properties> + </dependency> + <dependency> + <id>activemq+ra</id> + <version>${activemq_version}</version> + <properties> + <lib>true</lib> + <sar.bundle>true</sar.bundle> + </properties> + </dependency>- <!-- For clustering services --> - <dependency> - <id>activecluster</id> - <version>${activecluster_version}</version> - <properties> - <optional>true</optional> - <sar.bundle>true</sar.bundle> - </properties> - </dependency> - </dependencies>+ <!-- For clustering services --> + <dependency> + <id>activecluster</id> + <version>${activecluster_version}</version> + <properties> + <optional>true</optional> + <sar.bundle>true</sar.bundle> + </properties> + </dependency> + </dependencies>- <build> - <sourceDirectory>src/main/java</sourceDirectory> - <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory> - </build>+ <build> + <sourceDirectory>src/main/java</sourceDirectory> + <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory> + </build> </project>
Modified: trunk/tooling/jboss-deployer/src/main/java/org/servicemix/jboss/deployment/JBIService.java (1068 => 1069)
--- trunk/tooling/jboss-deployer/src/main/java/org/servicemix/jboss/deployment/JBIService.java 2006-01-25 11:50:43 UTC (rev 1068) +++ trunk/tooling/jboss-deployer/src/main/java/org/servicemix/jboss/deployment/JBIService.java 2006-05-02 06:26:28 UTC (rev 1069) @@ -19,6 +19,7 @@ import java.io.File; import java.util.Arrays; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -28,8 +29,11 @@ import javax.naming.InitialContext; import org.jboss.system.ServiceMBeanSupport;-import org.servicemix.jbi.config.spring.XBeanProcessor; -import org.servicemix.jbi.container.JBIContainer;+import org.apache.servicemix.jbi.config.spring.XBeanProcessor; +import org.apache.servicemix.jbi.container.JBIContainer; +import org.apache.servicemix.jbi.deployment.Descriptor; +import org.apache.servicemix.jbi.deployment.DescriptorFactory; +import org.apache.servicemix.jbi.framework.AutoDeploymentService; import org.xbean.spring.context.ClassPathXmlApplicationContext; /** @@ -131,12 +135,12 @@ */ public void uninstallArchive(String archive) { try {- jbiContainer.removeArchive(archive);+ jbiContainer.getAutoDeploymentService().removeArchive( + jbiContainer.getAutoDeploymentService().updateExternalArchive(archive,false)); } catch (DeploymentException e) {- throw new RuntimeException( - "ServiceMix JBIContainer unable to uninstall archive [" - + archive + "]", e); - }+ // TODO Auto-generated catch block + e.printStackTrace(); + } } /**
Modified: trunk/tooling/servicemix-web/project.xml (1068 => 1069)
--- trunk/tooling/servicemix-web/project.xml 2006-01-25 11:50:43 UTC (rev 1068) +++ trunk/tooling/servicemix-web/project.xml 2006-05-02 06:26:28 UTC (rev 1069) @@ -27,15 +27,16 @@ <dependencies> <dependency>- <groupId>geronimo-spec</groupId> - <artifactId>geronimo-spec-servlet</artifactId>+ <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-servlet_2.4_spec</artifactId> <version>${geronimo_spec_servlet_version}</version> <properties> <war.bundle>false</war.bundle> </properties> </dependency> <dependency>- <id>geronimo-spec+jms</id>+ <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_1.1_spec</artifactId> <version>${geronimo_spec_jms_version}</version> <properties> <war.bundle>true</war.bundle> @@ -43,7 +44,7 @@ </dependency> <dependency>- <groupId>activemq</groupId>+ <groupId>incubator-activemq</groupId> <artifactId>activemq</artifactId> <version>${activemq_version}</version> <properties> @@ -51,14 +52,15 @@ </properties> </dependency> <dependency>- <id>activemq+ra</id>+ <groupId>incubator-activemq</groupId> + <artifactId>activemq-ra</artifactId> <version>${activemq_version}</version> <properties> <war.bundle>true</war.bundle> </properties> </dependency> <dependency>- <groupId>activemq</groupId>+ <groupId>incubator-activemq</groupId> <artifactId>activemq-web</artifactId> <version>${activemq_version}</version> <properties> @@ -66,7 +68,7 @@ </properties> </dependency> <dependency>- <groupId>servicemix</groupId>+ <groupId>incubator-servicemix</groupId> <artifactId>servicemix</artifactId> <version>${pom.currentVersion}</version> <properties> @@ -83,8 +85,8 @@ </dependency> <dependency>- <groupId>jetty</groupId> - <artifactId>org.mortbay.jetty</artifactId>+ <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> <version>${org.mortbay.jetty_version}</version> <properties> <war.bundle>false</war.bundle>
Modified: trunk/tooling/servicemix-web/src/main/java/org/servicemix/components/HelloWorldComponent.java (1068 => 1069)
--- trunk/tooling/servicemix-web/src/main/java/org/servicemix/components/HelloWorldComponent.java 2006-01-25 11:50:43 UTC (rev 1068) +++ trunk/tooling/servicemix-web/src/main/java/org/servicemix/components/HelloWorldComponent.java 2006-05-02 06:26:28 UTC (rev 1069) @@ -1,7 +1,7 @@ package org.servicemix.components;-import org.servicemix.components.util.TransformComponentSupport; -import org.servicemix.jbi.jaxp.StringSource;+import org.apache.servicemix.components.util.TransformComponentSupport; +import org.apache.servicemix.jbi.jaxp.StringSource; import javax.jbi.messaging.MessageExchange; import javax.jbi.messaging.MessagingException;
Modified: trunk/tooling/servicemix-web/src/main/java/org/servicemix/web/jmx/ManagementContext.java (1068 => 1069)
--- trunk/tooling/servicemix-web/src/main/java/org/servicemix/web/jmx/ManagementContext.java 2006-01-25 11:50:43 UTC (rev 1068) +++ trunk/tooling/servicemix-web/src/main/java/org/servicemix/web/jmx/ManagementContext.java 2006-05-02 06:26:28 UTC (rev 1069) @@ -17,7 +17,7 @@ **/ package org.servicemix.web.jmx;-import org.activemq.service.Service;+import org.apache.activemq.service.Service; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;
