You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2014/08/22 18:56:40 UTC
[1/4] git commit: Add better error message for test failure
Repository: camel
Updated Branches:
refs/heads/master 276bf38a1 -> 835a41edf
Add better error message for test failure
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3523fa17
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3523fa17
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3523fa17
Branch: refs/heads/master
Commit: 3523fa17eb6269568b0cddbef86535f6641b39ff
Parents: 133be33
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 22 12:50:03 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 22 12:56:10 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/camel/itest/osgi/core/seda/SedaTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3523fa17/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java
index 1be2d07..78e3214 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java
@@ -59,8 +59,8 @@ public class SedaTest extends OSGiIntegrationTestSupport {
assertNotSame(name1, name2);
String id = "" + bundleContext.getBundle().getBundleId();
- assertTrue(name1.startsWith(id));
- assertTrue(name2.startsWith(id));
+ assertTrue(name1 + " does not start with " + id, name1.startsWith(id));
+ assertTrue(name2 + " does not start with " + id, name2.startsWith(id));
}
}
\ No newline at end of file
[2/4] git commit: Get more of the osgi tests passing.
Posted by dk...@apache.org.
Get more of the osgi tests passing.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/133be338
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/133be338
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/133be338
Branch: refs/heads/master
Commit: 133be3383dab5d990c34e2a841ea3357cedf82ec
Parents: 24758af
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 22 12:34:32 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 22 12:56:10 2014 -0400
----------------------------------------------------------------------
tests/camel-itest-osgi/pom.xml | 22 ++++-----
.../osgi/blueprint/CamelBlueprint4Test.java | 4 ++
.../itest/osgi/cxf/CxfBeanSpringRouteTest.java | 1 +
.../itest/osgi/cxf/CxfProxyExampleTest.java | 18 +++----
.../cxf/blueprint/CxfBlueprintRouterTest.java | 52 +++++++++-----------
5 files changed, 46 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/133be338/tests/camel-itest-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml
index f95115e..ca89992 100644
--- a/tests/camel-itest-osgi/pom.xml
+++ b/tests/camel-itest-osgi/pom.xml
@@ -39,6 +39,17 @@
<dependencies>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
<scope>test</scope>
@@ -77,17 +88,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/camel/blob/133be338/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java
index 8a3e619..bebe4f2 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java
@@ -26,6 +26,8 @@ import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerSuite;
import org.ops4j.pax.tinybundles.core.TinyBundles;
import org.osgi.framework.Constants;
@@ -35,6 +37,7 @@ import static org.ops4j.pax.exam.OptionUtils.combine;
* @version
*/
@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerSuite.class)
public class CamelBlueprint4Test extends OSGiBlueprintTestSupport {
@Test
@@ -126,6 +129,7 @@ public class CamelBlueprint4Test extends OSGiBlueprintTestSupport {
.add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-13.xml"))
.set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle22")
.add(TestRouteBuilder.class)
+ .set(Constants.EXPORT_PACKAGE, TestRouteBuilder.class.getPackage().getName())
.build(TinyBundles.withBnd())).noStart(),
// using the features to install the camel components
http://git-wip-us.apache.org/repos/asf/camel/blob/133be338/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java
index 265a464..17d142b 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java
@@ -74,6 +74,7 @@ public class CxfBeanSpringRouteTest extends OSGiIntegrationSpringTestSupport {
.add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.CustomerServiceResource.class)
.add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.Order.class)
.add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.Product.class)
+ .set("Export-Package", "org.apache.camel.itest.osgi.cxf.jaxrs.testbean")
.build(TinyBundles.withBnd()))//,
//vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5006")
);
http://git-wip-us.apache.org/repos/asf/camel/blob/133be338/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java
index 4b42a28..3f5d23d 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java
@@ -37,16 +37,9 @@ import static org.ops4j.pax.exam.OptionUtils.combine;
@RunWith(PaxExam.class)
public class CxfProxyExampleTest extends OSGiIntegrationSpringTestSupport {
- protected static ReportIncidentEndpoint createCXFClient() {
- // we use CXF to create a client for us as its easier than JAXWS and works
- JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
- factory.setServiceClass(ReportIncidentEndpoint.class);
- factory.setAddress("http://localhost:9080/camel-itest-osgi/webservices/incident");
- return (ReportIncidentEndpoint) factory.create();
- }
-
@Test
public void testCxfProxy() throws Exception {
+
// create input parameter
InputReportIncident input = new InputReportIncident();
input.setIncidentId("123");
@@ -59,7 +52,11 @@ public class CxfProxyExampleTest extends OSGiIntegrationSpringTestSupport {
input.setPhone("12345678");
// create the webservice client and send the request
- ReportIncidentEndpoint client = createCXFClient();
+ // we use CXF to create a client for us as its easier than JAXWS and works
+ JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
+ factory.setServiceClass(ReportIncidentEndpoint.class);
+ factory.setAddress("http://localhost:9080/camel-itest-osgi/webservices/incident");
+ ReportIncidentEndpoint client = factory.create(ReportIncidentEndpoint.class);
OutputReportIncident out = client.reportIncident(input);
// assert we got a OK back
@@ -81,7 +78,7 @@ public class CxfProxyExampleTest extends OSGiIntegrationSpringTestSupport {
getDefaultCamelKarafOptions(),
// using the features to install the camel components
- loadCamelFeatures("camel-http", "camel-cxf"),
+ loadCamelFeatures("camel-http", "cxf", "camel-cxf"),
// need to install the generated src as the pax-exam doesn't wrap this bundles
provision(TinyBundles.bundle()
@@ -90,6 +87,7 @@ public class CxfProxyExampleTest extends OSGiIntegrationSpringTestSupport {
.add(org.apache.camel.example.reportincident.ReportIncidentEndpoint.class)
.add(org.apache.camel.example.reportincident.ReportIncidentEndpointService.class)
.add(org.apache.camel.example.reportincident.ObjectFactory.class)
+ .set("Export-Package", "org.apache.camel.example.reportincident")
.build(TinyBundles.withBnd())));
return options;
http://git-wip-us.apache.org/repos/asf/camel/blob/133be338/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java
index 882e4ee..a839a03 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.itest.osgi.cxf.blueprint;
-import java.io.InputStream;
-
import org.apache.camel.CamelContext;
import org.apache.camel.example.reportincident.InputReportIncident;
import org.apache.camel.example.reportincident.OutputReportIncident;
@@ -97,33 +95,27 @@ public class CxfBlueprintRouterTest extends OSGiBlueprintTestSupport {
@Configuration
public static Option[] configure() throws Exception {
- try {
- InputStream ins = TinyBundles.bundle()
- .add("OSGI-INF/blueprint/test.xml", CxfBlueprintRouterTest.class.getResource("CxfBlueprintRouter.xml"))
- .add("WSDL/report_incident.wsdl", CxfBlueprintRouterTest.class.getResource("/report_incident.wsdl"))
- .add(org.apache.camel.example.reportincident.InputReportIncident.class)
- .add(org.apache.camel.example.reportincident.OutputReportIncident.class)
- .add(org.apache.camel.example.reportincident.ReportIncidentEndpoint.class)
- .add(org.apache.camel.example.reportincident.ReportIncidentEndpointService.class)
- .add(org.apache.camel.example.reportincident.ObjectFactory.class)
- .set(Constants.BUNDLE_SYMBOLICNAME, "CxfBlueprintRouterTest")
- .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
- .build(TinyBundles.withBnd());
-
- Option[] options = combine(
- getDefaultCamelKarafOptions(),
- // using the features to install the camel components
- loadCamelFeatures(
- "camel-blueprint", "camel-cxf"),
-
- bundle(ins).noStart()
-
- );
-
- return options;
- } catch (Throwable ite) {
- ite.printStackTrace();
- throw new RuntimeException(ite);
- }
+ Option[] options = combine(
+ getDefaultCamelKarafOptions(),
+ // using the features to install the camel components
+ loadCamelFeatures(
+ "camel-blueprint", "camel-cxf"),
+
+ bundle(TinyBundles.bundle()
+ .add("OSGI-INF/blueprint/test.xml", CxfBlueprintRouterTest.class.getResource("CxfBlueprintRouter.xml"))
+ .add("WSDL/report_incident.wsdl", CxfBlueprintRouterTest.class.getResource("/report_incident.wsdl"))
+ .add(org.apache.camel.example.reportincident.InputReportIncident.class)
+ .add(org.apache.camel.example.reportincident.OutputReportIncident.class)
+ .add(org.apache.camel.example.reportincident.ReportIncidentEndpoint.class)
+ .add(org.apache.camel.example.reportincident.ReportIncidentEndpointService.class)
+ .add(org.apache.camel.example.reportincident.ObjectFactory.class)
+ .set("Export-Package", "org.apache.camel.example.reportincident")
+ .set(Constants.BUNDLE_SYMBOLICNAME, "CxfBlueprintRouterTest")
+ .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
+ .build(TinyBundles.withBnd())).noStart()
+
+ );
+
+ return options;
}
}
[4/4] git commit: hdfs test passing
Posted by dk...@apache.org.
hdfs test passing
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/835a41ed
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/835a41ed
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/835a41ed
Branch: refs/heads/master
Commit: 835a41edf614ba6edceb4a1f59a0ad2028fb7590
Parents: 3523fa1
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 22 12:55:54 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 22 12:56:11 2014 -0400
----------------------------------------------------------------------
.../org/apache/camel/itest/osgi/hdfs/blueprintCamelContext.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/835a41ed/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/hdfs/blueprintCamelContext.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/hdfs/blueprintCamelContext.xml b/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/hdfs/blueprintCamelContext.xml
index a905acf..353a389 100644
--- a/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/hdfs/blueprintCamelContext.xml
+++ b/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/hdfs/blueprintCamelContext.xml
@@ -45,7 +45,7 @@
<!-- using Camel properties component and refer to the blueprint property placeholder by its id -->
<propertyPlaceholder id="properties" location="blueprint:external"
prefixToken="[[" suffixToken="]]"
- propertyPrefix="prefix."/>
+ />
<route>
<from uri="direct:start"/>
<!-- <to uri="hdfs2://localhost:9000/hdfs/test-camel?fileSystemType=HDFS&splitStrategy=BYTES:5,IDLE:1000"/> -->
[3/4] git commit: Fix a bunch of eclipse warnings
Posted by dk...@apache.org.
Fix a bunch of eclipse warnings
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/24758afb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/24758afb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/24758afb
Branch: refs/heads/master
Commit: 24758afb4f5236e726b846ba46bc3fe10723afff
Parents: 276bf38
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 22 11:46:27 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 22 12:56:10 2014 -0400
----------------------------------------------------------------------
.../protobuf/generated/AddressBookProtos.java | 2 --
.../java/org/apache/camel/itest/osgi/ahc/AhcTest.java | 6 +++---
.../org/apache/camel/itest/osgi/aws/AwsSdbTest.java | 2 +-
.../itest/osgi/blueprint/AbstractIntegrationTest.java | 13 +++++++------
.../camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java | 2 --
.../osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java | 2 --
.../osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java | 2 --
.../itest/osgi/servlet/support/ServletActivator.java | 2 +-
8 files changed, 12 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/24758afb/tests/camel-itest-osgi/src/test/java/org/apache/camel/dataformat/protobuf/generated/AddressBookProtos.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/dataformat/protobuf/generated/AddressBookProtos.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/dataformat/protobuf/generated/AddressBookProtos.java
index 18e1c0f..bc96f1f 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/dataformat/protobuf/generated/AddressBookProtos.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/dataformat/protobuf/generated/AddressBookProtos.java
@@ -361,7 +361,6 @@ public final class AddressBookProtos {
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
initFields();
- int mutable_bitField0_ = 0;
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
com.google.protobuf.UnknownFieldSet.newBuilder();
try {
@@ -2150,7 +2149,6 @@ public final class AddressBookProtos {
public org.apache.camel.dataformat.protobuf.generated.AddressBookProtos.AddressBook buildPartial() {
org.apache.camel.dataformat.protobuf.generated.AddressBookProtos.AddressBook result = new org.apache.camel.dataformat.protobuf.generated.AddressBookProtos.AddressBook(this);
- int from_bitField0_ = bitField0_;
if (personBuilder_ == null) {
if (((bitField0_ & 0x00000001) == 0x00000001)) {
person_ = java.util.Collections.unmodifiableList(person_);
http://git-wip-us.apache.org/repos/asf/camel/blob/24758afb/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ahc/AhcTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ahc/AhcTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ahc/AhcTest.java
index 0d30d03..f9ea05b 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ahc/AhcTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ahc/AhcTest.java
@@ -23,16 +23,16 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.ExamReactorStrategy;
import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
import static org.ops4j.pax.exam.OptionUtils.combine;
/**
*
*/
@RunWith(PaxExam.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@ExamReactorStrategy(PerMethod.class)
public class AhcTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/24758afb/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbTest.java
index 139d157..eb27fda 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbTest.java
@@ -47,7 +47,7 @@ public class AwsSdbTest extends AwsTestSupport {
public void setUp() throws Exception {
super.setUp();
- amazonSDBClient = context.getRegistry().lookup("amazonSDBClient", AmazonSDBClientMock.class);
+ amazonSDBClient = context.getRegistry().lookupByNameAndType("amazonSDBClient", AmazonSDBClientMock.class);
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/24758afb/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/AbstractIntegrationTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/AbstractIntegrationTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/AbstractIntegrationTest.java
index 5bf733e..c98a270 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/AbstractIntegrationTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/AbstractIntegrationTest.java
@@ -53,7 +53,7 @@ public abstract class AbstractIntegrationTest extends OSGiIntegrationTestSupport
}
protected <T> T getOsgiService(Class<T> type, String filter, long timeout) {
- ServiceTracker tracker = null;
+ ServiceTracker<?, ?> tracker = null;
try {
String flt;
if (filter != null) {
@@ -66,7 +66,7 @@ public abstract class AbstractIntegrationTest extends OSGiIntegrationTestSupport
flt = "(" + Constants.OBJECTCLASS + "=" + type.getName() + ")";
}
Filter osgiFilter = FrameworkUtil.createFilter(flt);
- tracker = new ServiceTracker(bundleContext, osgiFilter, null);
+ tracker = new ServiceTracker<Object, Object>(bundleContext, osgiFilter, null);
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
@@ -76,11 +76,11 @@ public abstract class AbstractIntegrationTest extends OSGiIntegrationTestSupport
Dictionary dic = bundleContext.getBundle().getHeaders();
LOG.warn("Test bundle headers: " + explode(dic));
- for (ServiceReference ref : asCollection(bundleContext.getAllServiceReferences(null, null))) {
+ for (ServiceReference<?> ref : asCollection(bundleContext.getAllServiceReferences(null, null))) {
LOG.warn("ServiceReference: " + ref);
}
- for (ServiceReference ref : asCollection(bundleContext.getAllServiceReferences(null, flt))) {
+ for (ServiceReference<?> ref : asCollection(bundleContext.getAllServiceReferences(null, flt))) {
LOG.warn("Filtered ServiceReference: " + ref);
}
@@ -130,8 +130,9 @@ public abstract class AbstractIntegrationTest extends OSGiIntegrationTestSupport
/*
* Provides an iterable collection of references, even if the original array is null
*/
- private static Collection<ServiceReference> asCollection(ServiceReference[] references) {
- return references != null ? Arrays.asList(references) : Collections.<ServiceReference>emptyList();
+ private static Collection<ServiceReference<?>> asCollection(ServiceReference<?>[] references) {
+ return (Collection<ServiceReference<?>>)(references != null ? Arrays.asList(references)
+ : Collections.<ServiceReference<?>>emptyList());
}
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/24758afb/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java
index 0815064..265a464 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java
@@ -18,10 +18,8 @@ package org.apache.camel.itest.osgi.cxf;
import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
http://git-wip-us.apache.org/repos/asf/camel/blob/24758afb/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java
index 2d71d54..0a2c1bf 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java
@@ -19,10 +19,8 @@ package org.apache.camel.itest.osgi.cxf.blueprint;
import org.apache.camel.CamelContext;
import org.apache.camel.itest.osgi.blueprint.OSGiBlueprintTestSupport;
import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
http://git-wip-us.apache.org/repos/asf/camel/blob/24758afb/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
index 1a74be5..03c46ef 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
@@ -23,13 +23,11 @@ import org.apache.camel.itest.osgi.cxf.jaxrs.testbean.CustomerService;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
http://git-wip-us.apache.org/repos/asf/camel/blob/24758afb/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/support/ServletActivator.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/support/ServletActivator.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/support/ServletActivator.java
index 71b78db..2c9567d 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/support/ServletActivator.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/support/ServletActivator.java
@@ -37,7 +37,7 @@ public final class ServletActivator implements BundleActivator, BundleContextAwa
/**
* HttpService reference.
*/
- private ServiceReference httpServiceRef;
+ private ServiceReference<?> httpServiceRef;
/**
* Called when the OSGi framework starts our bundle