You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/08/17 13:45:44 UTC
svn commit: r804944 - in /camel/trunk:
components/camel-servlet/src/test/resources/org/apache/camel/component/servlet/
examples/camel-example-reportincident/src/test/java/org/apache/camel/example/reportincident/
platforms/karaf/features/ platforms/kara...
Author: ningjiang
Date: Mon Aug 17 11:45:43 2009
New Revision: 804944
URL: http://svn.apache.org/viewvc?rev=804944&view=rev
Log:
Updated the features.xml for javax.mail bundle
Modified:
camel/trunk/components/camel-servlet/src/test/resources/org/apache/camel/component/servlet/web-spring.xml
camel/trunk/examples/camel-example-reportincident/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesOSGiTest.java
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
camel/trunk/tests/camel-itest-osgi/pom.xml
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java
Modified: camel/trunk/components/camel-servlet/src/test/resources/org/apache/camel/component/servlet/web-spring.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/src/test/resources/org/apache/camel/component/servlet/web-spring.xml?rev=804944&r1=804943&r2=804944&view=diff
==============================================================================
--- camel/trunk/components/camel-servlet/src/test/resources/org/apache/camel/component/servlet/web-spring.xml (original)
+++ camel/trunk/components/camel-servlet/src/test/resources/org/apache/camel/component/servlet/web-spring.xml Mon Aug 17 11:45:43 2009
@@ -35,6 +35,7 @@
<param-name>matchOnUriPrefix</param-name>
<param-value>true</param-value>
</init-param>
+ <!-- set the camel context application file location here -->
<init-param>
<param-name>contextConfigLocation</param-name>
<param-value>/org/apache/camel/component/servlet/camelContext.xml</param-value>
Modified: camel/trunk/examples/camel-example-reportincident/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesOSGiTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesOSGiTest.java?rev=804944&r1=804943&r2=804944&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-reportincident/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesOSGiTest.java (original)
+++ camel/trunk/examples/camel-example-reportincident/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesOSGiTest.java Mon Aug 17 11:45:43 2009
@@ -77,8 +77,6 @@
@Configuration
public static Option[] configure() {
Option[] options = options(
- // install log service using pax runners profile abstraction (there are more profiles, like DS)
- logProfile().version("1.3.0"),
// install the spring dm profile
profile("spring.dm").version("1.2.0"),
// this is how you set the default log level when using pax logging (logProfile)
@@ -88,11 +86,13 @@
// using the features to install the camel components
scanFeatures(mavenBundle().groupId("org.apache.camel.karaf").
artifactId("features").versionAsInProject().type("xml/features"),
- "camel-core", "camel-osgi", "camel-spring", "camel-test", "camel-velocity", "camel-cxf", "camel-mail"),
+ "camel-core", "camel-osgi", "camel-spring", "camel-test", "camel-velocity", "camel-cxf"),
// Added the mock_java_mail bundle for testing
mavenBundle().groupId("org.apache.camel.tests").artifactId("org.apache.camel.tests.mock-javamail_1.7").versionAsInProject(),
+ mavenBundle().groupId("org.apache.camel").artifactId("camel-mail").versionAsInProject(),
+
// create a customer bundle start up the report incident bundle
bundle(newBundle().addClass(InputReportIncident.class)
.addClass(ObjectFactory.class)
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=804944&r1=804943&r2=804944&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Mon Aug 17 11:45:43 2009
@@ -54,7 +54,6 @@
<geronimo-el-version>1.0.1</geronimo-el-version>
<geronimo-jaxws-spec-version>1.0</geronimo-jaxws-spec-version>
<geronimo-jsp-version>1.0.1</geronimo-jsp-version>
- <geronimo-javamail-1.4-version>1.6_1</geronimo-javamail-1.4-version>
<geronimo-ws-metadata-spec-version>1.1.2</geronimo-ws-metadata-spec-version>
<gernimo-annotation-spec-version>1.1.1</gernimo-annotation-spec-version>
<hamcrest-bundle-version>1.2-dev1_1</hamcrest-bundle-version>
@@ -88,7 +87,9 @@
<servicemix-specs-version>1.3.0</servicemix-specs-version>
<servlet-api-2.5-version>2.5-20081211</servlet-api-2.5-version>
<smack-bundle-version>3.0.4_1</smack-bundle-version>
- <spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
+ <spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
+ <spring-javax-activation-version>1.1.1</spring-javax-activation-version>
+ <spring-javax-mail-version>1.4.1</spring-javax-mail-version>
<stringtemplate-bundle-version>3.2_1</stringtemplate-bundle-version>
<tagsoup-bundle-version>1.2_1</tagsoup-bundle-version>
<velocity-bundle-version>1.6.2_1</velocity-bundle-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=804944&r1=804943&r2=804944&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Mon Aug 17 11:45:43 2009
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<features>
<feature name='camel-core' version='${pom.version}'>
- <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}</bundle>
+ <bundle>mvn:javax.activation/com.springsource.javax.activation/${spring-javax-activation-version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-bundle-version}</bundle>
@@ -54,7 +54,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity-bundle-version}</bundle>
<bundle>mvn:org.apache.ws.commons.axiom/axiom-impl/${axiom-version}</bundle>
<bundle>mvn:org.apache.ws.commons.axiom/axiom-api/${axiom-version}</bundle>
- <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.javamail-api-1.4/${servicemix-specs-version}</bundle>
+ <bundle>mvn:javax.mail/com.springsource.javax.mail/${spring-javax-mail-version}</bundle>
<bundle>mvn:org.apache.neethi/neethi/${neethi-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jaxws_2.1_spec/${geronimo-jaxws-spec-version}</bundle>
@@ -309,8 +309,7 @@
<feature name='camel-mail' version='${pom.version}'>
<bundle>mvn:org.springframework/spring-context/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-context-support/${spring-version}</bundle>
- <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.javamail-api-1.4/${servicemix-specs-version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.geronimo-javamail_1.4_provider/${geronimo-javamail-1.4-version}</bundle>
+ <bundle>mvn:javax.mail/com.springsource.javax.mail/${spring-javax-mail-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-mail/${pom.version}</bundle>
</feature>
@@ -337,10 +336,6 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
<bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
- <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
- <bundle>mvn:org.mortbay.jetty/servlet-api/${servlet-api-2.5-version}</bundle>
- <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.javamail-api-1.4/${servicemix-specs-version}</bundle>
- <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-quartz/${pom.version}</bundle>
Modified: camel/trunk/tests/camel-itest-osgi/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=804944&r1=804943&r2=804944&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/pom.xml (original)
+++ camel/trunk/tests/camel-itest-osgi/pom.xml Mon Aug 17 11:45:43 2009
@@ -140,7 +140,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-mail</artifactId>
<scope>test</scope>
</dependency>
<dependency>
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=804944&r1=804943&r2=804944&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 Aug 17 11:45:43 2009
@@ -106,10 +106,10 @@
from("pop3://route-test-james@localhost?consumer.delay=1000")
.to("direct:a");
- // must use fixed to option to send the mail to the given reciever, as we have polled
+ // must use fixed to option to send the mail to the given receiver, as we have polled
// a mail from a mailbox where it already has the 'old' To as header value
- // here we send the mail to 2 recievers. notice we can use a plain string with semi colon
- // to seperate the mail addresses
+ // here we send the mail to 2 receivers. notice we can use a plain string with semi colon
+ // to separate the mail addresses
from("direct:a")
.setHeader("to", constant("route-test-result@localhost; route-test-copy@localhost"))
.to("smtp://localhost");
@@ -124,7 +124,7 @@
public static Option[] configure() {
Option[] options = options(
// install log service using pax runners profile abstraction (there are more profiles, like DS)
- logProfile().version("1.3.0"),
+ //logProfile().version("1.3.0"),
// install the spring dm profile
profile("spring.dm").version("1.2.0"),
// this is how you set the default log level when using pax logging (logProfile)
@@ -133,11 +133,16 @@
// using the features to install the camel components
scanFeatures(mavenBundle().groupId("org.apache.camel.karaf").
artifactId("features").versionAsInProject().type("xml/features"),
- "camel-core", "camel-osgi", "camel-spring", "camel-test", "camel-mail"),
+ "camel-core", "camel-osgi", "camel-spring", "camel-test"),
+
+ // using the java mail API bundle
+ mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.javamail-api-1.4").version("1.3.0"),
+
+ mavenBundle().groupId("org.apache.camel").artifactId("camel-mail").versionAsInProject(),
// Added the mock_java_mail bundle for testing
- mavenBundle().groupId("org.apache.camel.tests").artifactId("org.apache.camel.tests.mock-javamail_1.7").versionAsInProject(),
-
+ mavenBundle().groupId("org.apache.camel.tests").artifactId("org.apache.camel.tests.mock-javamail_1.7").versionAsInProject(),
+
felix());
return options;