Author: ningjiang
Date: Thu Jun 30 13:17:35 2011
New Revision: 1141526

URL: http://svn.apache.org/viewvc?rev=1141526&view=rev
Log:
CAMEL-4165 Fixed some issues of camel loan broker example

Added:
    
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueServerTest.java
   (contents, props changed)
      - copied, changed from r1141013, 
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerServerTest.java
    
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueTest.java
   (contents, props changed)
      - copied, changed from r1141013, 
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerTest.java
    
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/webservice/version/LoanBrokerWSTest.java
   (contents, props changed)
      - copied, changed from r1141013, 
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/webservice/version/LoanBrokerTest.java
Removed:
    
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerServerTest.java
    
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerTest.java
    
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/webservice/version/LoanBrokerTest.java
Modified:
    
camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/queueCamelContext.xml
    
camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/webServiceCamelContext.xml

Modified: 
camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/queueCamelContext.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/queueCamelContext.xml?rev=1141526&r1=1141525&r2=1141526&view=diff
==============================================================================
--- 
camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/queueCamelContext.xml
 (original)
+++ 
camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/queueCamelContext.xml
 Thu Jun 30 13:17:35 2011
@@ -19,28 +19,19 @@
 <beans xmlns="http://www.springframework.org/schema/beans";
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
        xmlns:camel="http://camel.apache.org/schema/spring";
-       xmlns:broker="http://activemq.apache.org/schema/core";
        xsi:schemaLocation="
        http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
-       http://activemq.apache.org/schema/core 
http://activemq.apache.org/schema/core/activemq-core-5.5.0.xsd";>
-    
-    <!-- lets configure the ActiveMQ JMS broker server to listen on TCP 51616 
-->
-    <broker:broker useJmx="false" persistent="false" brokerName="localhost">
-        <broker:transportConnectors>
-            <broker:transportConnector name="tcp" uri="tcp://localhost:51616"/>
-        </broker:transportConnectors>
-    </broker:broker>
+       http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd";>
     
     <!-- lets configure the Camel ActiveMQ to use the ActiveMQ broker declared 
above -->
     <bean id="jms" 
class="org.apache.activemq.camel.component.ActiveMQComponent">
-        <property name="brokerURL" value="tcp://localhost:51616"/>
+        <property name="brokerURL" value="tcp://localhost:61616"/>
     </bean>
     
-    <bean id="loanBroker" 
class="org.apache.camel.loanbroker.queue.version.LoanBroker"/>
+    <bean id="queueLoanBroker" 
class="org.apache.camel.loanbroker.queue.version.LoanBroker"/>
     
-    <camel:camelContext id="myCamel">
-       <camel:routeBuilder ref="loanBroker"/>
+    <camel:camelContext id="queue">
+       <camel:routeBuilder ref="queueLoanBroker"/>
     </camel:camelContext>
 
 

Modified: 
camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/webServiceCamelContext.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/webServiceCamelContext.xml?rev=1141526&r1=1141525&r2=1141526&view=diff
==============================================================================
--- 
camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/webServiceCamelContext.xml
 (original)
+++ 
camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/webServiceCamelContext.xml
 Thu Jun 30 13:17:35 2011
@@ -24,6 +24,8 @@
        http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
        http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd";>
+ 
+ <import resource="classpath:META-INF/cxf/cxf.xml"/>
 
  <jaxws:endpoint id="creditAgent"
                
implementor="org.apache.camel.loanbroker.webservice.version.credit.CreditAgency"
@@ -54,11 +56,11 @@
                implementor="#bank3"
                address="http://localhost:9003/bank3"/>
 
-  <camel:camelContext id="myCamel">
-     <camel:routeBuilder ref="loanBroker"/>
+  <camel:camelContext id="webService">
+     <camel:routeBuilder ref="webServiceLoanBroker"/>
   </camel:camelContext>
   
-  <bean id="loanBroker" 
class="org.apache.camel.loanbroker.webservice.version.LoanBroker"/>
+  <bean id="webServiceLoanBroker" 
class="org.apache.camel.loanbroker.webservice.version.LoanBroker"/>
    
 
 </beans>

Copied: 
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueServerTest.java
 (from r1141013, 
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerServerTest.java)
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueServerTest.java?p2=camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueServerTest.java&p1=camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerServerTest.java&r1=1141013&r2=1141526&rev=1141526&view=diff
==============================================================================
--- 
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerServerTest.java
 (original)
+++ 
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueServerTest.java
 Thu Jun 30 13:17:35 2011
@@ -22,21 +22,27 @@ import org.junit.Test;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-public class LoanBrokerServerTest extends TestSupport {
+public class LoanBrokerQueueServerTest extends TestSupport {
     
     @Test
     public void startLoanBroker() throws Exception {
         deleteDirectory("activemq-data");
-
-        AbstractApplicationContext applicationContext =
-            new ClassPathXmlApplicationContext(new 
String[]{"/META-INF/spring/queueCamelContext.xml"});
-
-        CamelContext camelContext = 
(CamelContext)applicationContext.getBean("myCamel");
-        assertNotNull("The camel context should not be null", camelContext);
-
-        Thread.sleep(2000);
-        camelContext.stop();
-        applicationContext.stop();        
+        
+        JmsBroker broker = new JmsBroker("tcp://localhost:61616");
+        broker.start();
+        try {
+            AbstractApplicationContext applicationContext =
+                new ClassPathXmlApplicationContext(new 
String[]{"/META-INF/spring/queueCamelContext.xml"});
+    
+            CamelContext camelContext = 
(CamelContext)applicationContext.getBean("queue");
+            assertNotNull("The camel context should not be null", 
camelContext);
+    
+            Thread.sleep(2000);
+            camelContext.stop();
+            applicationContext.stop(); 
+        } finally {
+            broker.stop();
+        }
     }
 
 }

Propchange: 
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueServerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueServerTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: 
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueTest.java
 (from r1141013, 
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerTest.java)
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueTest.java?p2=camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueTest.java&p1=camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerTest.java&r1=1141013&r2=1141526&rev=1141526&view=diff
==============================================================================
--- 
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerTest.java
 (original)
+++ 
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueTest.java
 Thu Jun 30 13:17:35 2011
@@ -34,10 +34,10 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-public class LoanBrokerTest extends TestSupport {
-    private CamelContext camelContext;
-    private JmsBroker broker;
-    private ProducerTemplate template;
+public class LoanBrokerQueueTest extends TestSupport {
+    protected CamelContext camelContext;
+    protected JmsBroker broker;
+    protected ProducerTemplate template;
  
     @Before
     public void startServices() throws Exception {

Propchange: 
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: 
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/webservice/version/LoanBrokerWSTest.java
 (from r1141013, 
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/webservice/version/LoanBrokerTest.java)
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/webservice/version/LoanBrokerWSTest.java?p2=camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/webservice/version/LoanBrokerWSTest.java&p1=camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/webservice/version/LoanBrokerTest.java&r1=1141013&r2=1141526&rev=1141526&view=diff
==============================================================================
--- 
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/webservice/version/LoanBrokerTest.java
 (original)
+++ 
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/webservice/version/LoanBrokerWSTest.java
 Thu Jun 30 13:17:35 2011
@@ -24,7 +24,7 @@ import org.junit.Test;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-public class LoanBrokerTest extends Assert {
+public class LoanBrokerWSTest extends Assert {
     AbstractApplicationContext applicationContext;
     
     @Before

Propchange: 
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/webservice/version/LoanBrokerWSTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/webservice/version/LoanBrokerWSTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date


Reply via email to