svn commit: r1242670 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/management/ components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/ components/camel-jms/src/main/java/org/apache/camel/c...

[hadrian]

Author: hadrian
Date: Fri Feb 10 04:55:23 2012
New Revision: 1242670

URL: http://svn.apache.org/viewvc?rev=1242670&view=rev
Log:
Merged revisions 1240374 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1240374 | bvahdat | 2012-02-03 17:17:18 -0500 (Fri, 03 Feb 2012) | 1 line
  
  Polished.
........

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
    
camel/branches/camel-2.9.x/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java
    
camel/branches/camel-2.9.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultSpringErrorHandler.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java?rev=1242670&r1=1242669&r2=1242670&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
 (original)
+++ 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
 Fri Feb 10 04:55:23 2012
@@ -29,7 +29,6 @@ import org.apache.camel.Producer;
 import org.apache.camel.Route;
 import org.apache.camel.Service;
 import org.apache.camel.component.bean.BeanProcessor;
-import org.apache.camel.component.seda.SedaEndpoint;
 import org.apache.camel.impl.ScheduledPollConsumer;
 import org.apache.camel.management.mbean.ManagedBeanProcessor;
 import org.apache.camel.management.mbean.ManagedBrowsableEndpoint;

Modified: 
camel/branches/camel-2.9.x/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java?rev=1242670&r1=1242669&r2=1242670&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java
 Fri Feb 10 04:55:23 2012
@@ -21,7 +21,6 @@ import javax.xml.ws.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.After;
 import org.junit.Test;
 

Modified: 
camel/branches/camel-2.9.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultSpringErrorHandler.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultSpringErrorHandler.java?rev=1242670&r1=1242669&r2=1242670&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultSpringErrorHandler.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultSpringErrorHandler.java
 Fri Feb 10 04:55:23 2012
@@ -28,7 +28,7 @@ public class DefaultSpringErrorHandler i
     private final LoggingExceptionHandler handler;
     private final boolean logStackTrace;
 
-    public DefaultSpringErrorHandler(Class owner, LoggingLevel level, boolean 
logStackTrace) {
+    public DefaultSpringErrorHandler(Class<?> owner, LoggingLevel level, 
boolean logStackTrace) {
         this.handler = new LoggingExceptionHandler(owner, level);
         this.logStackTrace = logStackTrace;
     }