svn commit: r659638 - in /activemq/camel/trunk: camel-core/src/main/java/org/apache/camel/ camel-core/src/main/java/org/apache/camel/impl/ camel-core/src/main/java/org/apache/camel/processor/ camel-core/src/main/java/org/apache/camel/util/ camel-core/s...

[ha...@apache.org]

Author: hadrian
Date: Fri May 23 12:37:19 2008
New Revision: 659638

URL: http://svn.apache.org/viewvc?rev=659638&view=rev
Log:
CAMEL-544. Remove tangles between oac.impl and oac.util

Added:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
      - copied, changed from r659613, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ProducerCache.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterLoader.java
      - copied, changed from r659613, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReportingTypeConverterLoader.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterRegistry.java
      - copied, changed from r659613, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReportingTypeConverterRegistry.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReflectionInjector.java
      - copied, changed from r659602, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReflectionInjector.java
Removed:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReflectionInjector.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ProducerCache.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReportingTypeConverterLoader.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReportingTypeConverterRegistry.java
Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelTemplate.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/InjectorDefaultsToReflectionTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java
    activemq/camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java
    activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/ScalaTypeConverterTest.scala
    activemq/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
    activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ConvertersMojo.java

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelTemplate.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelTemplate.java?rev=659638&r1=659637&r2=659638&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelTemplate.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelTemplate.java Fri May 23 12:37:19 2008
@@ -19,9 +19,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.camel.impl.ProducerCache;
 import org.apache.camel.impl.ServiceSupport;
 import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.ProducerCache;
 
 /**
  * A client helper object (named like Spring's TransactionTemplate & JmsTemplate

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=659638&r1=659637&r2=659638&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Fri May 23 12:37:19 2008
@@ -51,6 +51,7 @@
 import org.apache.camel.util.FactoryFinder;
 import org.apache.camel.util.NoFactoryAvailableException;
 import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.ReflectionInjector;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java (from r659613, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ProducerCache.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java?p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ProducerCache.java&r1=659613&r2=659638&rev=659638&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ProducerCache.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java Fri May 23 12:37:19 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.util;
+package org.apache.camel.impl;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -29,6 +29,7 @@
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.impl.ServiceSupport;
 import org.apache.camel.impl.converter.AsyncProcessorTypeConverter;
+import org.apache.camel.util.ServiceHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterLoader.java (from r659613, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReportingTypeConverterLoader.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterLoader.java?p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterLoader.java&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReportingTypeConverterLoader.java&r1=659613&r2=659638&rev=659638&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReportingTypeConverterLoader.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterLoader.java Fri May 23 12:37:19 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.util;
+package org.apache.camel.impl;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -25,14 +25,14 @@
 import org.apache.camel.TypeConverter;
 import org.apache.camel.impl.converter.AnnotationTypeConverterLoader;
 import org.apache.camel.impl.converter.TypeConverterRegistry;
-import static org.apache.camel.util.ObjectHelper.equal;
+import org.apache.camel.util.ObjectHelper;
 
 public class ReportingTypeConverterLoader extends AnnotationTypeConverterLoader {
 
     private static final Comparator<TypeMapping> COMPARE_LAST_LOADED_FIRST = new Comparator<TypeMapping>() {
         public int compare(TypeMapping t1, TypeMapping t2) {
-            if (equal(t1.fromType, t2.fromType)) {
-                return equal(t1.toType, t2.toType) ? t1.index - t2.index : ObjectHelper
+            if (ObjectHelper.equal(t1.fromType, t2.fromType)) {
+                return ObjectHelper.equal(t1.toType, t2.toType) ? t1.index - t2.index : ObjectHelper
                     .compare(getTypeName(t1.toType), getTypeName(t2.toType));
             }
             return ObjectHelper.compare(getTypeName(t1.fromType), getTypeName(t2.fromType));

Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterRegistry.java (from r659613, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReportingTypeConverterRegistry.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterRegistry.java?p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterRegistry.java&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReportingTypeConverterRegistry.java&r1=659613&r2=659638&rev=659638&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReportingTypeConverterRegistry.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterRegistry.java Fri May 23 12:37:19 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.util;
+package org.apache.camel.impl;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java?rev=659638&r1=659637&r2=659638&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java Fri May 23 12:37:19 2008
@@ -28,10 +28,10 @@
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.converter.ObjectConverter;
+import org.apache.camel.impl.ProducerCache;
 import org.apache.camel.impl.ServiceSupport;
 import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy;
 import org.apache.camel.util.ExchangeHelper;
-import org.apache.camel.util.ProducerCache;
 import static org.apache.camel.util.ObjectHelper.notNull;
 
 /**

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java?rev=659638&r1=659637&r2=659638&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java Fri May 23 12:37:19 2008
@@ -23,11 +23,11 @@
 import org.apache.camel.Message;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
+import org.apache.camel.impl.ProducerCache;
 import org.apache.camel.impl.ServiceSupport;
 import org.apache.camel.model.RoutingSlipType;
 import org.apache.camel.util.CollectionStringBuffer;
 import org.apache.camel.util.ExchangeHelper;
-import org.apache.camel.util.ProducerCache;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReflectionInjector.java (from r659602, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReflectionInjector.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReflectionInjector.java?p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReflectionInjector.java&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReflectionInjector.java&r1=659602&r2=659638&rev=659638&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReflectionInjector.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReflectionInjector.java Fri May 23 12:37:19 2008
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.impl;
+package org.apache.camel.util;
 
-import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Injector;
-import org.apache.camel.util.ObjectHelper;
 
 /**
  * A simple implementation of {@link Injector} which just uses reflection to

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.java?rev=659638&r1=659637&r2=659638&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.java Fri May 23 12:37:19 2008
@@ -37,10 +37,10 @@
 import javax.naming.Reference;
 import javax.naming.spi.NamingManager;
 
-import org.apache.camel.impl.ReflectionInjector;
 import org.apache.camel.spi.Injector;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.ReflectionInjector;
 
 /**
  * A default JNDI context

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/InjectorDefaultsToReflectionTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/InjectorDefaultsToReflectionTest.java?rev=659638&r1=659637&r2=659638&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/InjectorDefaultsToReflectionTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/InjectorDefaultsToReflectionTest.java Fri May 23 12:37:19 2008
@@ -18,8 +18,8 @@
 
 import junit.framework.TestCase;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.ReflectionInjector;
 import org.apache.camel.spi.Injector;
+import org.apache.camel.util.ReflectionInjector;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java?rev=659638&r1=659637&r2=659638&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java Fri May 23 12:37:19 2008
@@ -28,9 +28,9 @@
 
 import junit.framework.TestCase;
 import org.apache.camel.TypeConverter;
-import org.apache.camel.impl.ReflectionInjector;
 import org.apache.camel.impl.converter.DefaultTypeConverter;
 import org.apache.camel.util.IntrospectionSupport;
+import org.apache.camel.util.ReflectionInjector;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java?rev=659638&r1=659637&r2=659638&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java Fri May 23 12:37:19 2008
@@ -28,8 +28,8 @@
 
 import junit.framework.TestCase;
 import org.apache.camel.TypeConverter;
-import org.apache.camel.impl.ReflectionInjector;
 import org.apache.camel.impl.converter.DefaultTypeConverter;
+import org.apache.camel.util.ReflectionInjector;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: activemq/camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java?rev=659638&r1=659637&r2=659638&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java (original)
+++ activemq/camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java Fri May 23 12:37:19 2008
@@ -24,8 +24,8 @@
 import junit.framework.TestCase;
 
 import org.apache.camel.TypeConverter;
-import org.apache.camel.impl.ReflectionInjector;
 import org.apache.camel.impl.converter.DefaultTypeConverter;
+import org.apache.camel.util.ReflectionInjector;
 import org.apache.jackrabbit.value.BinaryValue;
 import org.apache.jackrabbit.value.BooleanValue;
 import org.apache.jackrabbit.value.DateValue;

Modified: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/ScalaTypeConverterTest.scala
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/ScalaTypeConverterTest.scala?rev=659638&r1=659637&r2=659638&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/ScalaTypeConverterTest.scala (original)
+++ activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/ScalaTypeConverterTest.scala Fri May 23 12:37:19 2008
@@ -19,7 +19,7 @@
 import junit.framework.TestCase
 import junit.framework.Assert._
 
-import org.apache.camel.impl.ReflectionInjector
+import org.apache.camel.util.ReflectionInjector
 import org.apache.camel.impl.converter.DefaultTypeConverter
 
 import org.w3c.dom.Document

Modified: activemq/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java?rev=659638&r1=659637&r2=659638&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java Fri May 23 12:37:19 2008
@@ -30,7 +30,7 @@
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.converter.ObjectConverter;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.util.ProducerCache;
+import org.apache.camel.impl.ProducerCache;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ConvertersMojo.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ConvertersMojo.java?rev=659638&r1=659637&r2=659638&view=diff
==============================================================================
--- activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ConvertersMojo.java (original)
+++ activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ConvertersMojo.java Fri May 23 12:37:19 2008
@@ -31,10 +31,10 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 
+import org.apache.camel.impl.ReportingTypeConverterLoader;
+import org.apache.camel.impl.ReportingTypeConverterRegistry;
+import org.apache.camel.impl.ReportingTypeConverterLoader.TypeMapping;
 import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.ReportingTypeConverterLoader;
-import org.apache.camel.util.ReportingTypeConverterLoader.TypeMapping;
-import org.apache.camel.util.ReportingTypeConverterRegistry;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;