camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r982479 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/impl/ components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/
Date Thu, 05 Aug 2010 05:50:09 GMT
Author: ningjiang
Date: Thu Aug  5 05:50:09 2010
New Revision: 982479

URL: http://svn.apache.org/viewvc?rev=982479&view=rev
Log:
CAMEL-3026 moved the CompositeRegistry into camel-core

Added:
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java   (contents,
props changed)
      - copied, changed from r982449, camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/CompositeRegistry.java
Removed:
    camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/CompositeRegistry.java
Modified:
    camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
    camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextHelper.java

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java
(from r982449, camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/CompositeRegistry.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java&p1=camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/CompositeRegistry.java&r1=982449&r2=982479&rev=982479&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/CompositeRegistry.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java Thu
Aug  5 05:50:09 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.core.osgi;
+package org.apache.camel.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;

Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java?rev=982479&r1=982478&r2=982479&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
(original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
Thu Aug  5 05:50:09 2010
@@ -17,13 +17,13 @@
 package org.apache.camel.blueprint;
 
 import org.apache.camel.TypeConverter;
-import org.apache.camel.core.osgi.CompositeRegistry;
 import org.apache.camel.core.osgi.OsgiCamelContextHelper;
 import org.apache.camel.core.osgi.OsgiClassResolver;
 import org.apache.camel.core.osgi.OsgiFactoryFinderResolver;
 import org.apache.camel.core.osgi.OsgiPackageScanClassResolver;
 import org.apache.camel.core.osgi.OsgiServiceRegistry;
 import org.apache.camel.core.osgi.OsgiTypeConverter;
+import org.apache.camel.impl.CompositeRegistry;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.spi.Registry;
 import org.apache.commons.logging.Log;

Modified: camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextHelper.java?rev=982479&r1=982478&r2=982479&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextHelper.java
(original)
+++ camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextHelper.java
Thu Aug  5 05:50:09 2010
@@ -19,6 +19,7 @@ package org.apache.camel.core.osgi;
 import java.util.List;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.impl.CompositeRegistry;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.converter.AnnotationTypeConverterLoader;
 import org.apache.camel.impl.converter.DefaultTypeConverter;



Mime
View raw message