camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r705742 - in /activemq/camel/trunk: ./ components/camel-guice/ components/camel-guice/src/main/java/org/apache/camel/guice/ components/camel-guice/src/main/java/org/apache/camel/guice/impl/ components/camel-guice/src/test/java/org/apache/ca...
Date Fri, 17 Oct 2008 19:58:50 GMT
Author: jstrachan
Date: Fri Oct 17 12:58:49 2008
New Revision: 705742

URL: http://svn.apache.org/viewvc?rev=705742&view=rev
Log:
added an early spike of CAMEL-820 showing an example of using JMS and Camel using Guice as the IoC container

Added:
    activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java   (contents, props changed)
      - copied, changed from r704944, activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java
    activemq/camel/trunk/examples/camel-example-guice-jms/
    activemq/camel/trunk/examples/camel-example-guice-jms/README.txt   (with props)
    activemq/camel/trunk/examples/camel-example-guice-jms/build.xml   (with props)
    activemq/camel/trunk/examples/camel-example-guice-jms/pom.xml   (with props)
    activemq/camel/trunk/examples/camel-example-guice-jms/src/
    activemq/camel/trunk/examples/camel-example-guice-jms/src/data/
    activemq/camel/trunk/examples/camel-example-guice-jms/src/data/message1.xml   (with props)
    activemq/camel/trunk/examples/camel-example-guice-jms/src/data/message2.xml   (with props)
    activemq/camel/trunk/examples/camel-example-guice-jms/src/main/
    activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/
    activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/
    activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/
    activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/
    activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/
    activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/
    activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/
    activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyModule.java   (with props)
    activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyRouteBuilder.java   (with props)
    activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/SomeBean.java   (with props)
    activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/
    activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/META-INF/
    activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/META-INF/LICENSE.txt   (with props)
    activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/META-INF/NOTICE.txt   (with props)
    activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/jndi.properties   (with props)
    activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/log4j.properties   (with props)
    activemq/camel/trunk/examples/camel-example-guice-jms/src/test/
    activemq/camel/trunk/examples/camel-example-guice-jms/src/test/java/
    activemq/camel/trunk/examples/camel-example-guice-jms/src/test/java/org/
    activemq/camel/trunk/examples/camel-example-guice-jms/src/test/java/org/apache/
    activemq/camel/trunk/examples/camel-example-guice-jms/src/test/java/org/apache/camel/
    activemq/camel/trunk/examples/camel-example-guice-jms/src/test/java/org/apache/camel/example/
    activemq/camel/trunk/examples/camel-example-guice-jms/src/test/java/org/apache/camel/example/guice/
    activemq/camel/trunk/examples/camel-example-guice-jms/src/test/java/org/apache/camel/example/guice/jms/
    activemq/camel/trunk/examples/camel-example-guice-jms/src/test/java/org/apache/camel/example/guice/jms/IntegrationTest.java   (with props)
Modified:
    activemq/camel/trunk/components/camel-guice/pom.xml
    activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModule.java
    activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/GuiceCamelContext.java
    activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/GuiceInjector.java
    activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java
    activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java
    activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceTest.java
    activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java
    activemq/camel/trunk/examples/pom.xml
    activemq/camel/trunk/pom.xml

Modified: activemq/camel/trunk/components/camel-guice/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/pom.xml?rev=705742&r1=705741&r2=705742&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-guice/pom.xml (original)
+++ activemq/camel/trunk/components/camel-guice/pom.xml Fri Oct 17 12:58:49 2008
@@ -34,6 +34,7 @@
   <description>Camel Guice</description>
 
   <properties>
+    <!--<guiceyfruit-version>2.0-SNAPSHOT</guiceyfruit-version>-->
     <camel.osgi.export.pkg>org.apache.camel.guice.*</camel.osgi.export.pkg>
   </properties>
 
@@ -46,6 +47,12 @@
     <dependency>
       <groupId>org.guiceyfruit</groupId>
       <artifactId>guiceyfruit-core</artifactId>
