svn commit: r949646 - in /camel/trunk/components/camel-osgi/src: main/java/org/apache/camel/osgi/ test/java/org/apache/camel/core/osgi/

[ni...@apache.org]

Author: ningjiang
Date: Mon May 31 01:55:33 2010
New Revision: 949646

URL: http://svn.apache.org/viewvc?rev=949646&view=rev
Log:
Fixed CS errors of camel-osgi

Modified:
    camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactory.java
    camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelNamespaceHandler.java
    camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/SpringCamelContextFactory.java
    camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java
    camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/CamelOsgiTestSupport.java
    camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiAnnotationTypeConverterLoaderTest.java
    camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiComponentResolverTest.java
    camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiFactoryFinderTest.java
    camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiLanguageResolverTest.java
    camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolverTest.java

Modified: camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactory.java?rev=949646&r1=949645&r2=949646&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactory.java (original)
+++ camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactory.java Mon May 31 01:55:33 2010
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.osgi;
 
-import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.core.osgi.OsgiDefaultCamelContext;
+import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.framework.BundleContext;

Modified: camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelNamespaceHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelNamespaceHandler.java?rev=949646&r1=949645&r2=949646&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelNamespaceHandler.java (original)
+++ camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelNamespaceHandler.java Mon May 31 01:55:33 2010
@@ -19,8 +19,6 @@ package org.apache.camel.osgi;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.camel.osgi.CamelContextFactoryBean;
-
 public class CamelNamespaceHandler extends org.apache.camel.spring.handler.CamelNamespaceHandler {
 
     public void init() {

Modified: camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/SpringCamelContextFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/SpringCamelContextFactory.java?rev=949646&r1=949645&r2=949646&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/SpringCamelContextFactory.java (original)
+++ camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/SpringCamelContextFactory.java Mon May 31 01:55:33 2010
@@ -17,7 +17,6 @@
 package org.apache.camel.osgi;
 
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.osgi.CamelContextFactory;
 import org.apache.camel.spring.SpringCamelContext;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;

Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java?rev=949646&r1=949645&r2=949646&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java Mon May 31 01:55:33 2010
@@ -21,7 +21,6 @@ import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
 
-import org.apache.camel.core.osgi.Activator;
 import org.springframework.osgi.mock.MockBundle;
 
 /**

Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/CamelOsgiTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/CamelOsgiTestSupport.java?rev=949646&r1=949645&r2=949646&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/CamelOsgiTestSupport.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/CamelOsgiTestSupport.java Mon May 31 01:55:33 2010
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.core.osgi;
 
-import org.apache.camel.core.osgi.Activator;
-import org.apache.camel.core.osgi.OsgiClassResolver;
-import org.apache.camel.core.osgi.OsgiPackageScanClassResolver;
 import org.apache.camel.spi.ClassResolver;
 import org.junit.After;
 import org.junit.Assert;

Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiAnnotationTypeConverterLoaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiAnnotationTypeConverterLoaderTest.java?rev=949646&r1=949645&r2=949646&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiAnnotationTypeConverterLoaderTest.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiAnnotationTypeConverterLoaderTest.java Mon May 31 01:55:33 2010
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.core.osgi;
 
-import org.apache.camel.core.osgi.OsgiAnnotationTypeConverterLoader;
 import org.apache.camel.osgi.test.MockTypeConverterRegistry;
 import org.junit.Test;
 

Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiComponentResolverTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiComponentResolverTest.java?rev=949646&r1=949645&r2=949646&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiComponentResolverTest.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiComponentResolverTest.java Mon May 31 01:55:33 2010
@@ -19,7 +19,6 @@ package org.apache.camel.core.osgi;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Component;
 import org.apache.camel.component.file.FileComponent;
-import org.apache.camel.core.osgi.OsgiComponentResolver;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.junit.Test;
 

Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiFactoryFinderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiFactoryFinderTest.java?rev=949646&r1=949645&r2=949646&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiFactoryFinderTest.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiFactoryFinderTest.java Mon May 31 01:55:33 2010
@@ -20,7 +20,6 @@ import java.io.IOException;
 
 import org.apache.camel.NoFactoryAvailableException;
 import org.apache.camel.impl.DefaultClassResolver;
-import org.apache.camel.core.osgi.OsgiFactoryFinder;
 import org.junit.Test;
 
 public class OsgiFactoryFinderTest extends CamelOsgiTestSupport {

Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiLanguageResolverTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiLanguageResolverTest.java?rev=949646&r1=949645&r2=949646&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiLanguageResolverTest.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiLanguageResolverTest.java Mon May 31 01:55:33 2010
@@ -20,7 +20,6 @@ import java.io.IOException;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.core.osgi.OsgiLanguageResolver;
 import org.apache.camel.spi.Language;
 import org.junit.Test;
 

Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolverTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolverTest.java?rev=949646&r1=949645&r2=949646&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolverTest.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolverTest.java Mon May 31 01:55:33 2010
@@ -21,8 +21,6 @@ import java.util.Set;
 
 import org.apache.camel.Converter;
 import org.apache.camel.RoutesBuilder;
-import org.apache.camel.core.osgi.Activator;
-import org.apache.camel.core.osgi.OsgiPackageScanClassResolver;
 import org.apache.camel.osgi.test.MyRouteBuilder;
 import org.apache.camel.osgi.test.MyTypeConverter;
 import org.junit.Test;