You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/01/18 18:23:26 UTC
svn commit: r1232961 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/model/
camel-core/src/test/java/org/apache/camel/component/bean/
camel-core/src/test/java/org/apache/camel/management/
components/camel-bam/src/main/java/org/apache/camel...
Author: bvahdat
Date: Wed Jan 18 17:23:25 2012
New Revision: 1232961
URL: http://svn.apache.org/viewvc?rev=1232961&view=rev
Log:
CAMEL-4899: Removal of "the unused" and avoidance of unused imports, obsolete casts and deprecated API usages. Also set serialVersionUID class field explicitly to 1L by the Serializable classes (however only by the unit-testing relevant classes)
Removed:
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConfigurationTest.java.orig
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpProcessStrategyFactory.java
camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/list/HazelcastListProducer.java
camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapProducer.java
camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapProducer.java
camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpoint.java
camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComputeProducer.java
camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/AuthTokenLoginFailureTest.java
camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrNodePathCreationTest.java
camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java
camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java
camel/trunk/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Component.java
camel/trunk/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Consumer.java
camel/trunk/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint5Test.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTcclTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/MyException.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/SimpleObject.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/SomeObject.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java Wed Jan 18 17:23:25 2012
@@ -106,7 +106,7 @@ public class TryDefinition extends Outpu
// this method is introduced to avoid compiler warnings about the
// generic Class arrays in the case we've got only one single Class
// to build a TryDefinition for
- return doCatch((Class<? extends Throwable>[])new Class[] {exceptionType});
+ return doCatch(new Class[] {exceptionType});
}
/**
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureTest.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureTest.java Wed Jan 18 17:23:25 2012
@@ -29,7 +29,6 @@ public class ProxyReturnFutureTest exten
// START SNIPPET: e2
public void testFutureEcho() throws Exception {
- @SuppressWarnings("unchecked")
Echo service = ProxyHelper.createProxy(context.getEndpoint("direct:echo"), Echo.class);
Future<String> future = service.asText(4);
@@ -44,7 +43,6 @@ public class ProxyReturnFutureTest exten
// END SNIPPET: e2
public void testFutureEchoCallTwoTimes() throws Exception {
- @SuppressWarnings("unchecked")
Echo service = ProxyHelper.createProxy(context.getEndpoint("direct:echo"), Echo.class);
Future<String> future = service.asText(4);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java Wed Jan 18 17:23:25 2012
@@ -49,7 +49,7 @@ public class JmxInstrumentationOnlyRegis
s = server.queryNames(new ObjectName(domainName + ":type=processors,*"), null);
assertEquals("Could not find 1 processor: " + s, 1, s.size());
// should be mock foo
- ObjectName on = (ObjectName) s.iterator().next();
+ ObjectName on = s.iterator().next();
String id = (String) server.getAttribute(on, "ProcessorId");
assertEquals("myfoo", id);
Modified: camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java (original)
+++ camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java Wed Jan 18 17:23:25 2012
@@ -50,7 +50,7 @@ public class TemporalRule extends Servic
private long expectedMillis;
private long overdueMillis;
private Processor overdueAction;
- private OutputDefinition overdueProcessors = new OutputDefinition();
+ private OutputDefinition<?> overdueProcessors = new OutputDefinition();
public TemporalRule(TimeExpression first, TimeExpression second) {
this.first = first;
@@ -66,11 +66,11 @@ public class TemporalRule extends Servic
return this;
}
- public OutputDefinition errorIfOver(Time builder) {
+ public OutputDefinition<?> errorIfOver(Time builder) {
return errorIfOver(builder.toMillis());
}
- public OutputDefinition errorIfOver(long millis) {
+ public OutputDefinition<?> errorIfOver(long millis) {
overdueMillis = millis;
return overdueProcessors;
}
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpProcessStrategyFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpProcessStrategyFactory.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpProcessStrategyFactory.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpProcessStrategyFactory.java Wed Jan 18 17:23:25 2012
@@ -47,7 +47,7 @@ public final class FtpProcessStrategyFac
if (isDelete) {
GenericFileDeleteProcessStrategy<FTPFile> strategy = new GenericFileDeleteProcessStrategy<FTPFile>();
- strategy.setExclusiveReadLockStrategy((GenericFileExclusiveReadLockStrategy<FTPFile>) getExclusiveReadLockStrategy(params));
+ strategy.setExclusiveReadLockStrategy(getExclusiveReadLockStrategy(params));
if (preMoveExpression != null) {
GenericFileExpressionRenamer<FTPFile> renamer = new GenericFileExpressionRenamer<FTPFile>();
renamer.setExpression(preMoveExpression);
@@ -61,7 +61,7 @@ public final class FtpProcessStrategyFac
return strategy;
} else if (isMove || isNoop) {
GenericFileRenameProcessStrategy<FTPFile> strategy = new GenericFileRenameProcessStrategy<FTPFile>();
- strategy.setExclusiveReadLockStrategy((GenericFileExclusiveReadLockStrategy<FTPFile>) getExclusiveReadLockStrategy(params));
+ strategy.setExclusiveReadLockStrategy(getExclusiveReadLockStrategy(params));
if (!isNoop && moveExpression != null) {
// move on commit is only possible if not noop
GenericFileExpressionRenamer<FTPFile> renamer = new GenericFileExpressionRenamer<FTPFile>();
@@ -84,7 +84,7 @@ public final class FtpProcessStrategyFac
} else {
// default strategy will do nothing
GenericFileNoOpProcessStrategy<FTPFile> strategy = new GenericFileNoOpProcessStrategy<FTPFile>();
- strategy.setExclusiveReadLockStrategy((GenericFileExclusiveReadLockStrategy<FTPFile>) getExclusiveReadLockStrategy(params));
+ strategy.setExclusiveReadLockStrategy(getExclusiveReadLockStrategy(params));
return strategy;
}
}
Modified: camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/list/HazelcastListProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/list/HazelcastListProducer.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/list/HazelcastListProducer.java (original)
+++ camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/list/HazelcastListProducer.java Wed Jan 18 17:23:25 2012
@@ -35,11 +35,9 @@ public class HazelcastListProducer exten
private final IList<Object> list;
private final HazelcastComponentHelper helper = new HazelcastComponentHelper();
- private HazelcastInstance hazelcastInstance;
public HazelcastListProducer(HazelcastInstance hazelcastInstance, Endpoint endpoint, String listName) {
super(endpoint);
- this.hazelcastInstance = hazelcastInstance;
this.list = hazelcastInstance.getList(listName);
}
Modified: camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapProducer.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapProducer.java (original)
+++ camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapProducer.java Wed Jan 18 17:23:25 2012
@@ -32,11 +32,9 @@ public class HazelcastMapProducer extend
private final IMap<String, Object> cache;
private final HazelcastComponentHelper helper = new HazelcastComponentHelper();
- private HazelcastInstance hazelcastInstance;
public HazelcastMapProducer(HazelcastInstance hazelcastInstance, HazelcastMapEndpoint endpoint, String cacheName) {
super(endpoint);
- this.hazelcastInstance = hazelcastInstance;
this.cache = hazelcastInstance.getMap(cacheName);
}
Modified: camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapProducer.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapProducer.java (original)
+++ camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapProducer.java Wed Jan 18 17:23:25 2012
@@ -32,11 +32,9 @@ public class HazelcastMultimapProducer e
private final MultiMap<Object, Object> cache;
private final HazelcastComponentHelper helper = new HazelcastComponentHelper();
- private HazelcastInstance hazelcastInstance;
public HazelcastMultimapProducer(HazelcastInstance hazelcastInstance, Endpoint endpoint, String cacheName) {
super(endpoint);
- this.hazelcastInstance = hazelcastInstance;
this.cache = Hazelcast.getMultiMap(cacheName);
}
Modified: camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java (original)
+++ camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java Wed Jan 18 17:23:25 2012
@@ -34,11 +34,9 @@ public class HazelcastQueueProducer exte
private IQueue<Object> queue;
private HazelcastComponentHelper helper = new HazelcastComponentHelper();
- private HazelcastInstance hazelcastInstance;
public HazelcastQueueProducer(HazelcastInstance hazelcastInstance, Endpoint endpoint, String queueName) {
super(endpoint);
- this.hazelcastInstance = hazelcastInstance;
this.queue = hazelcastInstance.getQueue(queueName);
}
Modified: camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpoint.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpoint.java (original)
+++ camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpoint.java Wed Jan 18 17:23:25 2012
@@ -34,11 +34,9 @@ public class HazelcastSedaEndpoint exten
private final BlockingQueue<Object> queue;
private final HazelcastSedaConfiguration configuration;
- private HazelcastInstance hazelcastInstance;
public HazelcastSedaEndpoint(final HazelcastInstance hazelcastInstance, final String uri, final HazelcastComponent component, final HazelcastSedaConfiguration configuration) {
super(component.getHazelcastInstance(), uri, component);
- this.hazelcastInstance = hazelcastInstance;
this.queue = hazelcastInstance.getQueue(configuration.getQueueName());
this.configuration = configuration;
if (ObjectHelper.isEmpty(configuration.getQueueName())) {
Modified: camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComputeProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComputeProducer.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComputeProducer.java (original)
+++ camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComputeProducer.java Wed Jan 18 17:23:25 2012
@@ -200,9 +200,6 @@ public class JcloudsComputeProducer exte
*/
public Predicate<ComputeMetadata> getComputePredicate(final Exchange exchange) {
final String nodeId = getNodeId(exchange);
- final String imageId = getImageId(exchange);
- final String group = getGroup(exchange);
- final NodeState queryState = getNodeState(exchange);
Predicate<ComputeMetadata> predicate = new Predicate<ComputeMetadata>() {
public boolean apply(ComputeMetadata metadata) {
Modified: camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/AuthTokenLoginFailureTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/AuthTokenLoginFailureTest.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/AuthTokenLoginFailureTest.java (original)
+++ camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/AuthTokenLoginFailureTest.java Wed Jan 18 17:23:25 2012
@@ -38,7 +38,7 @@ public class AuthTokenLoginFailureTest e
Session session = getRepository().login(
new SimpleCredentials("admin", "admin".toCharArray()));
try {
- Node node = session.getNodeByUUID(uuid);
+ Node node = session.getNodeByIdentifier(uuid);
assertNotNull(node);
assertEquals(BASE_REPO_PATH + "/node", node.getPath());
} finally {
Modified: camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrNodePathCreationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrNodePathCreationTest.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrNodePathCreationTest.java (original)
+++ camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrNodePathCreationTest.java Wed Jan 18 17:23:25 2012
@@ -49,7 +49,7 @@ public class JcrNodePathCreationTest ext
assertNotNull("Out body was null; expected JCR node UUID", uuid);
Session session = repository.login(new SimpleCredentials("user", "pass".toCharArray()));
try {
- Node node = session.getNodeByUUID(uuid);
+ Node node = session.getNodeByIdentifier(uuid);
assertNotNull(node);
assertEquals("/home/test/node/with/path", node.getPath());
} finally {
Modified: camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java (original)
+++ camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java Wed Jan 18 17:23:25 2012
@@ -29,7 +29,6 @@ import javax.persistence.Query;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.ShutdownRunningTask;
import org.apache.camel.impl.ScheduledBatchPollingConsumer;
import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
Modified: camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java (original)
+++ camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java Wed Jan 18 17:23:25 2012
@@ -93,7 +93,7 @@ public class LuceneIndexAndQueryProducer
@Test
public void testLuceneIndexProducer() throws Exception {
- MockEndpoint mockEndpoint = new MockEndpoint("mock:result");
+ MockEndpoint mockEndpoint = getMockEndpoint("mock:result");
context.stop();
context.addRoutes(new RouteBuilder() {
@@ -120,7 +120,7 @@ public class LuceneIndexAndQueryProducer
@Test
public void testLucenePhraseQueryProducer() throws Exception {
- MockEndpoint mockSearchEndpoint = new MockEndpoint("mock:searchResult");
+ MockEndpoint mockSearchEndpoint = getMockEndpoint("mock:searchResult");
context.stop();
context.addRoutes(new RouteBuilder() {
@@ -159,7 +159,7 @@ public class LuceneIndexAndQueryProducer
@Test
public void testLuceneWildcardQueryProducer() throws Exception {
- MockEndpoint mockSearchEndpoint = new MockEndpoint("mock:searchResult");
+ MockEndpoint mockSearchEndpoint = getMockEndpoint("mock:searchResult");
context.stop();
context.addRoutes(new RouteBuilder() {
Modified: camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java (original)
+++ camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java Wed Jan 18 17:23:25 2012
@@ -54,7 +54,7 @@ public class LuceneQueryProcessorTest ex
@Test
public void testPhraseSearcher() throws Exception {
final StandardAnalyzer analyzer = new StandardAnalyzer(Version.LUCENE_30);
- MockEndpoint mockSearchEndpoint = new MockEndpoint("mock:searchResult");
+ MockEndpoint mockSearchEndpoint = getMockEndpoint("mock:searchResult");
context.stop();
context.addRoutes(new RouteBuilder() {
@@ -98,7 +98,7 @@ public class LuceneQueryProcessorTest ex
@Test
public void testWildcardSearcher() throws Exception {
final SimpleAnalyzer analyzer = new SimpleAnalyzer();
- MockEndpoint mockSearchEndpoint = new MockEndpoint("mock:searchResult");
+ MockEndpoint mockSearchEndpoint = getMockEndpoint("mock:searchResult");
context.stop();
context.addRoutes(new RouteBuilder() {
Modified: camel/trunk/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Component.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Component.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Component.java (original)
+++ camel/trunk/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Component.java Wed Jan 18 17:23:25 2012
@@ -72,7 +72,6 @@ public class Mina2Component extends Defa
private Endpoint createEndpoint(String uri, Mina2Configuration config) throws Exception {
ObjectHelper.notNull(getCamelContext(), "camelContext");
- Endpoint endpoint;
String protocol = config.getProtocol();
// if mistyped uri then protocol can be null
Modified: camel/trunk/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Consumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Consumer.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Consumer.java (original)
+++ camel/trunk/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Consumer.java Wed Jan 18 17:23:25 2012
@@ -26,17 +26,14 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.impl.DefaultConsumer;
-import org.apache.camel.util.CamelLogger;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.IOHelper;
import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
import org.apache.mina.core.filterchain.IoFilter;
import org.apache.mina.core.service.IoAcceptor;
-import org.apache.mina.core.service.IoHandler;
import org.apache.mina.core.service.IoHandlerAdapter;
import org.apache.mina.core.service.IoService;
import org.apache.mina.core.session.IoSession;
-import org.apache.mina.core.session.IoSessionConfig;
import org.apache.mina.filter.codec.ProtocolCodecFactory;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.codec.serialization.ObjectSerializationCodecFactory;
@@ -61,15 +58,11 @@ public class Mina2Consumer extends Defau
private static final transient Logger LOG = LoggerFactory.getLogger(Mina2Consumer.class);
private SocketAddress address;
private IoAcceptor acceptor;
- private CamelLogger noReplyLogger;
private Mina2Configuration configuration;
- private IoSessionConfig acceptorConfig;
- private boolean sync;
public Mina2Consumer(final Mina2Endpoint endpoint, Processor processor) {
super(endpoint, processor);
this.configuration = endpoint.getConfiguration();
- this.noReplyLogger = new CamelLogger(LOG, configuration.getNoReplyLogLevel());
//
// All mina2 endpoints are InOut. The endpoints are asynchronous.
// Endpoints can send "n" messages and receive "m" messages.
@@ -90,8 +83,7 @@ public class Mina2Consumer extends Defau
protected void doStart() throws Exception {
super.doStart();
- IoHandler handler = new ReceiveHandler();
- acceptor.setHandler(handler);
+ acceptor.setHandler(new ReceiveHandler());
acceptor.bind(address);
LOG.info("Bound to server address: {} using acceptor: {}", address, acceptor);
}
@@ -124,7 +116,6 @@ public class Mina2Consumer extends Defau
protected void createSocketEndpoint(String uri, Mina2Configuration configuration) {
LOG.debug("createSocketEndpoint");
boolean minaLogger = configuration.isMinaLogger();
- long timeout = configuration.getTimeout();
List<IoFilter> filters = configuration.getFilters();
address = new InetSocketAddress(configuration.getHost(), configuration.getPort());
@@ -133,7 +124,6 @@ public class Mina2Consumer extends Defau
new NioProcessor(this.getEndpoint().getCamelContext().getExecutorServiceManager().newDefaultThreadPool(this, "MinaSocketAcceptor")));
// acceptor connectorConfig
- acceptorConfig = acceptor.getSessionConfig();
configureCodecFactory("Mina2Consumer", acceptor, configuration);
((NioSocketAcceptor) acceptor).setReuseAddress(true);
acceptor.setCloseOnDeactivation(true);
@@ -181,14 +171,12 @@ public class Mina2Consumer extends Defau
protected void createDatagramEndpoint(String uri, Mina2Configuration configuration) {
boolean minaLogger = configuration.isMinaLogger();
- long timeout = configuration.getTimeout();
List<IoFilter> filters = configuration.getFilters();
address = new InetSocketAddress(configuration.getHost(), configuration.getPort());
acceptor = new NioDatagramAcceptor(this.getEndpoint().getCamelContext().getExecutorServiceManager().newDefaultThreadPool(this, "MinaDatagramAcceptor"));
// acceptor connectorConfig
- acceptorConfig = acceptor.getSessionConfig();
configureDataGramCodecFactory("MinaConsumer", acceptor, configuration);
acceptor.setCloseOnDeactivation(true);
// reuse address is default true for datagram
Modified: camel/trunk/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java (original)
+++ camel/trunk/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java Wed Jan 18 17:23:25 2012
@@ -17,28 +17,18 @@
package org.apache.camel.component.solr;
import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultProducer;
-import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServer;
-import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.request.ContentStreamUpdateRequest;
import org.apache.solr.client.solrj.request.UpdateRequest;
-import org.apache.solr.client.solrj.response.QueryResponse;
-import org.apache.solr.common.SolrDocument;
-import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.SolrInputDocument;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* The Solr producer.
*/
public class SolrProducer extends DefaultProducer {
- private static final transient Logger LOG = LoggerFactory.getLogger(SolrProducer.class);
private SolrServer solrServer;
private SolrServer streamingSolrServer;
Modified: camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java (original)
+++ camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java Wed Jan 18 17:23:25 2012
@@ -145,7 +145,7 @@ public class XmppEndpoint extends Defaul
return true;
}
});
- connection.addPacketWriterListener(new XmppLogger("OUTBOUND"), new PacketFilter() {
+ connection.addPacketSendingListener(new XmppLogger("OUTBOUND"), new PacketFilter() {
public boolean accept(Packet packet) {
return true;
}
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java Wed Jan 18 17:23:25 2012
@@ -45,7 +45,6 @@ public class CamelBlueprint2Test extends
public void testEndpointInjection() throws Exception {
getInstalledBundle("CamelBlueprintTestBundle10").start();
BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle10)", 10000);
- CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle10)", 10000);
Object producer = ctn.getComponentInstance("producer");
assertNotNull(producer);
assertEquals(TestProducer.class.getName(), producer.getClass().getName());
@@ -56,7 +55,6 @@ public class CamelBlueprint2Test extends
@Test
public void testRouteContext() throws Exception {
getInstalledBundle("CamelBlueprintTestBundle11").start();
- BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle11)", 10000);
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle11)", 10000);
assertEquals(3, ctx.getRoutes().size());
}
@@ -66,7 +64,6 @@ public class CamelBlueprint2Test extends
public void testProxy() throws Exception {
getInstalledBundle("CamelBlueprintTestBundle12").start();
BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle12)", 10000);
- CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle12)", 10000);
Object proxy = ctn.getComponentInstance("myProxySender");
assertNotNull(proxy);
assertEquals(1, proxy.getClass().getInterfaces().length);
@@ -76,7 +73,6 @@ public class CamelBlueprint2Test extends
@Test
public void testErrorHandler() throws Exception {
getInstalledBundle("CamelBlueprintTestBundle14").start();
- BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle14)", 10000);
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle14)", 10000);
assertEquals(1, ctx.getRoutes().size());
RouteDefinition rd = ctx.getRouteDefinitions().get(0);
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java Wed Jan 18 17:23:25 2012
@@ -47,7 +47,6 @@ public class CamelBlueprint3Test extends
@Test
public void testRouteWithInterceptStrategy() throws Exception {
getInstalledBundle("CamelBlueprintTestBundle7").start();
- BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle7)", 10000);
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle7)", 10000);
assertEquals(1, ctx.getRoutes().size());
assertEquals(1, ctx.getInterceptStrategies().size());
@@ -57,7 +56,6 @@ public class CamelBlueprint3Test extends
@Test
public void testComponentProperties() throws Exception {
getInstalledBundle("CamelBlueprintTestBundle8").start();
- BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle8)", 10000);
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle8)", 10000);
assertEquals(1, ctx.getRoutes().size());
assertEquals("direct://start", ctx.getRoutes().get(0).getEndpoint().getEndpointUri());
@@ -66,7 +64,6 @@ public class CamelBlueprint3Test extends
@Test
public void testRouteBuilderRef() throws Exception {
getInstalledBundle("CamelBlueprintTestBundle9").start();
- BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle9)", 10000);
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle9)", 10000);
assertEquals(1, ctx.getRoutes().size());
}
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java Wed Jan 18 17:23:25 2012
@@ -41,7 +41,6 @@ public class CamelBlueprint4Test extends
@Test
public void testRouteWithXSLT() throws Exception {
getInstalledBundle("CamelBlueprintTestBundle19").start();
- BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle19)", 10000);
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle19)", 10000);
ProducerTemplate template = ctx.createProducerTemplate();
@@ -59,7 +58,6 @@ public class CamelBlueprint4Test extends
@Test
public void testRouteWithVelocity() throws Exception {
getInstalledBundle("CamelBlueprintTestBundle20").start();
- BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle20)", 10000);
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle20)", 10000);
ProducerTemplate template = ctx.createProducerTemplate();
@@ -71,7 +69,6 @@ public class CamelBlueprint4Test extends
@Test
public void testSetHeaderXPathResultType() throws Exception {
getInstalledBundle("CamelBlueprintTestBundle21").start();
- BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle21)", 10000);
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle21)", 10000);
ProducerTemplate template = ctx.createProducerTemplate();
@@ -92,7 +89,6 @@ public class CamelBlueprint4Test extends
@Test
public void testGetApplicationContextClassloader() throws Exception {
getInstalledBundle("CamelBlueprintTestBundle22").start();
- BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle22)", 10000);
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle22)", 10000);
// test the application context classloader
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint5Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint5Test.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint5Test.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint5Test.java Wed Jan 18 17:23:25 2012
@@ -25,7 +25,6 @@ import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.osgi.framework.Constants;
-import org.osgi.service.blueprint.container.BlueprintContainer;
import static org.ops4j.pax.exam.OptionUtils.combine;
import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
@@ -40,7 +39,6 @@ public class CamelBlueprint5Test extends
@Test
public void testTryCatch() throws Exception {
getInstalledBundle("CamelBlueprintTestBundle23").start();
- BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle23)", 10000);
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle23)", 10000);
ProducerTemplate template = ctx.createProducerTemplate();
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTcclTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTcclTest.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTcclTest.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTcclTest.java Wed Jan 18 17:23:25 2012
@@ -30,7 +30,6 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
-import org.osgi.service.blueprint.container.BlueprintContainer;
import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.felix;
@@ -52,7 +51,6 @@ public class CamelBlueprintTcclTest exte
@Test
public void testCorrectTcclSetForRoutes() throws Exception {
- BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTcclTestBundle)", 10000);
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTcclTestBundle)", 10000);
assertBundleDelegatingClassLoader(ctx.getApplicationContextClassLoader());
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/MyException.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/MyException.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/MyException.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/MyException.java Wed Jan 18 17:23:25 2012
@@ -21,6 +21,8 @@ package org.apache.camel.itest.osgi.blue
*/
public class MyException extends Exception {
+ private static final long serialVersionUID = 1L;
+
public MyException() {
}
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java Wed Jan 18 17:23:25 2012
@@ -36,7 +36,6 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
-import org.osgi.service.blueprint.container.BlueprintContainer;
import static org.ops4j.pax.exam.CoreOptions.felix;
import static org.ops4j.pax.exam.OptionUtils.combine;
import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
@@ -66,9 +65,7 @@ public class BlobStoreBlueprintRouteTest
@Test
public void testProducerAndConsumer() throws Exception {
- BlobStore blobStore = getOsgiService(BlobStore.class);
getInstalledBundle("CamelBlueprintJcloudsTestBundle").start();
- BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintJcloudsTestBundle)", 20000);
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintJcloudsTestBundle)", 20000);
MockEndpoint mock = ctx.getEndpoint("mock:results", MockEndpoint.class);
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/SimpleObject.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/SimpleObject.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/SimpleObject.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/SimpleObject.java Wed Jan 18 17:23:25 2012
@@ -20,6 +20,8 @@ package org.apache.camel.itest.osgi.jclo
import java.io.Serializable;
public class SimpleObject implements Serializable {
+
+ private static final long serialVersionUID = 1L;
private String id;
private String value;
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java Wed Jan 18 17:23:25 2012
@@ -30,7 +30,6 @@ import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.osgi.framework.Constants;
-import org.osgi.service.blueprint.container.BlueprintContainer;
//import static org.ops4j.pax.exam.CoreOptions.equinox;
//import static org.ops4j.pax.exam.CoreOptions.felix;
@@ -45,7 +44,6 @@ public class JpaBlueprintRouteTest exten
@Test
public void testBlueprintRouteJpa() throws Exception {
getInstalledBundle("CamelBlueprintJpaTestBundle").start();
- BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintJpaTestBundle)", 30000);
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintJpaTestBundle)", 20000);
MockEndpoint mock = ctx.getEndpoint("mock:result", MockEndpoint.class);
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java Wed Jan 18 17:23:25 2012
@@ -32,7 +32,6 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
-import org.osgi.service.blueprint.container.BlueprintContainer;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
import static org.ops4j.pax.exam.OptionUtils.combine;
@@ -50,7 +49,6 @@ public class KratiBlueprintRouteTest ext
@Test
public void testProducerConsumerAndIdempotent() throws Exception {
getInstalledBundle("CamelBlueprintKratiTestBundle").start();
- BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintKratiTestBundle)", 20000);
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintKratiTestBundle)", 20000);
MockEndpoint mock = ctx.getEndpoint("mock:results", MockEndpoint.class);
ProducerTemplate template = ctx.createProducerTemplate();
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/SomeObject.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/SomeObject.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/SomeObject.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/SomeObject.java Wed Jan 18 17:23:25 2012
@@ -20,6 +20,8 @@ package org.apache.camel.itest.osgi.krat
import java.io.Serializable;
public class SomeObject implements Serializable {
+
+ private static final long serialVersionUID = 1L;
private String id;
private String value;
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java Wed Jan 18 17:23:25 2012
@@ -56,7 +56,6 @@ public class SqlBlueprintRoute extends O
@Test
public void testListBody() throws Exception {
getInstalledBundle("CamelBlueprintSqlTestBundle").start();
- BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintSqlTestBundle)", 10000);
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintSqlTestBundle)", 10000);
MockEndpoint mock = ctx.getEndpoint("mock:result", MockEndpoint.class);
@@ -81,10 +80,8 @@ public class SqlBlueprintRoute extends O
@Test
public void testLowNumberOfParameter() throws Exception {
getInstalledBundle("CamelBlueprintSqlTestBundle").start();
- BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintSqlTestBundle)", 10000);
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintSqlTestBundle)", 10000);
- MockEndpoint mock = ctx.getEndpoint("mock:result", MockEndpoint.class);
try {
ProducerTemplate template = ctx.createProducerTemplate();
template.sendBody("direct:list", "ASF");
@@ -99,7 +96,6 @@ public class SqlBlueprintRoute extends O
@Test
public void testInsert() throws Exception {
getInstalledBundle("CamelBlueprintSqlTestBundle").start();
- BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintSqlTestBundle)", 10000);
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintSqlTestBundle)", 10000);
DataSource ds = getOsgiService(DataSource.class, 10000);
JdbcTemplate jdbcTemplate = new JdbcTemplate(ds);
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java?rev=1232961&r1=1232960&r2=1232961&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java Wed Jan 18 17:23:25 2012
@@ -44,7 +44,6 @@ public class XstreamBlueprintRouteTest e
@Test
public void testUnmarshal() throws Exception {
getInstalledBundle("CamelBlueprintXstreamTestBundle").start();
- BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintXstreamTestBundle)", 10000);
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintXstreamTestBundle)", 10000);
MockEndpoint mock = ctx.getEndpoint("mock:result", MockEndpoint.class);