Author: bvahdat
Date: Thu Jan 19 22:41:41 2012
New Revision: 1233618
URL: http://svn.apache.org/viewvc?rev=1233618&view=rev
Log:
Polished
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/validator/DefaultLSResourceResolver.java
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionClauseTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureExceptionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TryCatchMustHaveExceptionConfiguredTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TryProcessorMultipleExceptionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TryProcessorOnWhenTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionMisconfiguredTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionsPerRouteTest.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreConsumer.java
camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrProducer.java
camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteTest.java
camel/trunk/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Producer.java
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SpringMultipleUDPTest.java
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpTest.java
camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.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/CamelBlueprintManagedNamePatternFixedTest.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/syslog/SyslogTest.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/component/validator/DefaultLSResourceResolver.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/validator/DefaultLSResourceResolver.java?rev=1233618&r1=1233617&r2=1233618&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/validator/DefaultLSResourceResolver.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/validator/DefaultLSResourceResolver.java
Thu Jan 19 22:41:41 2012
@@ -34,35 +34,29 @@ import org.apache.camel.util.ResourceHel
public class DefaultLSResourceResolver implements LSResourceResolver {
private final CamelContext camelContext;
- private final String resourceUri;
private final String resourcePath;
public DefaultLSResourceResolver(CamelContext camelContext, String
resourceUri) {
this.camelContext = camelContext;
- this.resourceUri = resourceUri;
this.resourcePath = FileUtil.onlyPath(resourceUri);
}
@Override
public LSInput resolveResource(String type, String namespaceURI, String
publicId, String systemId, String baseURI) {
- return new DefaultLSInput(baseURI, namespaceURI, publicId, systemId,
type);
+ return new DefaultLSInput(publicId, systemId, baseURI);
}
private final class DefaultLSInput implements LSInput {
- private final String type;
- private final String namespaceURI;
private final String publicId;
private final String systemId;
private final String baseURI;
private final String uri;
- private DefaultLSInput(String type, String namespaceURI, String
publicId, String systemId, String baseURI) {
- this.baseURI = baseURI;
- this.namespaceURI = namespaceURI;
+ private DefaultLSInput(String publicId, String systemId, String
baseURI) {
this.publicId = publicId;
this.systemId = systemId;
- this.type = type;
+ this.baseURI = baseURI;
if (resourcePath != null) {
uri = resourcePath + "/" + systemId;
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java?rev=1233618&r1=1233617&r2=1233618&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java
Thu Jan 19 22:41:41 2012
@@ -160,6 +160,7 @@ public class ExceptionBuilderTest extend
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
+ @SuppressWarnings("unchecked")
public void configure() throws Exception {
errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0).maximumRedeliveries(3));
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionClauseTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionClauseTest.java?rev=1233618&r1=1233617&r2=1233618&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionClauseTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionClauseTest.java
Thu Jan 19 22:41:41 2012
@@ -24,13 +24,9 @@ import javax.activation.FileDataSource;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
-import org.apache.camel.ExchangePattern;
import org.apache.camel.Message;
import org.apache.camel.Processor;
-import org.apache.camel.component.bean.pojomessage.Person;
-import
org.apache.camel.component.bean.pojomessage.PojoProxyHelperRequestReplyTest.PersonHandler;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.util.ObjectHelper;
/**
* @version
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureExceptionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureExceptionTest.java?rev=1233618&r1=1233617&r2=1233618&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureExceptionTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureExceptionTest.java
Thu Jan 19 22:41:41 2012
@@ -29,7 +29,6 @@ import org.apache.camel.builder.RouteBui
public class ProxyReturnFutureExceptionTest extends ContextTestSupport {
public void testFutureEchoException() 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/processor/TryCatchMustHaveExceptionConfiguredTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TryCatchMustHaveExceptionConfiguredTest.java?rev=1233618&r1=1233617&r2=1233618&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TryCatchMustHaveExceptionConfiguredTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TryCatchMustHaveExceptionConfiguredTest.java
Thu Jan 19 22:41:41 2012
@@ -28,6 +28,7 @@ public class TryCatchMustHaveExceptionCo
public void testTryCatchMustHaveExceptionConfigured() throws Exception {
context.addRoutes(new RouteBuilder() {
@Override
+ @SuppressWarnings("unchecked")
public void configure() throws Exception {
from("direct:a")
.doTry()
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TryProcessorMultipleExceptionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TryProcessorMultipleExceptionTest.java?rev=1233618&r1=1233617&r2=1233618&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TryProcessorMultipleExceptionTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TryProcessorMultipleExceptionTest.java
Thu Jan 19 22:41:41 2012
@@ -58,8 +58,10 @@ public class TryProcessorMultipleExcepti
assertMockEndpointsSatisfied();
}
+ @Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
+ @SuppressWarnings("unchecked")
public void configure() {
// START SNIPPET: e1
from("direct:start")
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TryProcessorOnWhenTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TryProcessorOnWhenTest.java?rev=1233618&r1=1233617&r2=1233618&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TryProcessorOnWhenTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TryProcessorOnWhenTest.java
Thu Jan 19 22:41:41 2012
@@ -90,6 +90,8 @@ public class TryProcessorOnWhenTest exte
assertMockEndpointsSatisfied();
}
+ @Override
+ @SuppressWarnings("unchecked")
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionMisconfiguredTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionMisconfiguredTest.java?rev=1233618&r1=1233617&r2=1233618&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionMisconfiguredTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionMisconfiguredTest.java
Thu Jan 19 22:41:41 2012
@@ -72,6 +72,7 @@ public class OnExceptionMisconfiguredTes
public void testOnExceptionMisconfigured3() throws Exception {
context.addRoutes(new RouteBuilder() {
@Override
+ @SuppressWarnings("unchecked")
public void configure() throws Exception {
onException();
@@ -90,6 +91,7 @@ public class OnExceptionMisconfiguredTes
public void testOnExceptionMisconfigured4() throws Exception {
context.addRoutes(new RouteBuilder() {
@Override
+ @SuppressWarnings("unchecked")
public void configure() throws Exception {
onException().end();
@@ -108,6 +110,7 @@ public class OnExceptionMisconfiguredTes
public void testOnExceptionMisconfigured5() throws Exception {
context.addRoutes(new RouteBuilder() {
@Override
+ @SuppressWarnings("unchecked")
public void configure() throws Exception {
from("direct:start")
@@ -127,6 +130,7 @@ public class OnExceptionMisconfiguredTes
public void testOnExceptionNotMisconfigured() throws Exception {
context.addRoutes(new RouteBuilder() {
@Override
+ @SuppressWarnings("unchecked")
public void configure() throws Exception {
onException().handled(true);
@@ -140,6 +144,7 @@ public class OnExceptionMisconfiguredTes
public void testOnExceptionNotMisconfigured2() throws Exception {
context.addRoutes(new RouteBuilder() {
@Override
+ @SuppressWarnings("unchecked")
public void configure() throws Exception {
onException().continued(true);
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionsPerRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionsPerRouteTest.java?rev=1233618&r1=1233617&r2=1233618&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionsPerRouteTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionsPerRouteTest.java
Thu Jan 19 22:41:41 2012
@@ -47,6 +47,7 @@ public class OnExceptionsPerRouteTest ex
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
+ @SuppressWarnings("unchecked")
public void configure() throws Exception {
from("direct:start")
.onException(IllegalArgumentException.class,
IOException.class)
Modified:
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java?rev=1233618&r1=1233617&r2=1233618&view=diff
==============================================================================
---
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
(original)
+++
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
Thu Jan 19 22:41:41 2012
@@ -21,7 +21,6 @@ import org.apache.camel.core.osgi.OsgiCa
import org.apache.camel.core.osgi.OsgiCamelContextNameStrategy;
import org.apache.camel.core.osgi.OsgiClassResolver;
import org.apache.camel.core.osgi.OsgiFactoryFinderResolver;
-import org.apache.camel.core.osgi.OsgiManagementNameStrategy;
import org.apache.camel.core.osgi.OsgiPackageScanClassResolver;
import org.apache.camel.core.osgi.OsgiTypeConverter;
import org.apache.camel.core.osgi.utils.BundleContextUtils;
Modified:
camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreConsumer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreConsumer.java?rev=1233618&r1=1233617&r2=1233618&view=diff
==============================================================================
---
camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreConsumer.java
(original)
+++
camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreConsumer.java
Thu Jan 19 22:41:41 2012
@@ -19,13 +19,9 @@ package org.apache.camel.component.jclou
import java.util.LinkedList;
import java.util.Queue;
-import org.apache.camel.BatchConsumer;
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.impl.ScheduledPollConsumer;
-import org.apache.camel.spi.ShutdownAware;
import org.apache.camel.spi.Synchronization;
import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
Modified:
camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrProducer.java?rev=1233618&r1=1233617&r2=1233618&view=diff
==============================================================================
---
camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrProducer.java
(original)
+++
camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrProducer.java
Thu Jan 19 22:41:41 2012
@@ -46,7 +46,7 @@ public class JcrProducer extends Default
}
node.addMixin("mix:referenceable");
session.save();
- exchange.getOut().setBody(node.getUUID());
+ exchange.getOut().setBody(node.getIdentifier());
} finally {
if (session != null && session.isLive()) {
session.logout();
Modified:
camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteTest.java?rev=1233618&r1=1233617&r2=1233618&view=diff
==============================================================================
---
camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteTest.java
(original)
+++
camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteTest.java
Thu Jan 19 22:41:41 2012
@@ -48,7 +48,7 @@ public class JcrRouteTest extends CamelT
String uuid = out.getOut().getBody(String.class);
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", node.getPath());
assertEquals("<hello>world!</hello>",
node.getProperty("my.contents.property").getString());
Modified:
camel/trunk/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Producer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Producer.java?rev=1233618&r1=1233617&r2=1233618&view=diff
==============================================================================
---
camel/trunk/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Producer.java
(original)
+++
camel/trunk/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Producer.java
Thu Jan 19 22:41:41 2012
@@ -237,7 +237,7 @@ public class Mina2Producer extends Defau
connector.getSessionConfig().setAll(connectorConfig);
}
- connector.setHandler(new ResponseHandler(getEndpoint()));
+ connector.setHandler(new ResponseHandler());
ConnectFuture future = connector.connect(address);
future.awaitUninterruptibly();
session = future.getSession();
@@ -439,15 +439,10 @@ public class Mina2Producer extends Defau
*/
private final class ResponseHandler extends IoHandlerAdapter {
- private Mina2Endpoint endpoint;
private Object message;
private Throwable cause;
private boolean messageReceived;
- private ResponseHandler(Mina2Endpoint endpoint) {
- this.endpoint = endpoint;
- }
-
public void reset() {
this.message = null;
this.cause = null;
Modified:
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SpringMultipleUDPTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SpringMultipleUDPTest.java?rev=1233618&r1=1233617&r2=1233618&view=diff
==============================================================================
---
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SpringMultipleUDPTest.java
(original)
+++
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SpringMultipleUDPTest.java
Thu Jan 19 22:41:41 2012
@@ -39,8 +39,6 @@ public class Mina2SpringMultipleUDPTest
MockEndpoint result = getMockEndpoint("mock:result");
result.expectedMessageCount(7);
- int fooValue = 15;
-
for (int i = 0; i < 7; i++) {
template.requestBody("myMinaEndpoint", "Hello World" + i + "\n");
}
Modified:
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java?rev=1233618&r1=1233617&r2=1233618&view=diff
==============================================================================
---
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java
(original)
+++
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java
Thu Jan 19 22:41:41 2012
@@ -130,7 +130,6 @@ public class Mina2UdpNoCamelTest {
* @param args The command line args.
*/
private final NioDatagramConnector connector;
- private IoSession session;
private DatagramSocket socket;
private InetAddress address;
private int localPort = 1234;
@@ -139,7 +138,6 @@ public class Mina2UdpNoCamelTest {
private UDPClient() {
connector = new NioDatagramConnector();
connector.getFilterChain().addLast("codec", new
ProtocolCodecFilter(codecFactory));
- //connector.getFilterChain().addLast("logger", new
LoggingFilter());
connector.setHandler(this);
}
@@ -147,8 +145,6 @@ public class Mina2UdpNoCamelTest {
public void connect(String host, int port) {
localPort = port;
localHost = host;
- session = connector.connect(new InetSocketAddress(localHost,
localPort)).awaitUninterruptibly().
- getSession();
try {
socket = new DatagramSocket();
address = InetAddress.getByName(localHost);
@@ -163,10 +159,6 @@ public class Mina2UdpNoCamelTest {
}
- public void send(String msg) {
- session.write(msg);
- }
-
public void sendNoMina(String msg) {
try {
DatagramPacket packet = new DatagramPacket(msg.getBytes(),
msg.getBytes().length,
Modified:
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpTest.java?rev=1233618&r1=1233617&r2=1233618&view=diff
==============================================================================
---
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpTest.java
(original)
+++
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpTest.java
Thu Jan 19 22:41:41 2012
@@ -66,15 +66,7 @@ public class Mina2UdpTest extends BaseMi
return new RouteBuilder() {
public void configure() {
- int port2 = getNextPort();
-
- //from("mina2:udp://127.0.0.1:" + getPort() +
"?sync=false").to("mina2:udp://127.0.0.1:" + port2 + "?sync=false");
- //from("mina2:udp://127.0.0.1:" + port2 +
"?sync=false").to("mock:result");
-
-
//from("mina2:udp://127.0.0.1:10111?sync=false").to("mina2:udp://127.0.0.1:10112?sync=false");
-
//from("mina2:udp://127.0.0.1:10112?sync=false").to("mock:result");
from("mina2:udp://127.0.0.1:10111?sync=false&minaLogger=true").to("mock:result");
- //from("mina2:udp://127.0.0.1:10111").to("mock:result");
}
};
}
Modified:
camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java?rev=1233618&r1=1233617&r2=1233618&view=diff
==============================================================================
---
camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
(original)
+++
camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
Thu Jan 19 22:41:41 2012
@@ -23,11 +23,12 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Dictionary;
import java.util.Enumeration;
import java.util.HashMap;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.jar.JarInputStream;
@@ -130,16 +131,16 @@ public abstract class CamelBlueprintTest
tracker.open(true);
// Note that the tracker is not closed to keep the reference
// This is buggy, as the service reference may change i think
- Object svc = type.cast(tracker.waitForService(timeout));
+ Object svc = tracker.waitForService(timeout);
if (svc == null) {
Dictionary<?, ?> dic = bundleContext.getBundle().getHeaders();
System.err.println("Test bundle headers: " + explode(dic));
- for (ServiceReference ref :
asCollection(bundleContext.getAllServiceReferences(null, null))) {
+ for (ServiceReference<?> ref :
asCollection(bundleContext.getAllServiceReferences(null, null))) {
System.err.println("ServiceReference: " + ref);
}
- for (ServiceReference ref :
asCollection(bundleContext.getAllServiceReferences(null, flt))) {
+ for (ServiceReference<?> ref :
asCollection(bundleContext.getAllServiceReferences(null, flt))) {
System.err.println("Filtered ServiceReference: " + ref);
}
@@ -153,8 +154,8 @@ public abstract class CamelBlueprintTest
}
}
- /*
- * Explode the dictionary into a ,-delimited list of key=value pairs
+ /**
+ * Explode the dictionary into a <code>,</code> delimited list of
<code>key=value</code> pairs.
*/
private static String explode(Dictionary<?, ?> dictionary) {
Enumeration<?> keys = dictionary.keys();
@@ -169,17 +170,11 @@ public abstract class CamelBlueprintTest
return result.toString();
}
- /*
- * Provides an iterable collection of references, even if the original
array is null
+ /**
+ * Provides an iterable collection of references, even if the original
array is <code>null</code>.
*/
- private static Collection<ServiceReference>
asCollection(ServiceReference[] references) {
- List<ServiceReference> result = new LinkedList<ServiceReference>();
- if (references != null) {
- for (ServiceReference reference : references) {
- result.add(reference);
- }
- }
- return result;
+ private static Collection<ServiceReference<?>>
asCollection(ServiceReference<?>[] references) {
+ return references == null ? new ArrayList<ServiceReference<?>>(0) :
Arrays.asList(references);
}
private BundleDescriptor getBundleDescriptor(String path, TinyBundle
bundle) throws Exception {
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=1233618&r1=1233617&r2=1233618&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
Thu Jan 19 22:41:41 2012
@@ -430,7 +430,6 @@ public abstract class CamelTestSupport e
return new JndiRegistry(createJndiContext());
}
- @SuppressWarnings("unchecked")
protected Context createJndiContext() throws Exception {
Properties properties = new Properties();
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=1233618&r1=1233617&r2=1233618&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
Thu Jan 19 22:41:41 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;
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintManagedNamePatternFixedTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintManagedNamePatternFixedTest.java?rev=1233618&r1=1233617&r2=1233618&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintManagedNamePatternFixedTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintManagedNamePatternFixedTest.java
Thu Jan 19 22:41:41 2012
@@ -28,7 +28,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;
@@ -43,7 +42,6 @@ public class CamelBlueprintManagedNamePa
@Test
public void testManagedNamePatternFixed() throws Exception {
getInstalledBundle("CamelBlueprintTestBundleFixed").start();
- BlueprintContainer ctn = getOsgiService(BlueprintContainer.class,
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundleFixed)", 10000);
CamelContext ctx = getOsgiService(CamelContext.class,
"(camel.context.symbolicname=CamelBlueprintTestBundleFixed)", 10000);
ProducerTemplate template = ctx.createProducerTemplate();
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=1233618&r1=1233617&r2=1233618&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
Thu Jan 19 22:41:41 2012
@@ -37,7 +37,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 org.springframework.dao.DataAccessException;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java?rev=1233618&r1=1233617&r2=1233618&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java
Thu Jan 19 22:41:41 2012
@@ -58,7 +58,6 @@ public class SyslogTest extends OSGiInte
mock.expectedMessageCount(1);
mock2.expectedMessageCount(1);
mock2.expectedBodiesReceived(message);
- DatagramSocket ds = new DatagramSocket();
DatagramSocket socket = new DatagramSocket();
try {
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=1233618&r1=1233617&r2=1233618&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
Thu Jan 19 22:41:41 2012
@@ -29,7 +29,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;
