Author: ningjiang
Date: Wed Jun 9 10:59:27 2010
New Revision: 952954
URL: http://svn.apache.org/viewvc?rev=952954&view=rev
Log:
Fixed the CS errors
Modified:
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/OsgiSpringCamelContext.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/AbstractIntegrationTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintTestSupport.java
Modified:
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java?rev=952954&r1=952953&r2=952954&view=diff
==============================================================================
---
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
(original)
+++
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
Wed Jun 9 10:59:27 2010
@@ -18,6 +18,7 @@ package org.apache.camel.blueprint;
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.XmlAttribute;
@@ -35,7 +36,16 @@ import org.apache.camel.core.xml.CamelJM
import org.apache.camel.core.xml.CamelPropertyPlaceholderDefinition;
import org.apache.camel.core.xml.CamelProxyFactoryDefinition;
import org.apache.camel.core.xml.CamelServiceExporterDefinition;
-import org.apache.camel.model.*;
+import org.apache.camel.model.InterceptDefinition;
+import org.apache.camel.model.InterceptFromDefinition;
+import org.apache.camel.model.InterceptSendToEndpointDefinition;
+import org.apache.camel.model.OnCompletionDefinition;
+import org.apache.camel.model.OnExceptionDefinition;
+import org.apache.camel.model.PackageScanDefinition;
+import org.apache.camel.model.RouteBuilderDefinition;
+import org.apache.camel.model.RouteContextRefDefinition;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.model.ThreadPoolProfileDefinition;
import org.apache.camel.model.config.PropertiesDefinition;
import org.apache.camel.model.dataformat.DataFormatsDefinition;
import org.osgi.framework.BundleContext;
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=952954&r1=952953&r2=952954&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
Wed Jun 9 10:59:27 2010
@@ -23,10 +23,16 @@ 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.NamespaceHandler;
import org.apache.aries.blueprint.ParserContext;
import org.apache.aries.blueprint.PassThroughMetadata;
@@ -36,9 +42,22 @@ import org.apache.aries.blueprint.mutabl
import org.apache.camel.blueprint.BlueprintCamelContext;
import org.apache.camel.blueprint.CamelContextFactoryBean;
import org.apache.camel.core.xml.AbstractCamelContextFactoryBean;
-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.model.loadbalancer.StickyLoadBalancerDefinition;
import org.apache.camel.spi.ComponentResolver;
import org.apache.camel.spi.DataFormatResolver;
import org.apache.camel.spi.LanguageResolver;
@@ -51,10 +70,6 @@ import org.osgi.service.blueprint.contai
import org.osgi.service.blueprint.container.ComponentDefinitionException;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
import org.osgi.service.blueprint.reflect.Metadata;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
public class CamelNamespaceHandler implements NamespaceHandler {
@@ -63,10 +78,10 @@ public class CamelNamespaceHandler imple
private static final String SPRING_NS =
"http://camel.apache.org/schema/spring";
private static final String BLUEPRINT_NS =
"http://camel.apache.org/schema/blueprint";
- private JAXBContext jaxbContext;
-
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();
@@ -212,8 +227,8 @@ 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.");
+ 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.");
components.clear();
languages.clear();
dataformats.clear();
@@ -250,6 +265,7 @@ public class CamelNamespaceHandler imple
}
}
+ @SuppressWarnings("unchecked")
private void findOutputComponents(List<ProcessorDefinition> defs,
Set<String> components, Set<String> languages, Set<String> dataformats) {
if (defs != null) {
for (ProcessorDefinition def : defs) {
Modified:
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/OsgiSpringCamelContext.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/OsgiSpringCamelContext.java?rev=952954&r1=952953&r2=952954&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/OsgiSpringCamelContext.java
(original)
+++
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/OsgiSpringCamelContext.java
Wed Jun 9 10:59:27 2010
@@ -21,15 +21,11 @@ import org.apache.camel.core.osgi.OsgiCa
import org.apache.camel.core.osgi.OsgiTypeConverter;
import org.apache.camel.spi.Registry;
import org.apache.camel.spring.SpringCamelContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.osgi.framework.BundleContext;
import org.springframework.context.ApplicationContext;
public class OsgiSpringCamelContext extends SpringCamelContext {
- private static final transient Log LOG =
LogFactory.getLog(OsgiSpringCamelContext.class);
-
private final BundleContext bundleContext;
public OsgiSpringCamelContext(ApplicationContext applicationContext,
BundleContext bundleContext) {
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/AbstractIntegrationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/AbstractIntegrationTest.java?rev=952954&r1=952953&r2=952954&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/AbstractIntegrationTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/AbstractIntegrationTest.java
Wed Jun 9 10:59:27 2010
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -127,7 +127,7 @@ public abstract class AbstractIntegratio
/*
* Provides an iterable collection of references, even if the original
array is null
*/
- private static final Collection<ServiceReference>
asCollection(ServiceReference[] references) {
+ private static Collection<ServiceReference>
asCollection(ServiceReference[] references) {
return references != null ? Arrays.asList(references) :
Collections.<ServiceReference>emptyList();
}
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintTestSupport.java?rev=952954&r1=952953&r2=952954&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintTestSupport.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintTestSupport.java
Wed Jun 9 10:59:27 2010
@@ -109,17 +109,17 @@ public class OSGiBlueprintTestSupport ex
bundle(newBundle()
.add("OSGI-INF/blueprint/test.xml",
OSGiBlueprintTestSupport.class.getResource("blueprint-1.xml"))
- .set( Constants.BUNDLE_SYMBOLICNAME,
"CamelBlueprintTestBundle1" )
+ .set(Constants.BUNDLE_SYMBOLICNAME,
"CamelBlueprintTestBundle1")
.build()).noStart(),
bundle(newBundle()
.add("OSGI-INF/blueprint/test.xml",
OSGiBlueprintTestSupport.class.getResource("blueprint-2.xml"))
- .set( Constants.BUNDLE_SYMBOLICNAME,
"CamelBlueprintTestBundle2" )
+ .set(Constants.BUNDLE_SYMBOLICNAME,
"CamelBlueprintTestBundle2")
.build()).noStart(),
bundle(newBundle()
.add("OSGI-INF/blueprint/test.xml",
OSGiBlueprintTestSupport.class.getResource("blueprint-3.xml"))
- .set( Constants.BUNDLE_SYMBOLICNAME,
"CamelBlueprintTestBundle3" )
+ .set(Constants.BUNDLE_SYMBOLICNAME,
"CamelBlueprintTestBundle3")
.build()).noStart(),
// install the spring dm profile
@@ -150,8 +150,8 @@ public class OSGiBlueprintTestSupport ex
byte[] buf = new byte[8192];
int bytesRead = input.read(buf);
while (bytesRead != -1) {
- output.write(buf, 0, bytesRead);
- bytesRead = input.read(buf);
+ output.write(buf, 0, bytesRead);
+ bytesRead = input.read(buf);
}
output.flush();
} finally {
@@ -174,7 +174,7 @@ public class OSGiBlueprintTestSupport ex
private static UrlProvisionOption bundle(final InputStream stream) throws
IOException {
Store<InputStream> store = StoreFactory.defaultStore();
- return new UrlProvisionOption( store.getLocation( store.store( stream
) ).toURL().toExternalForm() ) ;
+ return new
UrlProvisionOption(store.getLocation(store.store(stream)).toURL().toExternalForm());
}