svn commit: r747278 - in /camel/branches/camel-1.x: camel-core/src/main/java/org/apache/camel/ camel-core/src/main/java/org/apache/camel/impl/ tests/camel-itest/src/test/java/org/apache/camel/itest/jms/

[ningjiang]

Author: ningjiang
Date: Tue Feb 24 05:14:17 2009
New Revision: 747278

URL: http://svn.apache.org/viewvc?rev=747278&view=rev
Log:
Fixed the CS errors and a build error of JmsResequencerTest

Modified:
    
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/CamelContext.java
    
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
    
camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java

Modified: 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/CamelContext.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/CamelContext.java?rev=747278&r1=747277&r2=747278&view=diff
==============================================================================
--- 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/CamelContext.java
 (original)
+++ 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/CamelContext.java
 Tue Feb 24 05:14:17 2009
@@ -129,7 +129,7 @@
      * Returns a new Map containing all of the active endpoints with the key 
of the map being their
      * unique key
      */
-    Map<String,Endpoint> getEndpointMap();
+    Map<String, Endpoint> getEndpointMap();
 
     /**
      * Returns the collection of all registered endpoints for a uri or an 
empty collection.

Modified: 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=747278&r1=747277&r2=747278&view=diff
==============================================================================
--- 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
 (original)
+++ 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
 Tue Feb 24 05:14:17 2009
@@ -239,9 +239,9 @@
         }
     }
 
-    public Map<String,Endpoint> getEndpointMap() {
+    public Map<String, Endpoint> getEndpointMap() {
         synchronized (endpoints) {
-            return new HashMap<String,Endpoint>(endpoints);
+            return new HashMap<String, Endpoint>(endpoints);
         }
     }
 
@@ -808,8 +808,7 @@
     protected synchronized String getEndpointKey(String uri, Endpoint 
endpoint) {
         if (endpoint.isSingleton()) {
             return uri;
-        }
-        else {
+        } else {
             // lets try find the first endpoint key which is free
             for (int counter = 0; true; counter++) {
                 String key = (counter > 0) ? uri + ":" + counter : uri;

Modified: 
camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java?rev=747278&r1=747277&r2=747278&view=diff
==============================================================================
--- 
camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java
 (original)
+++ 
camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java
 Tue Feb 24 05:14:17 2009
@@ -28,6 +28,7 @@
 import org.apache.camel.Message;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.bean.BeanProcessor;
 import org.apache.camel.component.jms.JmsComponent;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.model.config.BatchResequencerConfig;
@@ -53,7 +54,7 @@
                 in.setBody(body);
                 in.setHeader(headerName, headerValue);
                 in.setHeader("testCase", getName());
-                in.setHeader(Exchange.BEAN_METHOD_NAME, "execute");
+                in.setHeader(BeanProcessor.METHOD_NAME, "execute");
             }
         });
     }