+      <version>${guiceyfruit-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.guiceyfruit</groupId>
+      <artifactId>guice-jsr250</artifactId>
+      <version>${guiceyfruit-version}</version>
     </dependency>
 
     <!-- testing -->
@@ -64,6 +71,11 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>

Modified: activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModule.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModule.java?rev=705742&r1=705741&r2=705742&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModule.java (original)
+++ activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModule.java Fri Oct 17 12:58:49 2008
@@ -17,6 +17,8 @@
 package org.apache.camel.guice;
 
 import com.google.inject.AbstractModule;
+import com.google.inject.jsr250.Jsr250;
+import com.google.inject.jsr250.Jsr250Module;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Routes;
 
@@ -39,9 +41,11 @@
  *
  * @version $Revision$
  */
-public class CamelModule extends AbstractModule {
+public class CamelModule extends Jsr250Module {
 
     protected void configure() {
+        super.configure();
+        
         bind(CamelContext.class).to(GuiceCamelContext.class).asEagerSingleton();
     }
 

Modified: activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/GuiceCamelContext.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/GuiceCamelContext.java?rev=705742&r1=705741&r2=705742&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/GuiceCamelContext.java (original)
+++ activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/GuiceCamelContext.java Fri Oct 17 12:58:49 2008
@@ -16,18 +16,17 @@
  */
 package org.apache.camel.guice;
 
-import java.util.List;
-import java.util.Set;
-import javax.naming.Context;
-
 import com.google.inject.Inject;
-
+import com.google.inject.Binding;
+import com.google.inject.ProvisionException;
 import org.apache.camel.Route;
 import org.apache.camel.Routes;
 import org.apache.camel.TypeConverter;
+import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.builder.ErrorHandlerBuilder;
 import org.apache.camel.guice.impl.GuiceInjector;
 import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.spi.ComponentResolver;
 import org.apache.camel.spi.ExchangeConverter;
 import org.apache.camel.spi.Injector;
@@ -35,6 +34,14 @@
 import org.apache.camel.spi.LanguageResolver;
 import org.apache.camel.spi.LifecycleStrategy;
 import org.apache.camel.spi.Registry;
+import org.guiceyfruit.jndi.internal.JndiContext;
+
+import javax.naming.Context;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import java.util.List;
+import java.util.Set;
+import java.util.Hashtable;
 
 /**
  * The default CamelContext implementation for working with Guice.
@@ -52,6 +59,18 @@
         this.injector = injector;
     }
 
+    @PostConstruct
+    @Override
+    public void start() throws Exception {
+        super.start();
+    }
+
+    @PreDestroy
+    @Override
+    public void stop() throws Exception {
+        super.stop();
+    }
+
     @Inject
     public void setRouteBuilders(Set<Routes> routeBuilders) throws Exception {
         for (Routes routeBuilder : routeBuilders) {
@@ -135,4 +154,20 @@
     protected Injector createInjector() {
         return new GuiceInjector(injector);
     }
+
+    @Override
+    protected Registry createRegistry() {
+        Context context = createContext();
+        return new JndiRegistry(context);
+    }
+
+    protected Context createContext() {
+        try {
+            return (Context) injector.getInstance(Context.class);
+        }
+        catch (Exception e) {
+            throw new RuntimeCamelException(e);
+        }
+    }
+
 }

Modified: activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/GuiceInjector.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/GuiceInjector.java?rev=705742&r1=705741&r2=705742&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/GuiceInjector.java (original)
+++ activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/GuiceInjector.java Fri Oct 17 12:58:49 2008
@@ -31,6 +31,8 @@
     }
 
     public <T> T newInstance(Class<T> type) {
+        // TODO if not bound we could create an instance and inject it?
+        //injector.injectMembers(instance);
         return injector.getInstance(type);
     }
 

Copied: activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java (from r704944, activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java?p2=activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java&p1=activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java&r1=704944&r2=705742&rev=705742&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java Fri Oct 17 12:58:49 2008
@@ -18,31 +18,55 @@
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
+import com.google.inject.Provides;
 import junit.framework.TestCase;
 import org.apache.camel.CamelContext;
+import org.apache.camel.Component;
+import org.apache.camel.Endpoint;
+import org.apache.camel.component.mock.MockComponent;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.guiceyfruit.jndi.JndiBind;
+import org.guiceyfruit.jndi.GuiceInitialContextFactory;
+import org.guiceyfruit.Injectors;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+import javax.naming.InitialContext;
+import java.util.Hashtable;
 
 /**
  * Lets use a custom CamelModule to perform explicit binding of route builders
  *
  * @version $Revision$
  */
-public class TraditionalGuiceRouteTest extends TestCase {
-
-    public static class MyModule extends CamelModuleWithRouteTypes {
+public class ComponentFoundInRegistryTest extends TestCase {
 
-        public MyModule() {
-            super(MyHardcodeRoute.class, MyRouteInstaller.class);
+    public static class MyModule extends CamelModuleWithMatchingRoutes {
+        @Provides
+        @JndiBind("foo")
+        MockComponent foo() {
+            return new MockComponent();
         }
-
     }
 
-
     public void testGuice() throws Exception {
-        Injector injector = Guice.createInjector(new MyModule());
+        Hashtable env = new Hashtable();
+        env.put(InitialContext.PROVIDER_URL, GuiceInitialContextFactory.class.getName());
+        env.put(Injectors.MODULE_CLASS_NAMES, MyModule.class.getName());
+
+        InitialContext context = new InitialContext(env);
+        Injector injector = (Injector) context.lookup(Injector.class.getName());
+        assertNotNull("Found injector", injector);
+
+        Object value = context.lookup("foo");
+        assertNotNull("Should have found a value for foo!", value);
+        
         CamelContext camelContext = injector.getInstance(CamelContext.class);
-        camelContext.start();
-        Thread.sleep(1000);
-        camelContext.stop();
+        Component component = camelContext.getComponent("foo");
+        assertThat(component, is(MockComponent.class));
+
+        Endpoint endpoint = camelContext.getEndpoint("foo:cheese");
+        assertThat(endpoint, is(MockEndpoint.class));
     }
 
-}
+}
\ No newline at end of file

Propchange: activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java?rev=705742&r1=705741&r2=705742&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java Fri Oct 17 12:58:49 2008
@@ -32,7 +32,8 @@
 public class ConciseGuiceRouteTest extends TestCase {
 
     public void testGuice() throws Exception {
-        Injector injector = Guice.createInjector(new CamelModuleWithRouteTypes(MyRouteInstaller.class, MyHardcodeRoute.class));
+        // lets disable resource injection to avoid JNDI being used
+        Injector injector = Guice.createInjector(new CamelModuleWithRouteTypes(MyRouteInstaller.class, MyHardcodeRoute.class).noResourceInjection());
         CamelContext camelContext = injector.getInstance(CamelContext.class);
         camelContext.start();
         Thread.sleep(1000);

Modified: activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java?rev=705742&r1=705741&r2=705742&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java (original)
+++ activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java Fri Oct 17 12:58:49 2008
@@ -41,6 +41,11 @@
 
     public static class MyModule extends CamelModuleWithMatchingRoutes {
 
+        public MyModule() {
+            // lets disable the use of JNDI
+            noResourceInjection();
+        }
+
         @Provides
         @Named("foo")
         protected MyConfigurableRoute2 createRoute1() {

Modified: activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceTest.java?rev=705742&r1=705741&r2=705742&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceTest.java (original)
+++ activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceTest.java Fri Oct 17 12:58:49 2008
@@ -43,7 +43,8 @@
     }
 
     public void testGuice() throws Exception {
-        Injector injector = Guice.createInjector(new CamelModuleWithMatchingRoutes());
+        // lets disable resource injection to avoid JNDI being used
+        Injector injector = Guice.createInjector(new CamelModuleWithMatchingRoutes().noResourceInjection());
 
         Cheese cheese = injector.getInstance(Cheese.class);
         assertNotNull("Should have cheese", cheese);

Modified: activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java?rev=705742&r1=705741&r2=705742&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java Fri Oct 17 12:58:49 2008
@@ -34,11 +34,12 @@
 
         public MyModule() {
             super(MyHardcodeRoute.class, MyRouteInstaller.class);
-        }
 
+            // lets disable the use of JNDI
+            noResourceInjection();
+        }
     }
 
-
     public void testGuice() throws Exception {
         Injector injector = Guice.createInjector(new MyModule());
         CamelContext camelContext = injector.getInstance(CamelContext.class);

Added: activemq/camel/trunk/examples/camel-example-guice-jms/README.txt
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-guice-jms/README.txt?rev=705742&view=auto
==============================================================================
--- activemq/camel/trunk/examples/camel-example-guice-jms/README.txt (added)
+++ activemq/camel/trunk/examples/camel-example-guice-jms/README.txt Fri Oct 17 12:58:49 2008
@@ -0,0 +1,56 @@
+Spring Example
+==============
+
+This example shows how to work with files and JMS, using Spring to boot up
+Camel and configure the routes. It can be run using Maven or Ant.
+
+The example consumes messages from a queue and writes them to the file
+system.
+
+To run the example type
+  mvn camel:run
+
+To run the example with Ant
+  a. You need to have Apache ActiveMQ installed. It can be downloaded from 
+    http://activemq.apache.org/
+
+  b. Export / Set ACTIVEMQ_HOME to the top level Apache ActiveMQ intall
+  directory
+    UNIX
+    export ACTIVEMQ_HOME=<path to ActiveMQ install directory>
+    Windows
+    set ACTIVEMQ_HOME=<path to ActiveMQ install directory>
+
+  c. To Run the example using Ant, type
+    ant
+  or to run the example and generate visualization graphs (refer to
+  http://activemq.apache.org/camel/visualisation.html), type
+    ant camel.dot
+
+You can see the routing rules by looking at the java code in the
+src/main/java directory and the Spring XML configuration lives in
+src/main/resources/META-INF/spring
+
+To stop the example hit ctrl + c
+
+To use log4j as the logging framework add this to the pom.xml:
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+and log4j.properties is located in src/main/resources 
+
+For the latest & greatest documentation on how to use this example please see
+  http://activemq.apache.org/camel/spring-example.html
+
+If you hit any problems please talk to us on the Camel Forums
+  http://activemq.apache.org/camel/discussion-forums.html
+
+Please help us make Apache Camel better - we appreciate any feedback you
+may have.  Enjoy!
+
+------------------------
+The Camel riders!
+
+
+

Propchange: activemq/camel/trunk/examples/camel-example-guice-jms/README.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: activemq/camel/trunk/examples/camel-example-guice-jms/build.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-guice-jms/build.xml?rev=705742&view=auto
==============================================================================
--- activemq/camel/trunk/examples/camel-example-guice-jms/build.xml (added)
+++ activemq/camel/trunk/examples/camel-example-guice-jms/build.xml Fri Oct 17 12:58:49 2008
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<project name="camel-example-spring" default="run" basedir=".">
+
+  <import file="../common_build.xml"/>
+
+  <fail unless="env.SPRING_HOME" message="You must download Spring Framework and set your SPRING_HOME to run this demo."/>
+  <fail unless="env.ACTIVEMQ_HOME" message="You must download ActiveMQ and set your ACTIVEMQ_HOME to run this demo."/>
+
+  <property name="project.name" value="camel-example-spring"/>
+
+  <path id="sample.build.classpath">
+    <fileset dir="${camel.lib}">
+      <include name="**/camel-jms-*.jar"/>
+      <exclude name="**/*-tests.jar"/>
+    </fileset>
+    <path refid="spring.classpath"/>
+    <path refid="camel.spring.classpath"/>
+    <path refid="activemq.classpath"/>
+  </path>
+
+  <target name="run" depends="build" description="Compile and run the sample">
+    <camelrun>
+      <arguments>
+        <arg value="-duration"/>
+        <arg value="2s"/>
+        <arg value="-o"/>
+        <arg value="${cameldoc.dir}"/>
+      </arguments>
+    </camelrun>
+  </target>
+
+</project>

Propchange: activemq/camel/trunk/examples/camel-example-guice-jms/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/examples/camel-example-guice-jms/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-guice-jms/pom.xml?rev=705742&view=auto
==============================================================================
--- activemq/camel/trunk/examples/camel-example-guice-jms/pom.xml (added)
+++ activemq/camel/trunk/examples/camel-example-guice-jms/pom.xml Fri Oct 17 12:58:49 2008
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.camel</groupId>
+    <artifactId>examples</artifactId>
+    <version>1.5-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>camel-example-guice-jms</artifactId>
+  <packaging>bundle</packaging>
+  <name>Camel :: Example :: Guice :: JMS</name>
+  <description>An example showing how to work with Camel, Guice and JMS</description>
+
+  <properties>
+    <camel.osgi.export.pkg>org.apache.camel.example.guice.jms.*</camel.osgi.export.pkg>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-guice</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-spring</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-jms</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+
+    <!-- for testing -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <plugins>
+      <!-- TODO use guice plugin!! -->
+      <!-- Allows the routes to be run via 'mvn camel:run' -->
+      <plugin>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-maven-plugin</artifactId>
+        <version>${pom.version}</version>
+      </plugin>
+
+      <!-- Allows the example to be run via 'mvn compile exec:java' -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <configuration>
+          <mainClass>org.apache.camel.guice.Main</mainClass>
+          <includePluginDependencies>false</includePluginDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+
+  </build>
+
+  <reporting>
+    <plugins>
+      <!-- Generates nice PNG / SVG diagrams from our routes -->
+      <plugin>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-maven-plugin</artifactId>
+        <version>${pom.version}</version>
+      </plugin>
+    </plugins>
+  </reporting>
+</project>

Propchange: activemq/camel/trunk/examples/camel-example-guice-jms/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/examples/camel-example-guice-jms/src/data/message1.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-guice-jms/src/data/message1.xml?rev=705742&view=auto
==============================================================================
--- activemq/camel/trunk/examples/camel-example-guice-jms/src/data/message1.xml (added)
+++ activemq/camel/trunk/examples/camel-example-guice-jms/src/data/message1.xml Fri Oct 17 12:58:49 2008
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<person user="james">
+  <firstName>James</firstName>
+  <lastName>Strachan</lastName>
+  <city>London</city>
+</person>
\ No newline at end of file

Propchange: activemq/camel/trunk/examples/camel-example-guice-jms/src/data/message1.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/examples/camel-example-guice-jms/src/data/message2.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-guice-jms/src/data/message2.xml?rev=705742&view=auto
==============================================================================
--- activemq/camel/trunk/examples/camel-example-guice-jms/src/data/message2.xml (added)
+++ activemq/camel/trunk/examples/camel-example-guice-jms/src/data/message2.xml Fri Oct 17 12:58:49 2008
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<person user="hiram">
+  <firstName>Hiram</firstName>
+  <lastName>Chirino</lastName>
+  <city>Tampa</city>
+</person>
\ No newline at end of file

Propchange: activemq/camel/trunk/examples/camel-example-guice-jms/src/data/message2.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyModule.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyModule.java?rev=705742&view=auto
==============================================================================
--- activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyModule.java (added)
+++ activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyModule.java Fri Oct 17 12:58:49 2008
@@ -0,0 +1,47 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.example.guice.jms;
+
+import org.apache.camel.guice.CamelModuleWithMatchingRoutes;
+import org.apache.camel.component.jms.JmsComponent;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.guiceyfruit.jndi.JndiBind;
+import com.google.inject.Provides;
+import com.google.inject.name.Named;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class MyModule extends CamelModuleWithMatchingRoutes {
+
+    @Override
+    protected void configure() {
+        System.out.println("Configuring JMS module!!!");
+        super.configure();
+
+        System.out.println("Adding my module!");
+        
+        bind(MyRouteBuilder.class);
+    }
+
+    @Provides
+    @JndiBind("jms")
+    JmsComponent jms(@Named("activemq.brokerURL") String brokerUrl) {
+        return JmsComponent.jmsComponent(new ActiveMQConnectionFactory(brokerUrl));
+    }
+}

Propchange: activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyModule.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyRouteBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyRouteBuilder.java?rev=705742&view=auto
==============================================================================
--- activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyRouteBuilder.java (added)
+++ activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyRouteBuilder.java Fri Oct 17 12:58:49 2008
@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.example.guice.jms;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.guice.Main;
+
+/**
+ * A simple example router from a file system to an ActiveMQ queue and then to a file system
+ *
+ * @version $Revision: 644171 $
+ */
+public class MyRouteBuilder extends RouteBuilder {
+
+    /**
+     * Allow this route to be run as an application
+     *
+     * @param args
+     */
+    public static void main(String[] args) {
+        new Main().run(args);
+    }
+
+    public void configure() {
+        // populate the message queue with some messages
+        from("file:src/data?noop=true").
+                to("jms:test.MyQueue");
+
+        from("jms:test.MyQueue").
+                to("file://target/routeOutput");
+
+        // set up a listener on the file component
+        from("file://target/routeOutput?noop=true").
+                bean(new SomeBean());
+    }
+
+}
\ No newline at end of file

Propchange: activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyRouteBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/SomeBean.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/SomeBean.java?rev=705742&view=auto
==============================================================================
--- activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/SomeBean.java (added)
+++ activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/SomeBean.java Fri Oct 17 12:58:49 2008
@@ -0,0 +1,28 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.example.guice.jms;
+
+/**
+ * @version $Revision: 1.1 $
+*/
+public class SomeBean {
+
+    public void someMethod(String body) {
+        System.out.println("Received: " + body);
+    }
+}

Propchange: activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/SomeBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/META-INF/LICENSE.txt?rev=705742&view=auto
==============================================================================
--- activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/META-INF/LICENSE.txt (added)
+++ activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/META-INF/LICENSE.txt Fri Oct 17 12:58:49 2008
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Propchange: activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/META-INF/NOTICE.txt?rev=705742&view=auto
==============================================================================
--- activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/META-INF/NOTICE.txt (added)
+++ activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/META-INF/NOTICE.txt Fri Oct 17 12:58:49 2008
@@ -0,0 +1,11 @@
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for the Apache Camel distribution.                    ==
+   =========================================================================
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Please read the different LICENSE files present in the licenses directory of
+   this distribution.

Propchange: activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/jndi.properties
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/jndi.properties?rev=705742&view=auto
==============================================================================
--- activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/jndi.properties (added)
+++ activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/jndi.properties Fri Oct 17 12:58:49 2008
@@ -0,0 +1,30 @@
+## ------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ------------------------------------------------------------------------
+
+#
+# For more details on this configuration file see
+# http://code.google.com/p/guiceyfruit/wiki/GuiceyJndi
+#
+
+# Guice JNDI provider
+java.naming.factory.initial = org.guiceyfruit.jndi.GuiceInitialContextFactory
+
+# list of guice modules to boot up (space separated)
+org.guiceyfruit.modules = org.apache.camel.example.guice.jms.MyModule
+
+#Êbound properties
+activemq.brokerURL = vm://broker1?marshal=false&broker.persistent=false
\ No newline at end of file

Propchange: activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/jndi.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/log4j.properties?rev=705742&view=auto
==============================================================================
--- activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/log4j.properties (added)
+++ activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/log4j.properties Fri Oct 17 12:58:49 2008
@@ -0,0 +1,30 @@
+## ------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ------------------------------------------------------------------------
+
+#
+# The logging properties used for eclipse testing, We want to see INFO output on the console.
+#
+log4j.rootLogger=INFO, out
+
+#
+# uncomment the following line to enable debugging of Camel
+#
+#log4j.logger.org.apache.camel=DEBUG
+
+log4j.appender.out=org.apache.log4j.ConsoleAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n

Propchange: activemq/camel/trunk/examples/camel-example-guice-jms/src/main/resources/log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/examples/camel-example-guice-jms/src/test/java/org/apache/camel/example/guice/jms/IntegrationTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-guice-jms/src/test/java/org/apache/camel/example/guice/jms/IntegrationTest.java?rev=705742&view=auto
==============================================================================
--- activemq/camel/trunk/examples/camel-example-guice-jms/src/test/java/org/apache/camel/example/guice/jms/IntegrationTest.java (added)
+++ activemq/camel/trunk/examples/camel-example-guice-jms/src/test/java/org/apache/camel/example/guice/jms/IntegrationTest.java Fri Oct 17 12:58:49 2008
@@ -0,0 +1,31 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.example.guice.jms;
+
+import junit.framework.TestCase;
+import org.apache.camel.guice.Main;
+
+/**
+ * @version $Revision: 702954 $
+ */
+public class IntegrationTest extends TestCase {
+
+    public void testCamelRulesDeployCorrectlyInGuice() throws Exception {
+        // let's boot up the Guicey JNDI context for 2 seconds to check that it works OK
+        Main.main("-duration", "2s", "-o", "target/site/cameldoc");
+    }
+}
\ No newline at end of file

Propchange: activemq/camel/trunk/examples/camel-example-guice-jms/src/test/java/org/apache/camel/example/guice/jms/IntegrationTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: activemq/camel/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/pom.xml?rev=705742&r1=705741&r2=705742&view=diff
==============================================================================
--- activemq/camel/trunk/examples/pom.xml (original)
+++ activemq/camel/trunk/examples/pom.xml Fri Oct 17 12:58:49 2008
@@ -53,6 +53,7 @@
     <module>camel-example-cxf</module>
     <module>camel-example-docs</module>
     <module>camel-example-etl</module>
+    <module>camel-example-guice-jms</module>
     <module>camel-example-jms-file</module>
     <module>camel-example-loan-broker</module>
     <module>camel-example-osgi</module>

Modified: activemq/camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=705742&r1=705741&r2=705742&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Fri Oct 17 12:58:49 2008
@@ -72,7 +72,7 @@
     <hibernate-entitymanager-version>3.2.1.ga</hibernate-entitymanager-version>
     <hsqldb-version>1.8.0.7</hsqldb-version>
     <groovy-version>1.5.6</groovy-version>
-    <guiceyfruit-version>2.0-beta-1</guiceyfruit-version>
+    <guiceyfruit-version>2.0-beta-2</guiceyfruit-version>
     <junit-version>3.8.2</junit-version>
     <saxon-version>9.1.0.1</saxon-version>
     <testng-version>5.7</testng-version>



Mime
View raw message