svn commit: r1158817 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/CamelContext.java main/java/org/apache/camel/impl/DefaultCamelContext.java test/java/org/apache/camel/impl/DefaultExecutorServiceStrategyTest.java

[dkulp]

Author: dkulp
Date: Wed Aug 17 16:38:26 2011
New Revision: 1158817

URL: http://svn.apache.org/viewvc?rev=1158817&view=rev
Log:
Fix some deprecation warnings

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
    
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
    
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultExecutorServiceStrategyTest.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java?rev=1158817&r1=1158816&r2=1158817&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java 
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java Wed 
Aug 17 16:38:26 2011
@@ -33,7 +33,6 @@ import org.apache.camel.spi.DataFormatRe
 import org.apache.camel.spi.Debugger;
 import org.apache.camel.spi.EndpointStrategy;
 import org.apache.camel.spi.ExecutorServiceManager;
-import org.apache.camel.spi.ExecutorServiceStrategy;
 import org.apache.camel.spi.FactoryFinder;
 import org.apache.camel.spi.FactoryFinderResolver;
 import org.apache.camel.spi.InflightRepository;
@@ -932,7 +931,7 @@ public interface CamelContext extends Su
      * @deprecated use {@link #getExecutorServiceManager()}
      */
     @Deprecated
-    ExecutorServiceStrategy getExecutorServiceStrategy();
+    org.apache.camel.spi.ExecutorServiceStrategy getExecutorServiceStrategy();
 
     /**
      * Sets a custom {@link org.apache.camel.spi.ExecutorServiceManager}

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1158817&r1=1158816&r2=1158817&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
 Wed Aug 17 16:38:26 2011
@@ -93,7 +93,6 @@ import org.apache.camel.spi.Debugger;
 import org.apache.camel.spi.EndpointStrategy;
 import org.apache.camel.spi.EventNotifier;
 import org.apache.camel.spi.ExecutorServiceManager;
-import org.apache.camel.spi.ExecutorServiceStrategy;
 import org.apache.camel.spi.FactoryFinder;
 import org.apache.camel.spi.FactoryFinderResolver;
 import org.apache.camel.spi.InflightRepository;
@@ -2281,7 +2280,8 @@ public class DefaultCamelContext extends
         return this.executorServiceManager;
     }
 
-    public ExecutorServiceStrategy getExecutorServiceStrategy() {
+    @Deprecated
+    public org.apache.camel.spi.ExecutorServiceStrategy 
getExecutorServiceStrategy() {
         // its okay to create a new instance as its stateless, and just 
delegate
         // ExecutorServiceManager which is the new API
         return new DefaultExecutorServiceStrategy(this);

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultExecutorServiceStrategyTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultExecutorServiceStrategyTest.java?rev=1158817&r1=1158816&r2=1158817&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultExecutorServiceStrategyTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultExecutorServiceStrategyTest.java
 Wed Aug 17 16:38:26 2011
@@ -29,6 +29,7 @@ import org.apache.camel.ThreadPoolReject
  *
  * @version 
  */
+@SuppressWarnings("deprecation")
 public class DefaultExecutorServiceStrategyTest extends ContextTestSupport {
 
     public void testGetThreadNameDefaultPattern() throws Exception {