Author: dkulp
Date: Wed Oct 5 16:25:24 2011
New Revision: 1179302
URL: http://svn.apache.org/viewvc?rev=1179302&view=rev
Log:
Fix a bunch of compiler warnings
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DataFormatTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTrimClipTest.java
camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/CamelGroovyMethods.java
camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java
camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java
camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelExpression.java
camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
camel/trunk/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java
camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java
camel/trunk/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java
camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/DotMojo.java
camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DataFormatTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DataFormatTest.java?rev=1179302&r1=1179301&r2=1179302&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DataFormatTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DataFormatTest.java
Wed Oct 5 16:25:24 2011
@@ -88,6 +88,10 @@ public class DataFormatTest extends Cont
public MyNonSerializableBean(String name) {
this.name = name;
}
+
+ public String getName() {
+ return name;
+ }
}
}
\ No newline at end of file
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTrimClipTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTrimClipTest.java?rev=1179302&r1=1179301&r2=1179302&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTrimClipTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTrimClipTest.java
Wed Oct 5 16:25:24 2011
@@ -31,7 +31,6 @@ import org.springframework.test.context.
public class BindySimpleCsvMarshallTrimClipTest extends
AbstractJUnit4SpringContextTests {
private static final String URI_MOCK_RESULT = "mock:result";
- private static final String URI_MOCK_ERROR = "mock:error";
private static final String URI_DIRECT_START = "direct:start";
private String expected;
Modified:
camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/CamelGroovyMethods.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/CamelGroovyMethods.java?rev=1179302&r1=1179301&r2=1179302&view=diff
==============================================================================
---
camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/CamelGroovyMethods.java
(original)
+++
camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/CamelGroovyMethods.java
Wed Oct 5 16:25:24 2011
@@ -18,10 +18,10 @@ package org.apache.camel.language.groovy
import groovy.lang.Closure;
import org.apache.camel.Exchange;
-import org.apache.camel.impl.ExpressionSupport;
import org.apache.camel.model.ChoiceDefinition;
import org.apache.camel.model.FilterDefinition;
import org.apache.camel.model.ProcessorDefinition;
+import org.apache.camel.support.ExpressionSupport;
/**
* @version
Modified:
camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java?rev=1179302&r1=1179301&r2=1179302&view=diff
==============================================================================
---
camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java
(original)
+++
camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java
Wed Oct 5 16:25:24 2011
@@ -24,7 +24,7 @@ import groovy.lang.Binding;
import groovy.lang.Script;
import org.apache.camel.Exchange;
-import org.apache.camel.impl.ExpressionSupport;
+import org.apache.camel.support.ExpressionSupport;
import org.apache.camel.util.ExchangeHelper;
/**
Modified:
camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java?rev=1179302&r1=1179301&r2=1179302&view=diff
==============================================================================
---
camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
(original)
+++
camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
Wed Oct 5 16:25:24 2011
@@ -28,8 +28,8 @@ import org.apache.camel.InvalidPayloadEx
import org.apache.camel.InvalidPayloadRuntimeException;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.impl.ExpressionAdapter;
import org.apache.camel.impl.ScheduledPollEndpoint;
+import org.apache.camel.support.ExpressionAdapter;
import org.apache.camel.util.CastUtils;
import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.ObjectHelper;
Modified:
camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java?rev=1179302&r1=1179301&r2=1179302&view=diff
==============================================================================
---
camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java
(original)
+++
camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java
Wed Oct 5 16:25:24 2011
@@ -18,7 +18,7 @@ package org.apache.camel.language.jxpath
import org.apache.camel.Exchange;
import org.apache.camel.ExpressionEvaluationException;
-import org.apache.camel.impl.ExpressionSupport;
+import org.apache.camel.support.ExpressionSupport;
import org.apache.commons.jxpath.CompiledExpression;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.JXPathException;
Modified:
camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelExpression.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelExpression.java?rev=1179302&r1=1179301&r2=1179302&view=diff
==============================================================================
---
camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelExpression.java
(original)
+++
camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelExpression.java
Wed Oct 5 16:25:24 2011
@@ -21,7 +21,7 @@ import java.io.Serializable;
import org.apache.camel.Exchange;
import org.apache.camel.ExpressionEvaluationException;
import org.apache.camel.ExpressionIllegalSyntaxException;
-import org.apache.camel.impl.ExpressionSupport;
+import org.apache.camel.support.ExpressionSupport;
public class MvelExpression extends ExpressionSupport {
Modified:
camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java?rev=1179302&r1=1179301&r2=1179302&view=diff
==============================================================================
---
camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
(original)
+++
camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
Wed Oct 5 16:25:24 2011
@@ -22,7 +22,7 @@ import ognl.OgnlException;
import org.apache.camel.Exchange;
import org.apache.camel.ExpressionEvaluationException;
import org.apache.camel.ExpressionIllegalSyntaxException;
-import org.apache.camel.impl.ExpressionSupport;
+import org.apache.camel.support.ExpressionSupport;
/**
* An <a href="http://www.ognl.org/";>OGNL</a> {@link Expression}
Modified:
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java?rev=1179302&r1=1179301&r2=1179302&view=diff
==============================================================================
---
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java
(original)
+++
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java
Wed Oct 5 16:25:24 2011
@@ -24,6 +24,7 @@ import org.apache.camel.CamelExecutionEx
import org.apache.camel.ServiceStatus;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.spi.RoutePolicy;
import org.apache.camel.test.junit4.TestSupport;
@@ -114,7 +115,7 @@ public abstract class SpringScheduledRou
? policy instanceof SimpleScheduledRoutePolicy
: policy instanceof CronScheduledRoutePolicy);
routes.get(0).routePolicy(policy);
- context.addRouteDefinitions(routes);
+ ((ModelCamelContext)context).addRouteDefinitions(routes);
context.start();
return context;
}
Modified:
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java?rev=1179302&r1=1179301&r2=1179302&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
(original)
+++
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
Wed Oct 5 16:25:24 2011
@@ -239,10 +239,6 @@ public class RestletComponent extends He
return UnsafeUriCharactersEncoder.encode(uri.replaceAll("%7B",
"(").replaceAll("%7D", ")"));
}
- private static String encodePattern(String pattern) {
- return pattern == null ? null : pattern.replaceAll("\\{",
"(").replaceAll("\\}", ")");
- }
-
private static String decodePattern(String pattern) {
return pattern == null ? null : pattern.replaceAll("\\(",
"{").replaceAll("\\)", "}");
}
Modified:
camel/trunk/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java?rev=1179302&r1=1179301&r2=1179302&view=diff
==============================================================================
---
camel/trunk/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java
(original)
+++
camel/trunk/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java
Wed Oct 5 16:25:24 2011
@@ -30,6 +30,7 @@ import org.apache.camel.impl.converter.A
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.spi.AuthorizationPolicy;
import org.apache.camel.spi.RouteContext;
+import org.apache.camel.util.AsyncProcessorConverterHelper;
import org.apache.camel.util.AsyncProcessorHelper;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException;
@@ -133,7 +134,7 @@ public class ShiroSecurityPolicy impleme
// If here, then user is authenticated and authorized
// Now let the original processor continue routing supporting
the async routing engine
- AsyncProcessor ap =
AsyncProcessorTypeConverter.convert(processor);
+ AsyncProcessor ap =
AsyncProcessorConverterHelper.convert(processor);
sync = AsyncProcessorHelper.process(ap, exchange, new
AsyncCallback() {
public void done(boolean doneSync) {
// we only have to handle async completion of this
policy
Modified:
camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java?rev=1179302&r1=1179301&r2=1179302&view=diff
==============================================================================
---
camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
(original)
+++
camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
Wed Oct 5 16:25:24 2011
@@ -43,6 +43,7 @@ import org.apache.camel.impl.DefaultDebu
import org.apache.camel.impl.InterceptSendToMockEndpointStrategy;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.management.JmxSystemPropertyKeys;
+import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.spi.Language;
import org.apache.camel.spring.CamelBeanPostProcessor;
@@ -65,8 +66,8 @@ public abstract class CamelTestSupport e
private static final ThreadLocal<Boolean> INIT = new
ThreadLocal<Boolean>();
- private static ThreadLocal<CamelContext> threadCamelContext
- = new ThreadLocal<CamelContext>();
+ private static ThreadLocal<ModelCamelContext> threadCamelContext
+ = new ThreadLocal<ModelCamelContext>();
private static ThreadLocal<ProducerTemplate> threadTemplate
= new ThreadLocal<ProducerTemplate>();
private static ThreadLocal<ConsumerTemplate> threadConsumer
@@ -74,7 +75,7 @@ public abstract class CamelTestSupport e
private static ThreadLocal<Service> threadService
= new ThreadLocal<Service>();
- protected volatile CamelContext context;
+ protected volatile ModelCamelContext context;
protected volatile ProducerTemplate template;
protected volatile ConsumerTemplate consumer;
protected volatile Service camelContextService;
@@ -231,7 +232,12 @@ public abstract class CamelTestSupport e
enableJMX();
}
- context = createCamelContext();
+ CamelContext c2 = createCamelContext();
+ if (c2 instanceof ModelCamelContext) {
+ context = (ModelCamelContext)c2;
+ } else {
+ throw new Exception("Context must be a ModelCamelContext");
+ }
threadCamelContext.set(context);
assertNotNull(context, "No context found!");
Modified:
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java?rev=1179302&r1=1179301&r2=1179302&view=diff
==============================================================================
---
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
(original)
+++
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
Wed Oct 5 16:25:24 2011
@@ -43,6 +43,7 @@ import com.sun.jersey.api.view.Viewable;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.view.RouteDotGenerator;
@@ -92,7 +93,7 @@ public class RouteResource extends Camel
URI routesURI = null;
try {
routesURI = new URI("/routes");
- getCamelContext().removeRouteDefinition(route);
+
((ModelCamelContext)getCamelContext()).removeRouteDefinition(route);
return Response.seeOther(routesURI).build();
} catch (Exception e) {
LOG.error("failed to remove route " + id + ", error " +
e.getMessage());
@@ -153,7 +154,7 @@ public class RouteResource extends Camel
routeDefinition.setId(id);
// lets install the updated route
-
getCamelContext().addRouteDefinitions(Collections.singletonList(routeDefinition));
+
((ModelCamelContext)getCamelContext()).addRouteDefinitions(Collections.singletonList(routeDefinition));
}
/**
Modified:
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java?rev=1179302&r1=1179301&r2=1179302&view=diff
==============================================================================
---
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java
(original)
+++
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java
Wed Oct 5 16:25:24 2011
@@ -42,6 +42,7 @@ import javax.xml.bind.Unmarshaller;
import com.sun.jersey.api.view.Viewable;
import org.apache.camel.CamelContext;
+import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.RoutesDefinition;
import org.apache.camel.util.ObjectHelper;
@@ -175,7 +176,7 @@ public class RoutesResource extends Came
if (value instanceof RouteDefinition) {
RouteDefinition routeDefinition = (RouteDefinition)value;
// add the route
-
getCamelContext().addRouteDefinitions(Collections.singletonList(routeDefinition));
+
((ModelCamelContext)getCamelContext()).addRouteDefinitions(Collections.singletonList(routeDefinition));
return Response.seeOther(new URI("/routes")).build();
} else {
error = "Posted XML is not a route but is of type " +
ObjectHelper.className(value);
Modified:
camel/trunk/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java?rev=1179302&r1=1179301&r2=1179302&view=diff
==============================================================================
---
camel/trunk/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
(original)
+++
camel/trunk/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
Wed Oct 5 16:25:24 2011
@@ -188,9 +188,6 @@ public class XMLSecurityDataFormatTest e
final KeyStoreParameters tsParameters = new KeyStoreParameters();
tsParameters.setPassword("password");
tsParameters.setResource("sender.ts");
- String tsParametersId = "testTrustStoreParameters";
-
- Map<String, String> contextProps = context.getProperties();
context.addRoutes(new RouteBuilder() {
public void configure() {
Modified:
camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java?rev=1179302&r1=1179301&r2=1179302&view=diff
==============================================================================
---
camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java
(original)
+++
camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java
Wed Oct 5 16:25:24 2011
@@ -472,7 +472,7 @@ public class DotMojo extends AbstractMav
CommandLineUtils.StringStreamConsumer stdout = new
CommandLineUtils.StringStreamConsumer();
CommandLineUtils.StringStreamConsumer stderr = new
CommandLineUtils.StringStreamConsumer();
- int exitCode = CommandLineUtils.executeCommandLine(cl, stdout, stderr);
+ CommandLineUtils.executeCommandLine(cl, stdout, stderr);
String output = stdout.getOutput();
if (output.length() > 0) {
Modified:
camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java?rev=1179302&r1=1179301&r2=1179302&view=diff
==============================================================================
---
camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
(original)
+++
camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
Wed Oct 5 16:25:24 2011
@@ -522,6 +522,7 @@ public class RunMojo extends AbstractExe
}
}
+ @SuppressWarnings("deprecation")
private void terminateThreads(ThreadGroup threadGroup) {
long startTime = System.currentTimeMillis();
Set<Thread> uncooperativeThreads = new HashSet<Thread>(); // these
were not responsive
Modified:
camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/DotMojo.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/DotMojo.java?rev=1179302&r1=1179301&r2=1179302&view=diff
==============================================================================
---
camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/DotMojo.java
(original)
+++
camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/DotMojo.java
Wed Oct 5 16:25:24 2011
@@ -445,7 +445,7 @@ public class DotMojo extends AbstractMav
CommandLineUtils.StringStreamConsumer stdout = new
CommandLineUtils.StringStreamConsumer();
CommandLineUtils.StringStreamConsumer stderr = new
CommandLineUtils.StringStreamConsumer();
- int exitCode = CommandLineUtils.executeCommandLine(cl, stdout, stderr);
+ CommandLineUtils.executeCommandLine(cl, stdout, stderr);
String output = stdout.getOutput();
if (output.length() > 0) {
Modified:
camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java?rev=1179302&r1=1179301&r2=1179302&view=diff
==============================================================================
---
camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
(original)
+++
camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
Wed Oct 5 16:25:24 2011
@@ -476,6 +476,7 @@ public class RunMojo extends AbstractExe
}
}
+ @SuppressWarnings("deprecation")
private void terminateThreads(ThreadGroup threadGroup) {
long startTime = System.currentTimeMillis();
Set<Thread> uncooperativeThreads = new HashSet<Thread>(); // these
were not responsive
