Author: davsclaus
Date: Fri Dec 10 07:37:09 2010
New Revision: 1044234
URL: http://svn.apache.org/viewvc?rev=1044234&view=rev
Log:
Fixed CS.
Modified:
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRouteContextFactoryBean.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiComponentResolver.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDataFormatResolver.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiEventAdminNotifier.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiLanguageResolver.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
Modified:
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java?rev=1044234&r1=1044233&r2=1044234&view=diff
==============================================================================
---
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
(original)
+++
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
Fri Dec 10 07:37:09 2010
@@ -16,6 +16,9 @@
*/
package org.apache.camel.blueprint;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
import org.apache.aries.blueprint.ExtendedBeanMetadata;
import org.apache.aries.blueprint.mutable.MutableReferenceMetadata;
import org.apache.camel.spi.Registry;
@@ -23,9 +26,6 @@ import org.osgi.framework.Bundle;
import org.osgi.service.blueprint.container.BlueprintContainer;
import org.osgi.service.blueprint.container.NoSuchComponentException;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
public class BlueprintContainerRegistry implements Registry {
private final BlueprintContainer blueprintContainer;
@@ -56,12 +56,12 @@ public class BlueprintContainerRegistry
try {
Class cl = metadata.getRuntimeClass();
if (cl == null && metadata.getClassName() != null) {
- Bundle bundle = (Bundle)
blueprintContainer.getComponentInstance("blueprintBundle");
+ Bundle bundle = (Bundle)
blueprintContainer.getComponentInstance("blueprintBundle");
cl = bundle.loadClass(metadata.getClassName());
}
if (cl == null || type.isAssignableFrom(cl)) {
- Object o = blueprintContainer.getComponentInstance(
metadata.getId() );
- objects.put( metadata.getId(), type.cast(o) );
+ Object o =
blueprintContainer.getComponentInstance(metadata.getId());
+ objects.put(metadata.getId(), type.cast(o));
}
} catch (Throwable t) {
// ignore
@@ -71,12 +71,12 @@ public class BlueprintContainerRegistry
try {
Class cl = metadata.getRuntimeInterface();
if (cl == null && metadata.getInterface() != null) {
- Bundle bundle = (Bundle)
blueprintContainer.getComponentInstance("blueprintBundle");
+ Bundle bundle = (Bundle)
blueprintContainer.getComponentInstance("blueprintBundle");
cl = bundle.loadClass(metadata.getInterface());
}
if (cl == null || type.isAssignableFrom(cl)) {
- Object o = blueprintContainer.getComponentInstance(
metadata.getId() );
- objects.put( metadata.getId(), type.cast(o) );
+ Object o =
blueprintContainer.getComponentInstance(metadata.getId());
+ objects.put(metadata.getId(), type.cast(o));
}
} catch (Throwable t) {
// ignore
Modified:
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java?rev=1044234&r1=1044233&r2=1044234&view=diff
==============================================================================
---
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java
(original)
+++
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java
Fri Dec 10 07:37:09 2010
@@ -16,6 +16,12 @@
*/
package org.apache.camel.blueprint;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+
import org.apache.aries.blueprint.ExtendedBlueprintContainer;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
@@ -25,12 +31,6 @@ import org.apache.camel.component.bean.P
import org.apache.camel.core.xml.AbstractCamelFactoryBean;
import org.apache.camel.util.ServiceHelper;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-
/**
* A factory to create a Proxy to a a Camel Pojo Endpoint.
*/
@@ -98,7 +98,6 @@ public class CamelProxyFactoryBean exten
} catch (Exception e) {
throw new FailedToCreateProducerException(endpoint, e);
}
-
}
public void destroy() throws Exception {
Modified:
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRouteContextFactoryBean.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRouteContextFactoryBean.java?rev=1044234&r1=1044233&r2=1044234&view=diff
==============================================================================
---
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRouteContextFactoryBean.java
(original)
+++
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRouteContextFactoryBean.java
Fri Dec 10 07:37:09 2010
@@ -16,15 +16,15 @@
*/
package org.apache.camel.blueprint;
-import org.apache.camel.model.IdentifiedType;
-import org.apache.camel.model.RouteDefinition;
-
+import java.util.ArrayList;
+import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
-import java.util.ArrayList;
-import java.util.List;
+
+import org.apache.camel.model.IdentifiedType;
+import org.apache.camel.model.RouteDefinition;
@XmlRootElement(name = "routeContext")
@XmlAccessorType(XmlAccessType.FIELD)
Modified:
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java?rev=1044234&r1=1044233&r2=1044234&view=diff
==============================================================================
---
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java
(original)
+++
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java
Fri Dec 10 07:37:09 2010
@@ -18,7 +18,6 @@ package org.apache.camel.blueprint;
import java.lang.reflect.Modifier;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import org.apache.camel.RoutesBuilder;
@@ -80,7 +79,7 @@ public class PackageScanRouteBuilderFind
// type is valid so create and instantiate the builder
RoutesBuilder builder = instantiateBuilder(aClass);
// if (beanPostProcessor != null) {
- // Inject the annotated resource
+ // Inject the annotated resource
// beanPostProcessor.postProcessBeforeInitialization(builder,
builder.toString());
// }
if (LOG.isDebugEnabled()) {
@@ -94,10 +93,10 @@ public class PackageScanRouteBuilderFind
* Lets ignore beans that are explicitly configured in the Spring XML files
*/
protected boolean shouldIgnoreBean(Class<?> type) {
- for (BeanMetadata metadata : blueprintContainer.getMetadata(
BeanMetadata.class )) {
+ for (BeanMetadata metadata :
blueprintContainer.getMetadata(BeanMetadata.class)) {
if (BeanMetadata.SCOPE_SINGLETON.equals(metadata.getScope())) {
- Object bean = blueprintContainer.getComponentInstance(
metadata.getId() );
- if (type.isInstance( bean )) {
+ Object bean =
blueprintContainer.getComponentInstance(metadata.getId());
+ if (type.isInstance(bean)) {
return true;
}
}
Modified:
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java?rev=1044234&r1=1044233&r2=1044234&view=diff
==============================================================================
---
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
(original)
+++
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
Fri Dec 10 07:37:09 2010
@@ -16,6 +16,24 @@
*/
package org.apache.camel.blueprint.handler;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import javax.xml.bind.Binder;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
import org.apache.aries.blueprint.BeanProcessor;
import org.apache.aries.blueprint.ComponentDefinitionRegistry;
import org.apache.aries.blueprint.ComponentDefinitionRegistryProcessor;
@@ -38,7 +56,21 @@ import org.apache.camel.core.xml.Abstrac
import org.apache.camel.core.xml.AbstractCamelFactoryBean;
import org.apache.camel.impl.CamelPostProcessorHelper;
import org.apache.camel.impl.DefaultCamelContextNameStrategy;
-import org.apache.camel.model.*;
+import org.apache.camel.model.AggregateDefinition;
+import org.apache.camel.model.CatchDefinition;
+import org.apache.camel.model.DataFormatDefinition;
+import org.apache.camel.model.ExpressionNode;
+import org.apache.camel.model.ExpressionSubElementDefinition;
+import org.apache.camel.model.FromDefinition;
+import org.apache.camel.model.MarshalDefinition;
+import org.apache.camel.model.OnExceptionDefinition;
+import org.apache.camel.model.ProcessorDefinition;
+import org.apache.camel.model.ResequenceDefinition;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.model.SendDefinition;
+import org.apache.camel.model.SortDefinition;
+import org.apache.camel.model.UnmarshalDefinition;
+import org.apache.camel.model.WireTapDefinition;
import org.apache.camel.model.language.ExpressionDefinition;
import org.apache.camel.spi.CamelContextNameStrategy;
import org.apache.camel.spi.ComponentResolver;
@@ -47,6 +79,7 @@ import org.apache.camel.spi.LanguageReso
import org.apache.camel.util.ObjectHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.osgi.framework.Bundle;
import org.osgi.service.blueprint.container.BlueprintContainer;
import org.osgi.service.blueprint.container.ComponentDefinitionException;
@@ -55,23 +88,6 @@ import org.osgi.service.blueprint.reflec
import org.osgi.service.blueprint.reflect.Metadata;
import org.osgi.service.blueprint.reflect.RefMetadata;
import org.osgi.service.blueprint.reflect.ValueMetadata;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import javax.xml.bind.Binder;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.Callable;
public class CamelNamespaceHandler implements NamespaceHandler {
@@ -84,7 +100,7 @@ public class CamelNamespaceHandler imple
private static final transient Log LOG =
LogFactory.getLog(CamelNamespaceHandler.class);
private JAXBContext jaxbContext;
-
+
public static void renameNamespaceRecursive(Node node) {
if (node.getNodeType() == Node.ELEMENT_NODE) {
Document doc = node.getOwnerDocument();
@@ -492,10 +508,10 @@ public class CamelNamespaceHandler imple
}
try {
for (String component : components) {
- ComponentMetadata cm =
componentDefinitionRegistry.getComponentDefinition(".camelBlueprint.componentResolver."
+ component);
+ ComponentMetadata cm =
componentDefinitionRegistry.getComponentDefinition(".camelBlueprint.componentResolver."
+ component);
if (cm == null) {
MutableReferenceMetadata svc =
createMetadata(MutableReferenceMetadata.class);
- svc.setId(".camelBlueprint.componentResolver." +
component);
+ svc.setId(".camelBlueprint.componentResolver." +
component);
svc.setFilter("(component=" + component + ")");
try {
// Try to set the runtime interface (only with
aries blueprint > 0.1
@@ -518,10 +534,10 @@ public class CamelNamespaceHandler imple
}
}
for (String language : languages) {
- ComponentMetadata cm =
componentDefinitionRegistry.getComponentDefinition(".camelBlueprint.languageResolver."
+ language);
+ ComponentMetadata cm =
componentDefinitionRegistry.getComponentDefinition(".camelBlueprint.languageResolver."
+ language);
if (cm == null) {
MutableReferenceMetadata svc =
createMetadata(MutableReferenceMetadata.class);
- svc.setId(".camelBlueprint.languageResolver." +
language);
+ svc.setId(".camelBlueprint.languageResolver." +
language);
svc.setFilter("(language=" + language + ")");
try {
// Try to set the runtime interface (only with
aries blueprint > 0.1
@@ -544,10 +560,10 @@ public class CamelNamespaceHandler imple
}
}
for (String dataformat : dataformats) {
- ComponentMetadata cm =
componentDefinitionRegistry.getComponentDefinition(".camelBlueprint.dataformatResolver."
+ dataformat);
+ ComponentMetadata cm =
componentDefinitionRegistry.getComponentDefinition(".camelBlueprint.dataformatResolver."
+ dataformat);
if (cm == null) {
MutableReferenceMetadata svc =
createMetadata(MutableReferenceMetadata.class);
- svc.setId(".camelBlueprint.dataformatResolver." +
dataformat);
+ svc.setId(".camelBlueprint.dataformatResolver." +
dataformat);
svc.setFilter("(dataformat=" + dataformat + ")");
try {
// Try to set the runtime interface (only with
aries blueprint > 0.1
@@ -571,7 +587,7 @@ public class CamelNamespaceHandler imple
}
} catch (UnsupportedOperationException e) {
LOG.warn("Unable to add dependencies on to camel components
OSGi services. "
- + "The Apache Aries blueprint implementation used it
too old and the blueprint bundle can not see the org.apache.camel.spi
package.");
+ + "The Apache Aries blueprint implementation used it
too old and the blueprint bundle can not see the org.apache.camel.spi
package.");
components.clear();
languages.clear();
dataformats.clear();
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=1044234&r1=1044233&r2=1044234&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
Fri Dec 10 07:37:09 2010
@@ -16,6 +16,12 @@
*/
package org.apache.camel.core.osgi;
+import java.util.Dictionary;
+import java.util.EventObject;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
+
import org.apache.camel.CamelContext;
import org.apache.camel.management.EventNotifierSupport;
import org.apache.camel.management.event.CamelContextStartedEvent;
@@ -26,19 +32,13 @@ import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
import org.osgi.framework.Version;
-import java.util.Dictionary;
-import java.util.EventObject;
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.ConcurrentHashMap;
-
/**
- * This EventNotifier is in charge of registerting CamelContext in the OSGi
registry
+ * This {...@link org.apache.camel.spi.EventNotifier} is in charge of
registering
+ * {...@link CamelContext} in the OSGi registry
*/
public class OsgiCamelContextPublisher extends EventNotifierSupport {
public static final String CONTEXT_SYMBOLIC_NAME_PROPERTY =
"camel.context.symbolicname";
-
public static final String CONTEXT_VERSION_PROPERTY =
"camel.context.version";
private final BundleContext bundleContext;
@@ -51,20 +51,23 @@ public class OsgiCamelContextPublisher e
public void notify(EventObject event) throws Exception {
if (event instanceof CamelContextStartedEvent) {
CamelContext context = ((CamelContextStartedEvent)
event).getContext();
+
Properties props = new Properties();
- props.put(CONTEXT_SYMBOLIC_NAME_PROPERTY,
- bundleContext.getBundle().getSymbolicName());
- props.put(CONTEXT_VERSION_PROPERTY,
- getBundleVersion(bundleContext.getBundle()));
- ServiceRegistration reg = bundleContext.registerService(
- CamelContext.class.getName(),
- context,
- props);
- registrations.put( context, reg );
+ props.put(CONTEXT_SYMBOLIC_NAME_PROPERTY,
bundleContext.getBundle().getSymbolicName());
+ props.put(CONTEXT_VERSION_PROPERTY,
getBundleVersion(bundleContext.getBundle()));
+
+ if (log.isDebugEnabled()) {
+ log.debug("Registering CamelContext [" + context.getName() +
"] in OSGi registry");
+ }
+ 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 [" +
context.getName() + "] from OSGi registry");
+ }
reg.unregister();
}
}
@@ -80,11 +83,12 @@ public class OsgiCamelContextPublisher e
@Override
protected void doStop() throws Exception {
+ registrations.clear();
}
public static Version getBundleVersion(Bundle bundle) {
Dictionary headers = bundle.getHeaders();
- String version = (String)headers.get(Constants.BUNDLE_VERSION);
+ String version = (String) headers.get(Constants.BUNDLE_VERSION);
return (version != null) ? Version.parseVersion(version) :
Version.emptyVersion;
}
}
Modified:
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiComponentResolver.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiComponentResolver.java?rev=1044234&r1=1044233&r2=1044234&view=diff
==============================================================================
---
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiComponentResolver.java
(original)
+++
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiComponentResolver.java
Fri Dec 10 07:37:09 2010
@@ -26,7 +26,6 @@ import org.osgi.framework.InvalidSyntaxE
import org.osgi.framework.ServiceReference;
public class OsgiComponentResolver implements ComponentResolver {
-
private static final transient Log LOG =
LogFactory.getLog(OsgiComponentResolver.class);
private final BundleContext bundleContext;
Modified:
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDataFormatResolver.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDataFormatResolver.java?rev=1044234&r1=1044233&r2=1044234&view=diff
==============================================================================
---
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDataFormatResolver.java
(original)
+++
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDataFormatResolver.java
Fri Dec 10 07:37:09 2010
@@ -27,7 +27,6 @@ import org.osgi.framework.InvalidSyntaxE
import org.osgi.framework.ServiceReference;
public class OsgiDataFormatResolver implements DataFormatResolver {
-
private static final transient Log LOG =
LogFactory.getLog(OsgiDataFormatResolver.class);
private final BundleContext bundleContext;
Modified:
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiEventAdminNotifier.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiEventAdminNotifier.java?rev=1044234&r1=1044233&r2=1044234&view=diff
==============================================================================
---
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiEventAdminNotifier.java
(original)
+++
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiEventAdminNotifier.java
Fri Dec 10 07:37:09 2010
@@ -16,7 +16,12 @@
*/
package org.apache.camel.core.osgi;
+import java.util.Dictionary;
+import java.util.EventObject;
+import java.util.Hashtable;
+
import org.apache.camel.management.EventNotifierSupport;
+
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -25,29 +30,19 @@ import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
import org.osgi.util.tracker.ServiceTracker;
-import java.util.Dictionary;
-import java.util.EventObject;
-import java.util.Hashtable;
-
/**
- * This EventNotifier is in charge of propagating events to EventAdmin if
present.
+ * This {...@link org.apache.camel.spi.EventNotifier} is in charge of
propagating events
+ * to OSGi {...@link EventAdmin} if present.
*/
public class OsgiEventAdminNotifier extends EventNotifierSupport {
public static final String TYPE = "type";
-
public static final String EVENT = "event";
-
public static final String TIMESTAMP = "timestamp";
-
public static final String BUNDLE = "bundle";
-
public static final String BUNDLE_ID = "bundle.id";
-
public static final String BUNDLE_SYMBOLICNAME = "bundle.symbolicName";
-
public static final String BUNDLE_VERSION = "bundle.version";
-
public static final String CAUSE = "cause";
public static final String TOPIC_CAMEL_EVENTS = "org/apache/camel/";
Modified:
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiLanguageResolver.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiLanguageResolver.java?rev=1044234&r1=1044233&r2=1044234&view=diff
==============================================================================
---
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiLanguageResolver.java
(original)
+++
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiLanguageResolver.java
Fri Dec 10 07:37:09 2010
@@ -27,7 +27,6 @@ import org.osgi.framework.InvalidSyntaxE
import org.osgi.framework.ServiceReference;
public class OsgiLanguageResolver implements LanguageResolver {
-
private static final transient Log LOG =
LogFactory.getLog(OsgiLanguageResolver.class);
private final BundleContext bundleContext;
Modified:
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java?rev=1044234&r1=1044233&r2=1044234&view=diff
==============================================================================
---
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java
(original)
+++
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java
Fri Dec 10 07:37:09 2010
@@ -30,7 +30,8 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
public class OsgiPackageScanClassResolver extends
DefaultPackageScanClassResolver {
- private Bundle bundle;
+
+ private final Bundle bundle;
public OsgiPackageScanClassResolver(Bundle bundle) {
this.bundle = bundle;
Modified:
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java?rev=1044234&r1=1044233&r2=1044234&view=diff
==============================================================================
---
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java
(original)
+++
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java
Fri Dec 10 07:37:09 2010
@@ -40,9 +40,9 @@ import org.osgi.framework.ServiceReferen
* The OsgiServiceRegistry support to get the service object from the bundle
context
*/
public class OsgiServiceRegistry implements Registry, LifecycleStrategy {
- private BundleContext bundleContext;
- private Map<String, Object> serviceCacheMap = new
ConcurrentHashMap<String, Object>();
- private ConcurrentLinkedQueue<ServiceReference> serviceReferenceQueue =
new ConcurrentLinkedQueue<ServiceReference>();
+ private final BundleContext bundleContext;
+ private final Map<String, Object> serviceCacheMap = new
ConcurrentHashMap<String, Object>();
+ private final ConcurrentLinkedQueue<ServiceReference>
serviceReferenceQueue = new ConcurrentLinkedQueue<ServiceReference>();
public OsgiServiceRegistry(BundleContext bc) {
bundleContext = bc;
Modified:
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java?rev=1044234&r1=1044233&r2=1044234&view=diff
==============================================================================
---
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
(original)
+++
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
Fri Dec 10 07:37:09 2010
@@ -36,7 +36,6 @@ import org.osgi.util.tracker.ServiceTrac
import org.osgi.util.tracker.ServiceTrackerCustomizer;
public class OsgiTypeConverter extends ServiceSupport implements
TypeConverter, TypeConverterRegistry, ServiceTrackerCustomizer {
-
private static final Log LOG = LogFactory.getLog(OsgiTypeConverter.class);
private final BundleContext bundleContext;
Modified:
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java?rev=1044234&r1=1044233&r2=1044234&view=diff
==============================================================================
---
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
(original)
+++
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
Fri Dec 10 07:37:09 2010
@@ -16,15 +16,15 @@
*/
package org.apache.camel.core.xml;
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.model.IdentifiedType;
-
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlTransient;
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
+import org.apache.camel.model.IdentifiedType;
+
@XmlAccessorType(XmlAccessType.FIELD)
public abstract class AbstractCamelFactoryBean<T> extends IdentifiedType
implements CamelContextAware {
