Author: davsclaus
Date: Wed Jan 30 12:05:40 2013
New Revision: 1440363
URL: http://svn.apache.org/viewvc?rev=1440363&view=rev
Log:
CAMEL-6023: Added a variant of the blueprint package scan test.
Added:
camel/branches/camel-2.10.x/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintPackageScan2Test.java
- copied unchanged from r1440328,
camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintPackageScan2Test.java
camel/branches/camel-2.10.x/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/scan2/
- copied from r1440328,
camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/scan2/
camel/branches/camel-2.10.x/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/packagescan2.xml
- copied unchanged from r1440328,
camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/packagescan2.xml
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/scan/MyCoolRoute.java
camel/branches/camel-2.10.x/components/camel-test-blueprint/src/test/resources/log4j.properties
camel/branches/camel-2.10.x/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/packagescan.xml
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1440328
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/scan/MyCoolRoute.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/scan/MyCoolRoute.java?rev=1440363&r1=1440362&r2=1440363&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/scan/MyCoolRoute.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/scan/MyCoolRoute.java
Wed Jan 30 12:05:40 2013
@@ -16,8 +16,6 @@
*/
package org.apache.camel.test.blueprint.scan;
-import org.apache.camel.Endpoint;
-import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
/**
@@ -25,11 +23,8 @@ import org.apache.camel.builder.RouteBui
*/
public class MyCoolRoute extends RouteBuilder {
- @EndpointInject(ref = "foo")
- private Endpoint foo;
-
@Override
public void configure() throws Exception {
- from(foo).to("mock:a");
+ from("direct:start").to("mock:a");
}
}
Modified:
camel/branches/camel-2.10.x/components/camel-test-blueprint/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-test-blueprint/src/test/resources/log4j.properties?rev=1440363&r1=1440362&r2=1440363&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-test-blueprint/src/test/resources/log4j.properties
(original)
+++
camel/branches/camel-2.10.x/components/camel-test-blueprint/src/test/resources/log4j.properties
Wed Jan 30 12:05:40 2013
@@ -24,6 +24,7 @@ log4j.rootLogger=INFO, file
#log4j.logger.org.apache.camel.test.blueprint=DEBUG
#log4j.logger.org.apache.camel=DEBUG
#log4j.logger.org.apache.camel.blueprint=TRACE
+#log4j.logger.org.apache.camel.core.osgi=TRACE
# CONSOLE appender not used by default
log4j.appender.out=org.apache.log4j.ConsoleAppender
Modified:
camel/branches/camel-2.10.x/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/packagescan.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/packagescan.xml?rev=1440363&r1=1440362&r2=1440363&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/packagescan.xml
(original)
+++
camel/branches/camel-2.10.x/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/packagescan.xml
Wed Jan 30 12:05:40 2013
@@ -24,8 +24,6 @@
<packageScan>
<package>org.apache.camel.test.blueprint.scan</package>
</packageScan>
-
- <endpoint id="foo" uri="direct:start"/>
</camelContext>
</blueprint>
