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/08/01 01:51:26 UTC
svn commit: r427374 - in /incubator/servicemix/trunk: ./
apache-servicemix/src/main/release/conf/
apache-servicemix/src/main/release/conf/META-INF/ servicemix-console/
servicemix-web/
Author: gnodet
Date: Mon Jul 31 16:51:26 2006
New Revision: 427374
URL: http://svn.apache.org/viewvc?rev=427374&view=rev
Log:
Upgrade to jetty-6.0.0rc0, xbean-2.5 and spring-2.0-rc1
There is a problem using spring-2.0-rc2 with xbean-2.5, see XBEAN-30 (so wait until xbean-2.6)
And we must add the spring.handlers for activemq
Added:
incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/META-INF/
incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/META-INF/spring.handlers
Modified:
incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/activemq.xml
incubator/servicemix/trunk/pom.xml
incubator/servicemix/trunk/servicemix-console/pom.xml
incubator/servicemix/trunk/servicemix-web/pom.xml
Added: incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/META-INF/spring.handlers
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/META-INF/spring.handlers?rev=427374&view=auto
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/META-INF/spring.handlers (added)
+++ incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/META-INF/spring.handlers Mon Jul 31 16:51:26 2006
@@ -0,0 +1 @@
+http\://activemq.org/config/1.0=org.apache.xbean.spring.context.v2.XBeanNamespaceHandler
Modified: incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/activemq.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/activemq.xml?rev=427374&r1=427373&r2=427374&view=diff
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/activemq.xml (original)
+++ incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/activemq.xml Mon Jul 31 16:51:26 2006
@@ -4,7 +4,7 @@
<broker useJmx="true" xmlns="http://activemq.org/config/1.0">
<persistenceAdapter>
- <journaledJDBC journalLogFiles="5" dataDirectory="./data/amq"/>
+ <journaledJDBC journalLogFiles="5" dataDirectory="file:./data/amq"/>
<!-- To use a different datasource, use th following syntax : -->
<!--
<journaledJDBC journalLogFiles="5" dataDirectory="../data" dataSource="#postgres-ds"/>
Modified: incubator/servicemix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/pom.xml?rev=427374&r1=427373&r2=427374&view=diff
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Mon Jul 31 16:51:26 2006
@@ -1130,12 +1130,12 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.0.0beta17</version>
+ <version>6.0.0rc0</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-management</artifactId>
- <version>6.0.0beta17</version>
+ <version>6.0.0rc0</version>
</dependency>
<dependency>
<groupId>jgroups</groupId>
@@ -1311,7 +1311,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
- <version>2.0-m5</version>
+ <version>2.0-rc1</version>
<exclusions>
<exclusion>
<groupId>javax.mail</groupId>
@@ -1458,17 +1458,17 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-kernel</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-server</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<exclusions>
<exclusion>
<groupId>qdox</groupId>
@@ -1781,12 +1781,12 @@
<plugin>
<groupId>org.apache.xbean</groupId>
<artifactId>maven-xbean-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty6-plugin</artifactId>
- <version>6.0.0beta17</version>
+ <version>6.0.0rc0</version>
</plugin>
</plugins>
</pluginManagement>
@@ -1828,4 +1828,4 @@
</plugin>
</plugins>
</reporting>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/servicemix/trunk/servicemix-console/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-console/pom.xml?rev=427374&r1=427373&r2=427374&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-console/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-console/pom.xml Mon Jul 31 16:51:26 2006
@@ -102,7 +102,7 @@
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty6-plugin</artifactId>
+ <artifactId>maven-jetty-plugin</artifactId>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<webAppSourceDirectory>${basedir}/src/webapp</webAppSourceDirectory>
@@ -110,4 +110,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/servicemix/trunk/servicemix-web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-web/pom.xml?rev=427374&r1=427373&r2=427374&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-web/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-web/pom.xml Mon Jul 31 16:51:26 2006
@@ -96,7 +96,7 @@
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty6-plugin</artifactId>
+ <artifactId>maven-jetty-plugin</artifactId>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<webAppSourceDirectory>${basedir}/src/webapp</webAppSourceDirectory>
@@ -124,4 +124,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>