Author: ningjiang
Date: Mon Dec 28 13:38:40 2009
New Revision: 894172
URL: http://svn.apache.org/viewvc?rev=894172&view=rev
Log:
Updated the karaf features artifact name
Modified:
camel/trunk/tests/camel-itest-karaf/pom.xml
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
camel/trunk/tests/camel-itest-osgi/pom.xml
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java
Modified: camel/trunk/tests/camel-itest-karaf/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/pom.xml?rev=894172&r1=894171&r2=894172&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/pom.xml (original)
+++ camel/trunk/tests/camel-itest-karaf/pom.xml Mon Dec 28 13:38:40 2009
@@ -79,7 +79,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.karaf</groupId>
- <artifactId>features</artifactId>
+ <artifactId>apache-camel</artifactId>
<version>${version}</version>
<type>pom</type>
<scope>test</scope>
Modified:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java?rev=894172&r1=894171&r2=894172&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
(original)
+++
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
Mon Dec 28 13:38:40 2009
@@ -158,7 +158,7 @@
org.ops4j.pax.exam.CoreOptions.systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
scanFeatures(mavenBundle().groupId("org.apache.camel.karaf").
-
artifactId("features").versionAsInProject().type("xml/features"),
+
artifactId("apache-camel").versionAsInProject().type("xml/features"),
"camel-osgi", "camel-" + feature),
//cleanCaches(),
Modified: camel/trunk/tests/camel-itest-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=894172&r1=894171&r2=894172&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/pom.xml (original)
+++ camel/trunk/tests/camel-itest-osgi/pom.xml Mon Dec 28 13:38:40 2009
@@ -79,7 +79,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.karaf</groupId>
- <artifactId>features</artifactId>
+ <artifactId>apache-camel</artifactId>
<version>${version}</version>
<type>pom</type>
<scope>test</scope>
@@ -99,6 +99,11 @@
<artifactId>camel-jpa</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-protobuf</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.camel.tests</groupId>
<artifactId>org.apache.camel.tests.mock-javamail_1.7</artifactId>
@@ -137,22 +142,36 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test.*</include>
- </includes>
- <excludes>
- <exclude>**/XXXTest.*</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <!-- generate dependencies versions -->
+ <plugin>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>depends-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-depends-file</id>
+ <goals>
+ <goal>generate-depends-file</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Test.*</include>
+ </includes>
+ <excludes>
+ <exclude>**/XXXTest.*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<id>ci-build-profile</id>
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java?rev=894172&r1=894171&r2=894172&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java
Mon Dec 28 13:38:40 2009
@@ -130,7 +130,7 @@
// using the features to install the camel components
scanFeatures(mavenBundle().groupId("org.apache.camel.karaf").
-
artifactId("features").versionAsInProject().type("xml/features"),
+
artifactId("apache-camel").versionAsInProject().type("xml/features"),
"camel-core", "camel-osgi", "camel-spring",
"camel-test"),
// using the java mail API bundle
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java?rev=894172&r1=894171&r2=894172&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
Mon Dec 28 13:38:40 2009
@@ -69,7 +69,7 @@
// using the features to install the camel components
scanFeatures(mavenBundle().groupId("org.apache.camel.karaf").
-
artifactId("features").versionAsInProject().type("xml/features"),
+
artifactId("apache-camel").versionAsInProject().type("xml/features"),
"camel-core", "camel-osgi", "camel-spring",
"camel-test"),
knopflerfish(), felix(), equinox());
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java?rev=894172&r1=894171&r2=894172&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java
Mon Dec 28 13:38:40 2009
@@ -74,7 +74,7 @@
// using the features to install the camel components
scanFeatures(mavenBundle().groupId("org.apache.camel.karaf").
-
artifactId("features").versionAsInProject().type("xml/features"),
+
artifactId("apache-camel").versionAsInProject().type("xml/features"),
"camel-core", "camel-spring-osgi", "camel-test",
"camel-jaxb"),
equinox().version("3.5.1"));
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java?rev=894172&r1=894171&r2=894172&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java
Mon Dec 28 13:38:40 2009
@@ -134,7 +134,7 @@
mavenBundle().groupId("net.sourceforge.serp").artifactId("com.springsource.serp").version("1.13.1"),
// using the features to install the camel components
scanFeatures(mavenBundle().groupId("org.apache.camel.karaf").
-
artifactId("features").versionAsInProject().type("xml/features"),
+
artifactId("apache-camel").versionAsInProject().type("xml/features"),
"camel-core", "camel-spring-osgi", "camel-test",
"camel-jpa"),
/* This the camel-jpa needed bundles
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java?rev=894172&r1=894171&r2=894172&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java
Mon Dec 28 13:38:40 2009
@@ -70,7 +70,7 @@
// using the features to install the camel components
scanFeatures(mavenBundle().groupId("org.apache.camel.karaf").
-
artifactId("features").versionAsInProject().type("xml/features"),
+
artifactId("apache-camel").versionAsInProject().type("xml/features"),
"camel-core", "camel-spring-osgi", "camel-test",
"camel-http", "camel-servlet"),
