[jboss-svn-commits] JBL Code SVN: r32928 - in labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product: rosetta/src/org/jboss/soa/esb/listeners/lifecycle and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon May 17 16:23:51 EDT 2010
Author: dward
Date: 2010-05-17 16:23:50 -0400 (Mon, 17 May 2010)
New Revision: 32928
Modified:
labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/rosetta/src/org/jboss/soa/esb/camel/CamelContextContainer.java
labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/rosetta/src/org/jboss/soa/esb/camel/DefaultCamelContextFactory.java
labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/rosetta/src/org/jboss/soa/esb/camel/JBossESBComponent.java
labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/rosetta/src/org/jboss/soa/esb/camel/JBossESBProcessor.java
labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/AbstractManagedLifecycle.java
labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/samples/quickstarts/helloworld_camel/build.xml
labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/samples/quickstarts/helloworld_camel/jboss-esb.xml
labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/samples/quickstarts/helloworld_camel/readme.txt
labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/samples/quickstarts/helloworld_camel/src/org/jboss/soa/esb/samples/quickstart/helloworld_camel/HelloWorldRouteBuilder.java
Log:
get things cleaned up nice
Modified: labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/rosetta/src/org/jboss/soa/esb/camel/CamelContextContainer.java
===================================================================
--- labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/rosetta/src/org/jboss/soa/esb/camel/CamelContextContainer.java 2010-05-17 19:52:07 UTC (rev 32927)
+++ labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/rosetta/src/org/jboss/soa/esb/camel/CamelContextContainer.java 2010-05-17 20:23:50 UTC (rev 32928)
@@ -19,11 +19,14 @@
*/
package org.jboss.soa.esb.camel;
+import javax.management.ObjectName;
+
import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
import org.jboss.soa.esb.ConfigurationException;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.listeners.lifecycle.AbstractManagedLifecycle;
+import org.jboss.soa.esb.listeners.lifecycle.LifecycleController;
import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleException;
import org.jboss.soa.esb.util.ClassUtil;
@@ -47,6 +50,18 @@
{
super(camelContextConfig);
}
+
+ @Override
+ protected void initLifecycleController()
+ {
+ lifecycleController = new LifecycleController(new LifecycleControllerAdapter()) {
+ @Override
+ protected ObjectName getObjectName() {
+ // this stops duplicate registration
+ return null;
+ }
+ };
+ }
@SuppressWarnings("unchecked")
@Override
Modified: labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/rosetta/src/org/jboss/soa/esb/camel/DefaultCamelContextFactory.java
===================================================================
--- labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/rosetta/src/org/jboss/soa/esb/camel/DefaultCamelContextFactory.java 2010-05-17 19:52:07 UTC (rev 32927)
+++ labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/rosetta/src/org/jboss/soa/esb/camel/DefaultCamelContextFactory.java 2010-05-17 20:23:50 UTC (rev 32928)
@@ -21,6 +21,7 @@
import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.impl.SimpleRegistry;
/**
* DefaultCamelContextFactory.
@@ -32,7 +33,9 @@
public CamelContext createCamelContext() throws Exception
{
- return new DefaultCamelContext();
+ CamelContext camelContext = new DefaultCamelContext(new SimpleRegistry());
+ camelContext.disableJMX();
+ return camelContext;
}
}
Modified: labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/rosetta/src/org/jboss/soa/esb/camel/JBossESBComponent.java
===================================================================
--- labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/rosetta/src/org/jboss/soa/esb/camel/JBossESBComponent.java 2010-05-17 19:52:07 UTC (rev 32927)
+++ labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/rosetta/src/org/jboss/soa/esb/camel/JBossESBComponent.java 2010-05-17 20:23:50 UTC (rev 32928)
@@ -45,12 +45,12 @@
protected Endpoint createEndpoint(String uri, String command, Map<String, Object> parameters) throws Exception
{
JBossESBProcessor processor;
- if (SERVICE.equals(command))
+ if (SERVICE.equalsIgnoreCase(command))
{
String category = getAndRemoveParameter(parameters, CATEGORY, String.class);
String name = getAndRemoveParameter(parameters, NAME, String.class);
- boolean async = getAndRemoveParameter(parameters, ASYNC, Boolean.class, Boolean.FALSE);
- long timeout = getAndRemoveParameter(parameters, TIMEOUT, Long.class, 10000l);
+ boolean async = getAndRemoveParameter(parameters, ASYNC, Boolean.class, Boolean.TRUE);
+ long timeout = getAndRemoveParameter(parameters, TIMEOUT, Long.class, 30000L);
processor = new ServiceProcessor(new Service(category, name), async, timeout);
}
else
Modified: labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/rosetta/src/org/jboss/soa/esb/camel/JBossESBProcessor.java
===================================================================
--- labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/rosetta/src/org/jboss/soa/esb/camel/JBossESBProcessor.java 2010-05-17 19:52:07 UTC (rev 32927)
+++ labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/rosetta/src/org/jboss/soa/esb/camel/JBossESBProcessor.java 2010-05-17 20:23:50 UTC (rev 32928)
@@ -24,9 +24,7 @@
import org.apache.camel.Processor;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.Properties;
-import org.jboss.soa.esb.message.body.content.BytesBody;
import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.message.format.MessageType;
/**
* JBossESBProcessor.
@@ -38,7 +36,7 @@
protected Message convert(org.apache.camel.Message camelMessage)
{
- Message esbMessage = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
+ Message esbMessage = MessageFactory.getInstance().getMessage();
// camel headers --> esb properties
Properties properties = esbMessage.getProperties();
@@ -70,8 +68,11 @@
}
// body
- byte[] body = (byte[])esbMessage.getBody().get(BytesBody.BYTES_LOCATION);
- camelMessage.setBody(body != null ? new String(body) : null);
+ Object body = esbMessage.getBody().get();
+ if (body != null)
+ {
+ camelMessage.setBody(body);
+ }
return camelMessage;
}
Modified: labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/AbstractManagedLifecycle.java
===================================================================
--- labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/AbstractManagedLifecycle.java 2010-05-17 19:52:07 UTC (rev 32927)
+++ labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/AbstractManagedLifecycle.java 2010-05-17 20:23:50 UTC (rev 32928)
@@ -80,7 +80,7 @@
/**
* Lifecycle controller for this lifecycle.
*/
- private LifecycleController lifecycleController;
+ protected LifecycleController lifecycleController;
/**
* Construct the managed lifecycle.
@@ -111,9 +111,14 @@
this.config = config;
- lifecycleController = new LifecycleController(new LifecycleControllerAdapter());
+ initLifecycleController();
}
+ protected void initLifecycleController()
+ {
+ lifecycleController = new LifecycleController(new LifecycleControllerAdapter());
+ }
+
/**
* Initialise the managed instance.
* <p/>
@@ -488,8 +493,10 @@
return config;
}
- private final class LifecycleControllerAdapter implements ManagedLifecycleAdapter
+ protected final class LifecycleControllerAdapter implements ManagedLifecycleAdapter
{
+ public LifecycleControllerAdapter() {}
+
/**
* Start the managed instance.
* <p/>
Modified: labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/samples/quickstarts/helloworld_camel/build.xml
===================================================================
--- labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/samples/quickstarts/helloworld_camel/build.xml 2010-05-17 19:52:07 UTC (rev 32927)
+++ labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/samples/quickstarts/helloworld_camel/build.xml 2010-05-17 20:23:50 UTC (rev 32928)
@@ -8,15 +8,9 @@
<!-- Import the base Ant build script... -->
<import file="../conf/base-build.xml"/>
- <target name="runtest" depends="compile"
- description="">
- <echo>Runs Test</echo>
- <!--
- <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.helloworld.test.SendJMSMessage" failonerror="true">
- <arg value="Hello World"/>
- <classpath refid="exec-classpath"/>
- </java>
- -->
+ <target name="runtest" depends="compile" description="Runs test">
+ <echo message="Hello ${user.name}!"
+ file="${java.io.tmpdir}/helloworld_camel/test.txt"/>
</target>
</project>
Modified: labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/samples/quickstarts/helloworld_camel/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/samples/quickstarts/helloworld_camel/jboss-esb.xml 2010-05-17 19:52:07 UTC (rev 32927)
+++ labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/samples/quickstarts/helloworld_camel/jboss-esb.xml 2010-05-17 20:23:50 UTC (rev 32928)
@@ -10,9 +10,7 @@
<services>
<service category="helloworld_camel" name="service1" description="Hello World" invmScope="GLOBAL">
<actions mep="OneWay">
- <action name="action1" class="org.jboss.soa.esb.actions.SystemPrintln">
- <property name="message" value="Hello World"/>
- </action>
+ <action name="action1" class="org.jboss.soa.esb.actions.SystemPrintln"/>
</actions>
</service>
</services>
Modified: labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/samples/quickstarts/helloworld_camel/readme.txt
===================================================================
--- labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/samples/quickstarts/helloworld_camel/readme.txt 2010-05-17 19:52:07 UTC (rev 32927)
+++ labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/samples/quickstarts/helloworld_camel/readme.txt 2010-05-17 20:23:50 UTC (rev 32928)
@@ -1,8 +1,7 @@
Overview:
=========
- The purpose of the helloworld quickstart sample is to prove that the ESB is
- is properly configured and happy. As well as to demonstrate the needed
- minimal files to make a basic ESB component execute.
+ The purpose of the helloworld_camel quickstart sample is to prove the
+ integration of JBossESB + Apache Camel.
Running this quickstart:
========================
Modified: labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/samples/quickstarts/helloworld_camel/src/org/jboss/soa/esb/samples/quickstart/helloworld_camel/HelloWorldRouteBuilder.java
===================================================================
--- labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/samples/quickstarts/helloworld_camel/src/org/jboss/soa/esb/samples/quickstart/helloworld_camel/HelloWorldRouteBuilder.java 2010-05-17 19:52:07 UTC (rev 32927)
+++ labs/jbossesb/workspace/dward/JBESB_4_8_Camel/product/samples/quickstarts/helloworld_camel/src/org/jboss/soa/esb/samples/quickstart/helloworld_camel/HelloWorldRouteBuilder.java 2010-05-17 20:23:50 UTC (rev 32928)
@@ -19,6 +19,8 @@
*/
package org.jboss.soa.esb.samples.quickstart.helloworld_camel;
+import java.io.File;
+
import org.apache.camel.builder.RouteBuilder;
/**
@@ -29,10 +31,23 @@
public class HelloWorldRouteBuilder extends RouteBuilder
{
+ private final String fromUri;
+ private final String toUri;
+
+ public HelloWorldRouteBuilder()
+ {
+ super();
+
+ File fromDir = new File(System.getProperty("java.io.tmpdir"), "helloworld_camel");
+ fromDir.mkdirs();
+ fromUri = "file://" + fromDir.getAbsolutePath() + "?delete=true";
+
+ toUri = "jbossesb://service?category=helloworld_camel&name=service1";
+ }
+
public void configure() throws Exception
{
- from("file:///home/dward/tmp/camel/?delete=true")
- .to("jbossesb://service?category=helloworld_camel&name=service1");
+ from(fromUri).to(toUri);
}
}
More information about the jboss-svn-commits
mailing list