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 2011/10/25 10:59:59 UTC
svn commit: r1188578 - in
/camel/trunk/tooling/archetypes/camel-archetype-component/src/main:
resources-filtered/META-INF/maven/ resources/archetype-resources/
resources/archetype-resources/src/main/java/
resources/archetype-resources/src/main/resource...
Author: davsclaus
Date: Tue Oct 25 08:59:59 2011
New Revision: 1188578
URL: http://svn.apache.org/viewvc?rev=1188578&view=rev
Log:
CAMEL-4578: camel-archetype-component allows to specify component name. Thanks to Ioannis for the patch.
Added:
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Component.java (contents, props changed)
- copied, changed from r1188528, camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldComponent.java
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Consumer.java (contents, props changed)
- copied, changed from r1188528, camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldConsumer.java
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Endpoint.java (contents, props changed)
- copied, changed from r1188528, camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldEndpoint.java
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Producer.java (contents, props changed)
- copied, changed from r1188528, camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldProducer.java
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org/apache/camel/component/__scheme__
- copied, changed from r1188528, camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org/apache/camel/component/helloworld
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/java/__name__ComponentTest.java (contents, props changed)
- copied, changed from r1188528, camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/java/HelloWorldComponentTest.java
Removed:
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldComponent.java
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldConsumer.java
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldEndpoint.java
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldProducer.java
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org/apache/camel/component/helloworld
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/java/HelloWorldComponentTest.java
Modified:
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/ReadMe.txt
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/resources/log4j.properties
Modified: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml?rev=1188578&r1=1188577&r2=1188578&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml Tue Oct 25 08:59:59 2011
@@ -21,6 +21,12 @@
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<requiredProperties>
+ <requiredProperty key="name">
+ <defaultValue>HelloWorld</defaultValue>
+ </requiredProperty>
+ <requiredProperty key="scheme">
+ <defaultValue>helloworld</defaultValue>
+ </requiredProperty>
<requiredProperty key="camel-version">
<defaultValue>${project.version}</defaultValue>
</requiredProperty>
Modified: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/ReadMe.txt
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/ReadMe.txt?rev=1188578&r1=1188577&r2=1188578&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/ReadMe.txt (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/ReadMe.txt Tue Oct 25 08:59:59 2011
@@ -1,11 +1,11 @@
Camel Component Project
====================
This Project is a template of the Camel component.
-When you create the component project, you need to move the META-INF/services/org/apache/camel/component/helloworld
+When you create the component project, you need to move the META-INF/services/org/apache/camel/component/${name}
file to META-INF/services/org/apache/camel/component/foo where "foo" is the URI scheme for your component and any
related endpoints created on the fly.
For more help see the Apache Camel documentation
- http://cwiki.apache.org/CAMEL/writing-components.html
+ http://camel.apache.org/writing-components.html
Copied: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Component.java (from r1188528, camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldComponent.java)
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Component.java?p2=camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Component.java&p1=camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldComponent.java&r1=1188528&r2=1188578&rev=1188578&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldComponent.java (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Component.java Tue Oct 25 08:59:59 2011
@@ -22,12 +22,12 @@ import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
/**
- * Represents the component that manages {@link HelloWorldEndpoint}.
+ * Represents the component that manages {@link ${name}Endpoint}.
*/
-public class HelloWorldComponent extends DefaultComponent {
+public class ${name}Component extends DefaultComponent {
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- Endpoint endpoint = new HelloWorldEndpoint(uri, this);
+ Endpoint endpoint = new ${name}Endpoint(uri, this);
setProperties(endpoint, parameters);
return endpoint;
}
Propchange: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Component.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Component.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Consumer.java (from r1188528, camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldConsumer.java)
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Consumer.java?p2=camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Consumer.java&p1=camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldConsumer.java&r1=1188528&r2=1188578&rev=1188578&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldConsumer.java (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Consumer.java Tue Oct 25 08:59:59 2011
@@ -23,12 +23,12 @@ import org.apache.camel.Processor;
import org.apache.camel.impl.ScheduledPollConsumer;
/**
- * The HelloWorld consumer.
+ * The ${name} consumer.
*/
-public class HelloWorldConsumer extends ScheduledPollConsumer {
- private final HelloWorldEndpoint endpoint;
+public class ${name}Consumer extends ScheduledPollConsumer {
+ private final ${name}Endpoint endpoint;
- public HelloWorldConsumer(HelloWorldEndpoint endpoint, Processor processor) {
+ public ${name}Consumer(${name}Endpoint endpoint, Processor processor) {
super(endpoint, processor);
this.endpoint = endpoint;
}
Propchange: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Consumer.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Endpoint.java (from r1188528, camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldEndpoint.java)
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Endpoint.java?p2=camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Endpoint.java&p1=camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldEndpoint.java&r1=1188528&r2=1188578&rev=1188578&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldEndpoint.java (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Endpoint.java Tue Oct 25 08:59:59 2011
@@ -16,36 +16,33 @@
*/
package ${package};
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.impl.DefaultConsumer;
import org.apache.camel.impl.DefaultEndpoint;
/**
- * Represents a HelloWorld endpoint.
+ * Represents a ${name} endpoint.
*/
-public class HelloWorldEndpoint extends DefaultEndpoint {
- public HelloWorldEndpoint() {
+public class ${name}Endpoint extends DefaultEndpoint {
+
+ public ${name}Endpoint() {
}
- public HelloWorldEndpoint(String uri, HelloWorldComponent component) {
+ public ${name}Endpoint(String uri, ${name}Component component) {
super(uri, component);
}
- public HelloWorldEndpoint(String endpointUri) {
+ public ${name}Endpoint(String endpointUri) {
super(endpointUri);
}
public Producer createProducer() throws Exception {
- return new HelloWorldProducer(this);
+ return new ${name}Producer(this);
}
public Consumer createConsumer(Processor processor) throws Exception {
- return new HelloWorldConsumer(this, processor);
+ return new ${name}Consumer(this, processor);
}
public boolean isSingleton() {
Propchange: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Endpoint.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Endpoint.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Producer.java (from r1188528, camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldProducer.java)
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Producer.java?p2=camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Producer.java&p1=camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldProducer.java&r1=1188528&r2=1188578&rev=1188578&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/HelloWorldProducer.java (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Producer.java Tue Oct 25 08:59:59 2011
@@ -17,19 +17,18 @@
package ${package};
import org.apache.camel.Exchange;
-import org.apache.camel.impl.DefaultConsumer;
import org.apache.camel.impl.DefaultProducer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * The HelloWorld producer.
+ * The ${name} producer.
*/
-public class HelloWorldProducer extends DefaultProducer {
- private static final transient Logger LOG = LoggerFactory.getLogger(HelloWorldProducer.class);
- private HelloWorldEndpoint endpoint;
+public class ${name}Producer extends DefaultProducer {
+ private static final transient Logger LOG = LoggerFactory.getLogger(${name}Producer.class);
+ private ${name}Endpoint endpoint;
- public HelloWorldProducer(HelloWorldEndpoint endpoint) {
+ public ${name}Producer(${name}Endpoint endpoint) {
super(endpoint);
this.endpoint = endpoint;
}
Propchange: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Producer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Producer.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org/apache/camel/component/__scheme__ (from r1188528, camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org/apache/camel/component/helloworld)
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org/apache/camel/component/__scheme__?p2=camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org/apache/camel/component/__scheme__&p1=camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org/apache/camel/component/helloworld&r1=1188528&r2=1188578&rev=1188578&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org/apache/camel/component/helloworld (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org/apache/camel/component/__scheme__ Tue Oct 25 08:59:59 2011
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=${package}.HelloWorldComponent
+class=${package}.${name}Component
Modified: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/resources/log4j.properties?rev=1188578&r1=1188577&r2=1188578&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/resources/log4j.properties (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/resources/log4j.properties Tue Oct 25 08:59:59 2011
@@ -23,12 +23,6 @@ log4j.rootLogger=INFO, out
# uncomment the following line to turn on Camel debugging
#log4j.logger.org.apache.camel=DEBUG
-# uncomment the following line to turn on ActiveMQ debugging
-#log4j.logger.org.apache.activemq=DEBUG
-
-log4j.logger.org.springframework=WARN
-
-
# CONSOLE appender not used by default
log4j.appender.out=org.apache.log4j.ConsoleAppender
log4j.appender.out.layout=org.apache.log4j.PatternLayout
Copied: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/java/__name__ComponentTest.java (from r1188528, camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/java/HelloWorldComponentTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/java/__name__ComponentTest.java?p2=camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/java/__name__ComponentTest.java&p1=camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/java/HelloWorldComponentTest.java&r1=1188528&r2=1188578&rev=1188578&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/java/HelloWorldComponentTest.java (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/java/__name__ComponentTest.java Tue Oct 25 08:59:59 2011
@@ -21,10 +21,10 @@ import org.apache.camel.component.mock.M
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-public class HelloWorldComponentTest extends CamelTestSupport {
+public class ${name}ComponentTest extends CamelTestSupport {
@Test
- public void testTimerInvokesBeanMethod() throws Exception {
+ public void test${name}() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
@@ -35,9 +35,9 @@ public class HelloWorldComponentTest ext
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() {
- from("helloworld://foo") // will send a message every 500ms
- .to("helloworld://bar") // prints message to stdout
- .to("mock:result"); // to actually test that a message arrives
+ from("${scheme}://foo")
+ .to("${scheme}://bar")
+ .to("mock:result");
}
};
}
Propchange: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/java/__name__ComponentTest.java
------------------------------------------------------------------------------
svn:eol-style = native