Author: gertv
Date: Thu Dec 24 20:55:09 2009
New Revision: 893811
URL: http://svn.apache.org/viewvc?rev=893811&view=rev
Log:
Update to latest version and make builds work on a clean repo again
Modified:
servicemix/smx3/trunk/common/servicemix-components/pom.xml
servicemix/smx3/trunk/platforms/geronimo/pom.xml
servicemix/smx3/trunk/platforms/geronimo/servicemix/pom.xml
servicemix/smx3/trunk/pom.xml
servicemix/smx3/trunk/samples/bridge-camel/bridge-camel-su/src/main/resources/camel-context.xml
servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/src/test/resources/integrationTest.xml
servicemix/smx3/trunk/samples/camel/camel-simple-su/src/main/resources/camel-context.xml
Modified: servicemix/smx3/trunk/common/servicemix-components/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/pom.xml?rev=893811&r1=893810&r2=893811&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/pom.xml (original)
+++ servicemix/smx3/trunk/common/servicemix-components/pom.xml Thu Dec 24
20:55:09 2009
@@ -64,7 +64,17 @@
</dependency>
<dependency>
<groupId>org.codehaus.xfire</groupId>
- <artifactId>xfire-all</artifactId>
+ <artifactId>xfire-aegis</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.xfire</groupId>
+ <artifactId>xfire-spring</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.xfire</groupId>
+ <artifactId>xfire-core</artifactId>
<optional>true</optional>
<exclusions>
<exclusion>
Modified: servicemix/smx3/trunk/platforms/geronimo/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/platforms/geronimo/pom.xml?rev=893811&r1=893810&r2=893811&view=diff
==============================================================================
--- servicemix/smx3/trunk/platforms/geronimo/pom.xml (original)
+++ servicemix/smx3/trunk/platforms/geronimo/pom.xml Thu Dec 24 20:55:09 2009
@@ -41,11 +41,11 @@
</properties>
<repositories>
- <repository>
- <id>geronimo-2.0.1-repo</id>
-
<url>http://svn.apache.org/repos/asf/geronimo/server/tags/2.0.1/repository</url>
- </repository>
- </repositories>
+ <repository>
+ <id>geronimo-2.0.1-repo</id>
+
<url>http://svn.apache.org/repos/asf/geronimo/server/tags/2.0.1/repository</url>
+ </repository>
+ </repositories>
<modules>
<module>servicemix-service</module>
@@ -55,4 +55,23 @@
<module>deployer</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <!-- make sure to exclude myfaces-api everywhere so we don't hit
maven-repository.dev.java.net -->
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jee-specs</artifactId>
+ <version>${geronimo-version}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
</project>
Modified: servicemix/smx3/trunk/platforms/geronimo/servicemix/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/platforms/geronimo/servicemix/pom.xml?rev=893811&r1=893810&r2=893811&view=diff
==============================================================================
--- servicemix/smx3/trunk/platforms/geronimo/servicemix/pom.xml (original)
+++ servicemix/smx3/trunk/platforms/geronimo/servicemix/pom.xml Thu Dec 24
20:55:09 2009
@@ -33,6 +33,26 @@
<dependencies>
+ <!-- BEGIN OF HACK (feel free to come up with anything better)
+ adding these two up-front to avoid having to hit
maven-repository.dev.java.net -->
+ <dependency>
+ <groupId>org.apache.myfaces.maven</groupId>
+ <artifactId>myfaces-master</artifactId>
+ <version>1.0.5</version>
+ <type>pom</type>
+ <scope>test</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>1.2.0</version>
+ <scope>test</scope>
+ <optional>true</optional>
+ </dependency>
+ <!-- END OF HACK -->
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
Modified: servicemix/smx3/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=893811&r1=893810&r2=893811&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Thu Dec 24 20:55:09 2009
@@ -51,34 +51,36 @@
<properties>
<servicemix-utils-version>1.2.0</servicemix-utils-version>
<servicemix-specs-version>1.1.0</servicemix-specs-version>
- <servicemix-common-version>2009.02-SNAPSHOT</servicemix-common-version>
- <servicemix-shared-version>2009.02-SNAPSHOT</servicemix-shared-version>
-
<servicemix-quartz-version>2009.02-SNAPSHOT</servicemix-quartz-version>
- <servicemix-jms-version>2009.02-SNAPSHOT</servicemix-jms-version>
- <servicemix-jsr181-version>2009.02-SNAPSHOT</servicemix-jsr181-version>
- <servicemix-http-version>2009.02-SNAPSHOT</servicemix-http-version>
- <servicemix-mail-version>2009.02-SNAPSHOT</servicemix-mail-version>
-
<servicemix-osworkflow-version>2009.02-SNAPSHOT</servicemix-osworkflow-version>
-
<servicemix-wsn2005-version>2009.02-SNAPSHOT</servicemix-wsn2005-version>
+ <servicemix-common-version>2009.02</servicemix-common-version>
+ <servicemix-shared-version>2009.02</servicemix-shared-version>
+ <servicemix-quartz-version>2009.02</servicemix-quartz-version>
+ <servicemix-jms-version>2009.02</servicemix-jms-version>
+ <servicemix-jsr181-version>2009.02</servicemix-jsr181-version>
+ <servicemix-http-version>2009.02</servicemix-http-version>
+ <servicemix-mail-version>2009.02</servicemix-mail-version>
+ <servicemix-osworkflow-version>2009.02</servicemix-osworkflow-version>
+ <servicemix-wsn2005-version>2009.02</servicemix-wsn2005-version>
<servicemix-lwcontainer-version>3.3.2-SNAPSHOT</servicemix-lwcontainer-version>
- <servicemix-bean-version>2009.02-SNAPSHOT</servicemix-bean-version>
- <servicemix-eip-version>2009.02-SNAPSHOT</servicemix-eip-version>
- <servicemix-script-version>2009.02-SNAPSHOT</servicemix-script-version>
-
<servicemix-scripting-version>2009.02-SNAPSHOT</servicemix-scripting-version>
-
<servicemix-validation-version>2009.02-SNAPSHOT</servicemix-validation-version>
- <servicemix-ftp-version>2009.02-SNAPSHOT</servicemix-ftp-version>
- <servicemix-xmpp-version>2009.02-SNAPSHOT</servicemix-xmpp-version>
- <servicemix-saxon-version>2009.02-SNAPSHOT</servicemix-saxon-version>
-
<servicemix-truezip-version>2009.02-SNAPSHOT</servicemix-truezip-version>
- <servicemix-camel-version>2009.02-SNAPSHOT</servicemix-camel-version>
- <servicemix-cxf-bc-version>2009.02-SNAPSHOT</servicemix-cxf-bc-version>
- <servicemix-cxf-se-version>2009.02-SNAPSHOT</servicemix-cxf-se-version>
+ <servicemix-bean-version>2009.02</servicemix-bean-version>
+ <servicemix-eip-version>2009.02</servicemix-eip-version>
+ <servicemix-script-version>2009.02</servicemix-script-version>
+ <servicemix-scripting-version>2009.02</servicemix-scripting-version>
+ <servicemix-validation-version>2009.02</servicemix-validation-version>
+ <servicemix-ftp-version>2009.02</servicemix-ftp-version>
+ <servicemix-xmpp-version>2009.02</servicemix-xmpp-version>
+ <servicemix-saxon-version>2009.02</servicemix-saxon-version>
+ <servicemix-truezip-version>2009.02</servicemix-truezip-version>
+ <servicemix-camel-version>2009.02</servicemix-camel-version>
+ <servicemix-cxf-bc-version>2009.02</servicemix-cxf-bc-version>
+ <servicemix-cxf-se-version>2009.02</servicemix-cxf-se-version>
<servicemix-drools-version>2009.01</servicemix-drools-version>
- <servicemix-file-version>2009.02-SNAPSHOT</servicemix-file-version>
- <servicemix-snmp-version>2009.02-SNAPSHOT</servicemix-snmp-version>
- <servicemix-smpp-version>2009.02-SNAPSHOT</servicemix-smpp-version>
- <servicemix-exec-version>2009.02-SNAPSHOT</servicemix-exec-version>
- <res-maven-plugin-version>4.0</res-maven-plugin-version>
+ <servicemix-file-version>2009.02</servicemix-file-version>
+ <servicemix-snmp-version>2009.02</servicemix-snmp-version>
+ <servicemix-smpp-version>2009.02</servicemix-smpp-version>
+ <servicemix-exec-version>2009.02</servicemix-exec-version>
+
+ <jbi-plugin-version>4.3-SNAPSHOT</jbi-plugin-version>
+ <res-maven-plugin-version>4.1</res-maven-plugin-version>
<servicemix-build-version>1.0</servicemix-build-version>
<xfire-jsr181-api-version>1.0-M1</xfire-jsr181-api-version>
@@ -1578,6 +1580,21 @@
<version>${xfire-version}</version>
</dependency>
<dependency>
+ <groupId>org.codehaus.xfire</groupId>
+ <artifactId>xfire-spring</artifactId>
+ <version>${xfire-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.xfire</groupId>
+ <artifactId>xfire-aegis</artifactId>
+ <version>${xfire-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.xfire</groupId>
+ <artifactId>xfire-core</artifactId>
+ <version>${xfire-version}</version>
+ </dependency>
+ <dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.04</version>
@@ -1794,7 +1811,7 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>jbi-maven-plugin</artifactId>
- <version>4.1</version>
+ <version>${jbi-plugin-version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
Modified:
servicemix/smx3/trunk/samples/bridge-camel/bridge-camel-su/src/main/resources/camel-context.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/bridge-camel/bridge-camel-su/src/main/resources/camel-context.xml?rev=893811&r1=893810&r2=893811&view=diff
==============================================================================
---
servicemix/smx3/trunk/samples/bridge-camel/bridge-camel-su/src/main/resources/camel-context.xml
(original)
+++
servicemix/smx3/trunk/samples/bridge-camel/bridge-camel-su/src/main/resources/camel-context.xml
Thu Dec 24 20:55:09 2009
@@ -21,10 +21,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+ http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://activemq.apache.org/camel/schema/spring";>
+ <camelContext xmlns="http://camel.apache.org/schema/spring";>
<route>
<!--You can find more info about the JBI endpont URI definitaion
from here http://camel.apache.org/jbi.html-->
<from
uri="jbi:endpoint:http://servicemix.apache.org/samples/bridge/pipeline/endpoint"/>
Modified:
servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/src/test/resources/integrationTest.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/src/test/resources/integrationTest.xml?rev=893811&r1=893810&r2=893811&view=diff
==============================================================================
---
servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/src/test/resources/integrationTest.xml
(original)
+++
servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/src/test/resources/integrationTest.xml
Thu Dec 24 20:55:09 2009
@@ -24,7 +24,7 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://servicemix.apache.org/config/1.0
http://repo1.maven.org/maven2/org/apache/servicemix/servicemix-core/3.1.2/servicemix-core-3.1.2.xsd
http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/activemq-core.xsd
- http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd";>
+ http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
<!-- Run a local ActiveMQ broker for testing -->
<broker xmlns="http://activemq.apache.org/schema/core";
brokerName="localhost" persistent="false">
@@ -55,7 +55,7 @@
||
|| http://activemq.apache.org/camel/enterprise-integration-patterns.html
-->
- <camelContext id="camel"
xmlns="http://activemq.apache.org/camel/schema/spring";>
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";>
<!-- You can use a <package> element for each root package to search for
Java routes -->
<package>org.foo.bar</package>
Modified:
servicemix/smx3/trunk/samples/camel/camel-simple-su/src/main/resources/camel-context.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/camel/camel-simple-su/src/main/resources/camel-context.xml?rev=893811&r1=893810&r2=893811&view=diff
==============================================================================
---
servicemix/smx3/trunk/samples/camel/camel-simple-su/src/main/resources/camel-context.xml
(original)
+++
servicemix/smx3/trunk/samples/camel/camel-simple-su/src/main/resources/camel-context.xml
Thu Dec 24 20:55:09 2009
@@ -21,10 +21,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+ http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://activemq.apache.org/camel/schema/spring";>
+ <camelContext xmlns="http://camel.apache.org/schema/spring";>
<package>org.apache.servicemix.samples</package>
</camelContext>
