svn commit: r1435052 - in /camel/trunk/components/camel-core-osgi/src: main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java test/java/org/apache/camel/core/osgi/CamelMockBundleContext.java

[ningjiang]

Author: ningjiang
Date: Fri Jan 18 08:45:34 2013
New Revision: 1435052

URL: http://svn.apache.org/viewvc?rev=1435052&view=rev
Log:
CAMEL-5969, CAMEL-5972 Fixed the build error in CI

Modified:
    
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java
    
camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundleContext.java

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=1435052&r1=1435051&r2=1435052&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 Jan 18 08:45:34 2013
@@ -36,7 +36,6 @@ import org.osgi.framework.ServiceReferen
 public class OsgiServiceRegistry extends LifecycleStrategySupport implements 
Registry {
     private final BundleContext bundleContext;
     private final Map<String, Object> serviceCacheMap = new 
ConcurrentHashMap<String, Object>();
-    private final Map<Class<?>, Map<String, Object>> typeCacheMap = new 
ConcurrentHashMap<Class<?>, Map<String, Object>>();
     private final Queue<ServiceReference<?>> serviceReferenceQueue = new 
ConcurrentLinkedQueue<ServiceReference<?>>();
     
     public OsgiServiceRegistry(BundleContext bc) {

Modified: 
camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundleContext.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundleContext.java?rev=1435052&r1=1435051&r2=1435052&view=diff
==============================================================================
--- 
camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundleContext.java
 (original)
+++ 
camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundleContext.java
 Fri Jan 18 08:45:34 2013
@@ -19,7 +19,6 @@ package org.apache.camel.core.osgi;
 import java.util.Dictionary;
 import java.util.Hashtable;
 
-import com.sun.org.apache.xml.internal.security.encryption.Reference;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Component;
 import org.apache.camel.component.file.FileComponent;