You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2008/08/07 20:16:17 UTC
svn commit: r683669 - in /activemq/camel/trunk: ./ apache-camel/bundle/
camel-core/ components/camel-amqp/ components/camel-atom/
components/camel-cxf/ components/camel-jaxb/ components/camel-josql/
components/camel-msv/ components/camel-osgi/ componen...
Author: davsclaus
Date: Thu Aug 7 11:16:16 2008
New Revision: 683669
URL: http://svn.apache.org/viewvc?rev=683669&view=rev
Log:
CAMEL-789: Clean up in pom.xml regarding used maven repos. CAMEL-788: Fixed failing tests in camel-spring.
Modified:
activemq/camel/trunk/apache-camel/bundle/pom.xml
activemq/camel/trunk/camel-core/pom.xml
activemq/camel/trunk/components/camel-amqp/pom.xml
activemq/camel/trunk/components/camel-atom/pom.xml
activemq/camel/trunk/components/camel-cxf/pom.xml
activemq/camel/trunk/components/camel-jaxb/pom.xml
activemq/camel/trunk/components/camel-josql/pom.xml
activemq/camel/trunk/components/camel-msv/pom.xml
activemq/camel/trunk/components/camel-osgi/pom.xml
activemq/camel/trunk/components/camel-spring/pom.xml
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/file/SpringFileRouteTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/test/TestEndpointTest.java
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/test/TestEndpointTest-context.xml
activemq/camel/trunk/components/camel-uface/pom.xml
activemq/camel/trunk/pom.xml
Modified: activemq/camel/trunk/apache-camel/bundle/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/bundle/pom.xml?rev=683669&r1=683668&r2=683669&view=diff
==============================================================================
--- activemq/camel/trunk/apache-camel/bundle/pom.xml (original)
+++ activemq/camel/trunk/apache-camel/bundle/pom.xml Thu Aug 7 11:16:16 2008
@@ -39,6 +39,13 @@
<shade.version>1.0.1</shade.version>
</properties>
+ <repositories>
+ <repository>
+ <id>uface.m2</id>
+ <url>http://uface.googlecode.com/svn/maven/</url>
+ <name>UFace Maven Repository</name>
+ </repository>
+ </repositories>
<dependencies>
<dependency>
Modified: activemq/camel/trunk/camel-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/pom.xml?rev=683669&r1=683668&r2=683669&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/pom.xml (original)
+++ activemq/camel/trunk/camel-core/pom.xml Thu Aug 7 11:16:16 2008
@@ -41,6 +41,22 @@
</camel.osgi.export.pkg>
</properties>
+ <repositories>
+ <!-- for JAXB dependency -->
+ <repository>
+ <id>java.net</id>
+ <name>java.net Maven Repository</name>
+ <url>http://download.java.net/maven/1/</url>
+ <layout>legacy</layout>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
<dependencies>
<!-- required dependencies by camel-core -->
Modified: activemq/camel/trunk/components/camel-amqp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-amqp/pom.xml?rev=683669&r1=683668&r2=683669&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-amqp/pom.xml (original)
+++ activemq/camel/trunk/components/camel-amqp/pom.xml Thu Aug 7 11:16:16 2008
@@ -38,6 +38,14 @@
<qpid-version>1.0-incubating-M2.1</qpid-version>
</properties>
+ <repositories>
+ <repository>
+ <id>apache.incubating.releases</id>
+ <name>Apache Incubating Release Distribution Repository</name>
+ <url>http://people.apache.org/repo/m2-incubating-repository</url>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
Modified: activemq/camel/trunk/components/camel-atom/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-atom/pom.xml?rev=683669&r1=683668&r2=683669&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-atom/pom.xml (original)
+++ activemq/camel/trunk/components/camel-atom/pom.xml Thu Aug 7 11:16:16 2008
@@ -37,6 +37,14 @@
<camel.osgi.export.pkg>org.apache.camel.component.atom.*</camel.osgi.export.pkg>
</properties>
+ <repositories>
+ <repository>
+ <id>apache.incubating.releases</id>
+ <name>Apache Incubating Release Distribution Repository</name>
+ <url>http://people.apache.org/repo/m2-incubating-repository</url>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -88,3 +96,4 @@
</project>
+
Modified: activemq/camel/trunk/components/camel-cxf/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/pom.xml?rev=683669&r1=683668&r2=683669&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/pom.xml (original)
+++ activemq/camel/trunk/components/camel-cxf/pom.xml Thu Aug 7 11:16:16 2008
@@ -37,6 +37,17 @@
<camel.osgi.export.pkg>org.apache.camel.component.cxf.*</camel.osgi.export.pkg>
</properties>
+ <repositories>
+ <!-- for maven jaxb plugin -->
+ <repository>
+ <id>java.net</id>
+ <name>java.net Maven Repository</name>
+ <url>http://download.java.net/maven/1</url>
+ <!--<url>https://maven-repository.dev.java.net/nonav/repository</url>-->
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
Modified: activemq/camel/trunk/components/camel-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jaxb/pom.xml?rev=683669&r1=683668&r2=683669&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jaxb/pom.xml (original)
+++ activemq/camel/trunk/components/camel-jaxb/pom.xml Thu Aug 7 11:16:16 2008
@@ -37,6 +37,17 @@
<camel.osgi.export.pkg>org.apache.camel.converter.jaxb.*</camel.osgi.export.pkg>
</properties>
+ <repositories>
+ <!-- for maven jaxb plugin -->
+ <repository>
+ <id>java.net</id>
+ <name>java.net Maven Repository</name>
+ <url>http://download.java.net/maven/1</url>
+ <!--<url>https://maven-repository.dev.java.net/nonav/repository</url>-->
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
Modified: activemq/camel/trunk/components/camel-josql/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-josql/pom.xml?rev=683669&r1=683668&r2=683669&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-josql/pom.xml (original)
+++ activemq/camel/trunk/components/camel-josql/pom.xml Thu Aug 7 11:16:16 2008
@@ -37,6 +37,20 @@
<camel.osgi.export.pkg>org.apache.camel.builder.sql.*</camel.osgi.export.pkg>
</properties>
+ <repositories>
+ <repository>
+ <id>open.iona.m2</id>
+ <name>IONA Open Source Community Release Repository</name>
+ <url>http://repo.open.iona.com/maven2</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
Modified: activemq/camel/trunk/components/camel-msv/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-msv/pom.xml?rev=683669&r1=683668&r2=683669&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-msv/pom.xml (original)
+++ activemq/camel/trunk/components/camel-msv/pom.xml Thu Aug 7 11:16:16 2008
@@ -34,7 +34,7 @@
<description>Camel MSV support</description>
<properties>
- <camel.osgi.export.pkg>org.apache.camel.validator.msv.*</camel.osgi.export.pkg>
+ <camel.osgi.export.pkg>org.apache.camel.component.validator.msv.*</camel.osgi.export.pkg>
</properties>
<dependencies>
Modified: activemq/camel/trunk/components/camel-osgi/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-osgi/pom.xml?rev=683669&r1=683668&r2=683669&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-osgi/pom.xml (original)
+++ activemq/camel/trunk/components/camel-osgi/pom.xml Thu Aug 7 11:16:16 2008
@@ -95,6 +95,18 @@
<repositories>
<repository>
+ <id>java.net</id>
+ <name>java.net Maven Repository</name>
+ <url>http://download.java.net/maven/1/</url>
+ <layout>legacy</layout>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
<id>spring.osgi</id>
<url>http://static.springframework.org/maven2</url>
</repository>
Modified: activemq/camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/pom.xml?rev=683669&r1=683668&r2=683669&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/pom.xml (original)
+++ activemq/camel/trunk/components/camel-spring/pom.xml Thu Aug 7 11:16:16 2008
@@ -133,6 +133,17 @@
</repository>
</repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>open.iona.m2</id>
+ <name>IONA Open Source Community Release Repository</name>
+ <url>http://repo.open.iona.com/maven2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
+
<build>
<resources>
<resource>
Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/file/SpringFileRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/file/SpringFileRouteTest.java?rev=683669&r1=683668&r2=683669&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/file/SpringFileRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/file/SpringFileRouteTest.java Thu Aug 7 11:16:16 2008
@@ -49,7 +49,7 @@
result.expectedBodiesReceived(expectedBody);
result.setResultWaitTime(5000);
- template.sendBodyAndHeader(inputFile, expectedBody, "cheese", 123);
+ template.sendBodyAndHeader(inputFile, expectedBody, FileComponent.HEADER_FILE_NAME, "hello.txt");
result.assertIsSatisfied();
}
Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/test/TestEndpointTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/test/TestEndpointTest.java?rev=683669&r1=683668&r2=683669&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/test/TestEndpointTest.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/test/TestEndpointTest.java Thu Aug 7 11:16:16 2008
@@ -39,7 +39,7 @@
@Autowired
protected CamelContext camelContext;
- @EndpointInject(uri = "test:file://src/test/data?noop=true")
+ @EndpointInject(uri = "test:file://src/test/data?noop=true&consumer.recursive=true")
protected TestEndpoint endpoint;
public void testMocksAreValid() throws Exception {
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/test/TestEndpointTest-context.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/test/TestEndpointTest-context.xml?rev=683669&r1=683668&r2=683669&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/test/TestEndpointTest-context.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/test/TestEndpointTest-context.xml Thu Aug 7 11:16:16 2008
@@ -25,8 +25,8 @@
<!-- START SNIPPET: example -->
<camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="file://src/test/data?noop=true"/>
- <to uri="test:file://src/test/data?noop=true"/>
+ <from uri="file://src/test/data?noop=true&consumer.recursive=true"/>
+ <to uri="test:file://src/test/data?noop=true&consumer.recursive=true"/>
</route>
</camelContext>
<!-- END SNIPPET: example -->
Modified: activemq/camel/trunk/components/camel-uface/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-uface/pom.xml?rev=683669&r1=683668&r2=683669&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-uface/pom.xml (original)
+++ activemq/camel/trunk/components/camel-uface/pom.xml Thu Aug 7 11:16:16 2008
@@ -37,6 +37,14 @@
<camel.osgi.export.pkg>org.apache.camel.component.uface.*</camel.osgi.export.pkg>
</properties>
+ <repositories>
+ <repository>
+ <id>uface.m2</id>
+ <url>http://uface.googlecode.com/svn/maven/</url>
+ <name>UFace Maven Repository</name>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
Modified: activemq/camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=683669&r1=683668&r2=683669&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Thu Aug 7 11:16:16 2008
@@ -19,6 +19,11 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>4</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
@@ -122,96 +127,6 @@
</mailingList>
</mailingLists>
- <repositories>
- <repository>
- <id>repo1.maven</id>
- <name>Maven Central Repo</name>
- <url>http://repo1.maven.org/maven2/</url>
- </repository>
- <repository>
- <id>apache.incubating.releases</id>
- <name>Apache Incubating Release Distribution Repository</name>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Development Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>open.iona.m2</id>
- <name>IONA Open Source Community Dependency Repository</name>
- <url>http://repo.open.iona.com/maven2</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>uface.m2</id>
- <url>http://uface.googlecode.com/svn/maven/</url>
- <name>UFace Maven Repository</name>
- </repository>
- <!-- for latest jaxb jars -->
- <repository>
- <id>java.net</id>
- <name>java.net Maven Repository</name>
- <url>http://download.java.net/maven/1/</url>
- <layout>legacy</layout>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>apache.incubating.releases</id>
- <name>Apache Incubating Release Distribution Repository</name>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </pluginRepository>
- <pluginRepository>
- <id>apache.snapshots</id>
- <name>Apache Development Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- <pluginRepository>
- <id>maven2-repository.dev.java.net</id>
- <name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/2</url>
- </pluginRepository>
- <pluginRepository>
- <id>codehaus.repo</id>
- <name>Codehaus Repository</name>
- <url>http://repository.codehaus.org/</url>
- </pluginRepository>
- <pluginRepository>
- <id>open.iona.m2</id>
- <name>IONA Open Source Community Dependency Repository</name>
- <url>http://repo.open.iona.com/maven2</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
-
<distributionManagement>
<repository>
<id>apache.releases</id>