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/11/06 10:19:34 UTC
svn commit: r1406078 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/impl/osgi/
components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/
components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/
component...
Author: bvahdat
Date: Tue Nov 6 09:19:34 2012
New Revision: 1406078
URL: http://svn.apache.org/viewvc?rev=1406078&view=rev
Log:
Fixed the compilation failure on jdk1.7 after the upgrade to OSGi 4.3.0 because of the ServiceRegistration type being generified in OSGi 4.3.0. On jdk1.6 there's no such a problem at all!
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
camel/trunk/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/Activator.java
camel/trunk/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminConsumer.java
camel/trunk/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/Activator.java
camel/trunk/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java?rev=1406078&r1=1406077&r2=1406078&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java Tue Nov 6 09:19:34 2012
@@ -410,7 +410,7 @@ public class Activator implements Bundle
protected abstract static class BaseService {
protected final Bundle bundle;
- private ServiceRegistration<?> reg;
+ private ServiceRegistration reg;
protected BaseService(Bundle bundle) {
this.bundle = bundle;
Modified: camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java?rev=1406078&r1=1406077&r2=1406078&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java (original)
+++ camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java Tue Nov 6 09:19:34 2012
@@ -43,7 +43,7 @@ public class OsgiCamelContextPublisher e
public static final String CONTEXT_NAME_PROPERTY = "camel.context.name";
private final BundleContext bundleContext;
- private final Map<CamelContext, ServiceRegistration<?>> registrations = new ConcurrentHashMap<CamelContext, ServiceRegistration<?>>();
+ private final Map<CamelContext, ServiceRegistration> registrations = new ConcurrentHashMap<CamelContext, ServiceRegistration>();
public OsgiCamelContextPublisher(BundleContext bundleContext) {
this.bundleContext = bundleContext;
@@ -60,11 +60,11 @@ public class OsgiCamelContextPublisher e
log.debug("Registering CamelContext [{}] of in OSGi registry", props);
- ServiceRegistration<?> reg = bundleContext.registerService(CamelContext.class.getName(), context, props);
+ ServiceRegistration reg = bundleContext.registerService(CamelContext.class.getName(), context, props);
registrations.put(context, reg);
} else if (event instanceof CamelContextStoppingEvent) {
CamelContext context = ((CamelContextStoppingEvent) event).getContext();
- ServiceRegistration<?> reg = registrations.get(context);
+ ServiceRegistration reg = registrations.get(context);
if (reg != null) {
if (log.isDebugEnabled()) {
log.debug("Unregistering CamelContext [{}] from OSGi registry", context.getName());
Modified: camel/trunk/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/Activator.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/Activator.java?rev=1406078&r1=1406077&r2=1406078&view=diff
==============================================================================
--- camel/trunk/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/Activator.java (original)
+++ camel/trunk/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/Activator.java Tue Nov 6 09:19:34 2012
@@ -30,7 +30,7 @@ import org.osgi.framework.ServiceRegistr
*/
public class Activator implements BundleActivator {
- private ServiceRegistration<?> registration;
+ private ServiceRegistration registration;
public void start(BundleContext bundleContext) throws Exception {
Dictionary<String, String> props = new Hashtable<String, String>();
Modified: camel/trunk/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminConsumer.java?rev=1406078&r1=1406077&r2=1406078&view=diff
==============================================================================
--- camel/trunk/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminConsumer.java (original)
+++ camel/trunk/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminConsumer.java Tue Nov 6 09:19:34 2012
@@ -32,7 +32,7 @@ public class EventAdminConsumer extends
private static final transient Logger LOG = LoggerFactory.getLogger(EventAdminConsumer.class);
private final EventAdminEndpoint endpoint;
- private ServiceRegistration<?> registration;
+ private ServiceRegistration registration;
public EventAdminConsumer(EventAdminEndpoint endpoint, Processor processor) {
Modified: camel/trunk/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/Activator.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/Activator.java?rev=1406078&r1=1406077&r2=1406078&view=diff
==============================================================================
--- camel/trunk/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/Activator.java (original)
+++ camel/trunk/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/Activator.java Tue Nov 6 09:19:34 2012
@@ -29,7 +29,7 @@ import org.osgi.framework.ServiceRegistr
*/
public class Activator implements BundleActivator {
- private ServiceRegistration<?> registration;
+ private ServiceRegistration registration;
public void start(BundleContext bundleContext) throws Exception {
Dictionary<String, String> props = new Hashtable<String, String>();
Modified: camel/trunk/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java?rev=1406078&r1=1406077&r2=1406078&view=diff
==============================================================================
--- camel/trunk/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java (original)
+++ camel/trunk/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java Tue Nov 6 09:19:34 2012
@@ -45,7 +45,7 @@ public class PaxLoggingConsumer extends
private static final transient Logger LOG = LoggerFactory.getLogger(PaxLoggingConsumer.class);
private final PaxLoggingEndpoint endpoint;
private ExecutorService executor;
- private ServiceRegistration<?> registration;
+ private ServiceRegistration registration;
public PaxLoggingConsumer(PaxLoggingEndpoint endpoint, Processor processor) {
super(endpoint, processor);