svn commit: r1171472 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/impl/ main/java/org/apache/camel/util/ test/java/org/apache/camel/impl/ test/java/org/apache/camel/util/

[cs...@apache.org]

Author: cschneider
Date: Fri Sep 16 09:29:02 2011
New Revision: 1171472

URL: http://svn.apache.org/viewvc?rev=1171472&view=rev
Log:
Move ConfigurationHelper to impl as it needs access to impl classes and is not used out of impl

Added:
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ConfigurationHelper.java
      - copied, changed from r1171435, camel/trunk/camel-core/src/main/java/org/apache/camel/util/ConfigurationHelper.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ConfigurationHelperTest.java
      - copied, changed from r1171416, camel/trunk/camel-core/src/test/java/org/apache/camel/util/ConfigurationHelperTest.java
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointConfiguration.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MappedEndpointConfiguration.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/ConfigurationHelper.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/impl/EndpointConfigurationTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/util/ConfigurationHelperTest.java

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ConfigurationHelper.java (from r1171435, camel/trunk/camel-core/src/main/java/org/apache/camel/util/ConfigurationHelper.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ConfigurationHelper.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ConfigurationHelper.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/util/ConfigurationHelper.java&r1=1171435&r2=1171472&rev=1171472&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/ConfigurationHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ConfigurationHelper.java Fri Sep 16 09:29:02 2011
@@ -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.Field;
 import java.lang.reflect.Method;
@@ -28,8 +28,10 @@ import org.apache.camel.EndpointConfigur
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.TypeConverter;
 import org.apache.camel.URIField;
-import org.apache.camel.impl.DefaultEndpointConfiguration;
 import org.apache.camel.impl.converter.PropertyEditorTypeConverter;
+import org.apache.camel.util.IntrospectionSupport;
+import org.apache.camel.util.URISupport;
+import org.apache.camel.util.UnsafeUriCharactersEncoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointConfiguration.java?rev=1171472&r1=1171471&r2=1171472&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointConfiguration.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointConfiguration.java Fri Sep 16 09:29:02 2011
@@ -16,23 +16,12 @@
  */
 package org.apache.camel.impl;
 
-import java.lang.reflect.Field;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 import org.apache.camel.Component;
-import org.apache.camel.Endpoint;
 import org.apache.camel.EndpointConfiguration;
-import org.apache.camel.Route;
 import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.Service;
-import org.apache.camel.spi.RouteContext;
-import org.apache.camel.util.ConfigurationHelper;
-import org.apache.camel.util.ObjectHelper;
 
 /**
  * Default implementation of {@link EndpointConfiguration}.

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MappedEndpointConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MappedEndpointConfiguration.java?rev=1171472&r1=1171471&r2=1171472&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MappedEndpointConfiguration.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MappedEndpointConfiguration.java Fri Sep 16 09:29:02 2011
@@ -29,7 +29,6 @@ import org.apache.camel.Component;
 import org.apache.camel.EndpointConfiguration;
 import org.apache.camel.TypeConverter;
 import org.apache.camel.impl.converter.PropertyEditorTypeConverter;
-import org.apache.camel.util.ConfigurationHelper;
 import org.apache.camel.util.UnsafeUriCharactersEncoder;
 
 /**

Copied: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ConfigurationHelperTest.java (from r1171416, camel/trunk/camel-core/src/test/java/org/apache/camel/util/ConfigurationHelperTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ConfigurationHelperTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ConfigurationHelperTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/util/ConfigurationHelperTest.java&r1=1171416&r2=1171472&rev=1171472&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/util/ConfigurationHelperTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ConfigurationHelperTest.java Fri Sep 16 09:29:02 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.camel.util;
+package org.apache.camel.impl;
 
 import java.lang.reflect.Field;
 import java.util.HashMap;
@@ -26,8 +26,6 @@ import org.apache.camel.Component;
 import org.apache.camel.Endpoint;
 import org.apache.camel.EndpointConfiguration;
 import org.apache.camel.URIField;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.DefaultEndpointConfiguration;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/EndpointConfigurationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/EndpointConfigurationTest.java?rev=1171472&r1=1171471&r2=1171472&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/EndpointConfigurationTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/EndpointConfigurationTest.java Fri Sep 16 09:29:02 2011
@@ -21,7 +21,6 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.Component;
 import org.apache.camel.Endpoint;
 import org.apache.camel.EndpointConfiguration;
-import org.apache.camel.util.ConfigurationHelper;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;