You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2014/09/12 20:04:46 UTC
svn commit: r1624601 [3/9] - in
/commons/proper/configuration/branches/configuration2-alpha/src:
main/java/org/apache/commons/configuration/
main/java/org/apache/commons/configuration2/
main/java/org/apache/commons/configuration2/beanutils/ main/java/o...
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl.java Fri Sep 12 18:04:36 2014
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
import java.io.File;
import java.net.URL;
import java.util.Map;
-import org.apache.commons.configuration.io.FileHandler;
-import org.apache.commons.configuration.io.FileLocationStrategy;
-import org.apache.commons.configuration.io.FileSystem;
+import org.apache.commons.configuration2.io.FileHandler;
+import org.apache.commons.configuration2.io.FileLocationStrategy;
+import org.apache.commons.configuration2.io.FileSystem;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderProperties.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderProperties.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderProperties.java Fri Sep 12 18:04:36 2014
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
import java.io.File;
import java.net.URL;
-import org.apache.commons.configuration.io.FileLocationStrategy;
-import org.apache.commons.configuration.io.FileSystem;
+import org.apache.commons.configuration2.io.FileLocationStrategy;
+import org.apache.commons.configuration2.io.FileSystem;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.java Fri Sep 12 18:04:36 2014
@@ -14,18 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.commons.configuration.FileBasedConfiguration;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.configuration.XMLPropertiesConfiguration;
-import org.apache.commons.configuration.event.ConfigurationEvent;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.io.FileHandler;
+import org.apache.commons.configuration2.FileBasedConfiguration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.XMLPropertiesConfiguration;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.FileHandler;
import org.apache.commons.lang3.ClassUtils;
import org.apache.commons.lang3.StringUtils;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/HierarchicalBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/HierarchicalBuilderParametersImpl.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/HierarchicalBuilderParametersImpl.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/HierarchicalBuilderParametersImpl.java Fri Sep 12 18:04:36 2014
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
-import org.apache.commons.configuration.tree.ExpressionEngine;
+import org.apache.commons.configuration2.tree.ExpressionEngine;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/HierarchicalBuilderProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/HierarchicalBuilderProperties.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/HierarchicalBuilderProperties.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/HierarchicalBuilderProperties.java Fri Sep 12 18:04:36 2014
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
-import org.apache.commons.configuration.tree.ExpressionEngine;
+import org.apache.commons.configuration2.tree.ExpressionEngine;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/JndiBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/JndiBuilderParametersImpl.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/JndiBuilderParametersImpl.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/JndiBuilderParametersImpl.java Fri Sep 12 18:04:36 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
import javax.naming.Context;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/JndiBuilderProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/JndiBuilderProperties.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/JndiBuilderProperties.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/JndiBuilderProperties.java Fri Sep 12 18:04:36 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
import javax.naming.Context;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/PropertiesBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/PropertiesBuilderParametersImpl.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/PropertiesBuilderParametersImpl.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/PropertiesBuilderParametersImpl.java Fri Sep 12 18:04:36 2014
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
-import org.apache.commons.configuration.PropertiesConfiguration.IOFactory;
-import org.apache.commons.configuration.PropertiesConfigurationLayout;
+import org.apache.commons.configuration2.PropertiesConfiguration.IOFactory;
+import org.apache.commons.configuration2.PropertiesConfigurationLayout;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/PropertiesBuilderProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/PropertiesBuilderProperties.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/PropertiesBuilderProperties.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/PropertiesBuilderProperties.java Fri Sep 12 18:04:36 2014
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
-import org.apache.commons.configuration.PropertiesConfiguration.IOFactory;
-import org.apache.commons.configuration.PropertiesConfigurationLayout;
+import org.apache.commons.configuration2.PropertiesConfiguration.IOFactory;
+import org.apache.commons.configuration2.PropertiesConfigurationLayout;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/ReloadingBuilderSupportListener.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/ReloadingBuilderSupportListener.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/ReloadingBuilderSupportListener.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/ReloadingBuilderSupportListener.java Fri Sep 12 18:04:36 2014
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
-import org.apache.commons.configuration.event.Event;
-import org.apache.commons.configuration.event.EventListener;
-import org.apache.commons.configuration.reloading.ReloadingController;
-import org.apache.commons.configuration.reloading.ReloadingEvent;
+import org.apache.commons.configuration2.event.Event;
+import org.apache.commons.configuration2.event.EventListener;
+import org.apache.commons.configuration2.reloading.ReloadingController;
+import org.apache.commons.configuration2.reloading.ReloadingEvent;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/ReloadingDetectorFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/ReloadingDetectorFactory.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/ReloadingDetectorFactory.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/ReloadingDetectorFactory.java Fri Sep 12 18:04:36 2014
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.io.FileHandler;
-import org.apache.commons.configuration.reloading.ReloadingDetector;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.FileHandler;
+import org.apache.commons.configuration2.reloading.ReloadingDetector;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/ReloadingFileBasedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/ReloadingFileBasedConfigurationBuilder.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/ReloadingFileBasedConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/ReloadingFileBasedConfigurationBuilder.java Fri Sep 12 18:04:36 2014
@@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
import java.util.Map;
-import org.apache.commons.configuration.FileBasedConfiguration;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.io.FileHandler;
-import org.apache.commons.configuration.reloading.FileHandlerReloadingDetector;
-import org.apache.commons.configuration.reloading.ReloadingController;
-import org.apache.commons.configuration.reloading.ReloadingControllerSupport;
-import org.apache.commons.configuration.reloading.ReloadingDetector;
+import org.apache.commons.configuration2.FileBasedConfiguration;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.FileHandler;
+import org.apache.commons.configuration2.reloading.FileHandlerReloadingDetector;
+import org.apache.commons.configuration2.reloading.ReloadingController;
+import org.apache.commons.configuration2.reloading.ReloadingControllerSupport;
+import org.apache.commons.configuration2.reloading.ReloadingDetector;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/XMLBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/XMLBuilderParametersImpl.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/XMLBuilderParametersImpl.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/XMLBuilderParametersImpl.java Fri Sep 12 18:04:36 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
import javax.xml.parsers.DocumentBuilder;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/XMLBuilderProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/XMLBuilderProperties.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/XMLBuilderProperties.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/XMLBuilderProperties.java Fri Sep 12 18:04:36 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
import javax.xml.parsers.DocumentBuilder;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.java Fri Sep 12 18:04:36 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.combined;
+package org.apache.commons.configuration2.builder.combined;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
@@ -22,12 +22,12 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Map;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationUtils;
-import org.apache.commons.configuration.builder.BasicConfigurationBuilder;
-import org.apache.commons.configuration.builder.BuilderParameters;
-import org.apache.commons.configuration.builder.ConfigurationBuilder;
-import org.apache.commons.configuration.ex.ConfigurationException;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationUtils;
+import org.apache.commons.configuration2.builder.BasicConfigurationBuilder;
+import org.apache.commons.configuration2.builder.BuilderParameters;
+import org.apache.commons.configuration2.builder.ConfigurationBuilder;
+import org.apache.commons.configuration2.ex.ConfigurationException;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.java Fri Sep 12 18:04:36 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.combined;
+package org.apache.commons.configuration2.builder.combined;
import java.util.ArrayList;
import java.util.Collection;
@@ -23,13 +23,13 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.Map;
-import org.apache.commons.configuration.ConfigurationUtils;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.configuration.builder.BasicBuilderParameters;
-import org.apache.commons.configuration.builder.BuilderParameters;
-import org.apache.commons.configuration.builder.ConfigurationBuilder;
-import org.apache.commons.configuration.builder.DefaultParametersHandler;
-import org.apache.commons.configuration.builder.DefaultParametersManager;
+import org.apache.commons.configuration2.ConfigurationUtils;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.builder.BasicBuilderParameters;
+import org.apache.commons.configuration2.builder.BuilderParameters;
+import org.apache.commons.configuration2.builder.ConfigurationBuilder;
+import org.apache.commons.configuration2.builder.DefaultParametersHandler;
+import org.apache.commons.configuration2.builder.DefaultParametersManager;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderProperties.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderProperties.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderProperties.java Fri Sep 12 18:04:36 2014
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.combined;
+package org.apache.commons.configuration2.builder.combined;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.configuration.builder.BuilderParameters;
-import org.apache.commons.configuration.builder.ConfigurationBuilder;
-import org.apache.commons.configuration.builder.DefaultParametersHandler;
-import org.apache.commons.configuration.builder.DefaultParametersManager;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.builder.BuilderParameters;
+import org.apache.commons.configuration2.builder.ConfigurationBuilder;
+import org.apache.commons.configuration2.builder.DefaultParametersHandler;
+import org.apache.commons.configuration2.builder.DefaultParametersManager;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java Fri Sep 12 18:04:36 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.combined;
+package org.apache.commons.configuration2.builder.combined;
import java.net.URL;
import java.util.Arrays;
@@ -27,37 +27,37 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.configuration.CombinedConfiguration;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationLookup;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.configuration.SystemConfiguration;
-import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.commons.configuration.beanutils.BeanDeclaration;
-import org.apache.commons.configuration.beanutils.BeanHelper;
-import org.apache.commons.configuration.beanutils.CombinedBeanDeclaration;
-import org.apache.commons.configuration.beanutils.XMLBeanDeclaration;
-import org.apache.commons.configuration.builder.BasicBuilderParameters;
-import org.apache.commons.configuration.builder.BasicConfigurationBuilder;
-import org.apache.commons.configuration.builder.BuilderParameters;
-import org.apache.commons.configuration.builder.ConfigurationBuilder;
-import org.apache.commons.configuration.builder.ConfigurationBuilderEvent;
-import org.apache.commons.configuration.builder.DefaultParametersManager;
-import org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl;
-import org.apache.commons.configuration.builder.FileBasedBuilderProperties;
-import org.apache.commons.configuration.builder.FileBasedConfigurationBuilder;
-import org.apache.commons.configuration.builder.XMLBuilderParametersImpl;
-import org.apache.commons.configuration.builder.XMLBuilderProperties;
-import org.apache.commons.configuration.event.EventListener;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.ex.ConfigurationRuntimeException;
-import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
-import org.apache.commons.configuration.interpol.Lookup;
-import org.apache.commons.configuration.io.FileSystem;
-import org.apache.commons.configuration.resolver.CatalogResolver;
-import org.apache.commons.configuration.tree.DefaultExpressionEngineSymbols;
-import org.apache.commons.configuration.tree.OverrideCombiner;
-import org.apache.commons.configuration.tree.UnionCombiner;
+import org.apache.commons.configuration2.CombinedConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationLookup;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.SystemConfiguration;
+import org.apache.commons.configuration2.XMLConfiguration;
+import org.apache.commons.configuration2.beanutils.BeanDeclaration;
+import org.apache.commons.configuration2.beanutils.BeanHelper;
+import org.apache.commons.configuration2.beanutils.CombinedBeanDeclaration;
+import org.apache.commons.configuration2.beanutils.XMLBeanDeclaration;
+import org.apache.commons.configuration2.builder.BasicBuilderParameters;
+import org.apache.commons.configuration2.builder.BasicConfigurationBuilder;
+import org.apache.commons.configuration2.builder.BuilderParameters;
+import org.apache.commons.configuration2.builder.ConfigurationBuilder;
+import org.apache.commons.configuration2.builder.ConfigurationBuilderEvent;
+import org.apache.commons.configuration2.builder.DefaultParametersManager;
+import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.FileBasedBuilderProperties;
+import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.builder.XMLBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.XMLBuilderProperties;
+import org.apache.commons.configuration2.event.EventListener;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
+import org.apache.commons.configuration2.interpol.Lookup;
+import org.apache.commons.configuration2.io.FileSystem;
+import org.apache.commons.configuration2.resolver.CatalogResolver;
+import org.apache.commons.configuration2.tree.DefaultExpressionEngineSymbols;
+import org.apache.commons.configuration2.tree.OverrideCombiner;
+import org.apache.commons.configuration2.tree.UnionCombiner;
import org.xml.sax.EntityResolver;
/**
@@ -74,7 +74,7 @@ import org.xml.sax.EntityResolver;
* classes. If such a tag is found, a corresponding {@code ConfigurationBuilder}
* class is instantiated and initialized using the classes of the
* {@code beanutils} package (namely
- * {@link org.apache.commons.configuration.beanutils.XMLBeanDeclaration
+ * {@link org.apache.commons.configuration2.beanutils.XMLBeanDeclaration
* XMLBeanDeclaration} will be used to extract the configuration's
* initialization parameters, which allows for complex initialization
* scenarios).
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.java Fri Sep 12 18:04:36 2014
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.combined;
+package org.apache.commons.configuration2.builder.combined;
import java.util.Arrays;
import java.util.Collection;
-import org.apache.commons.configuration.CombinedConfiguration;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.builder.BasicBuilderParameters;
-import org.apache.commons.configuration.builder.BasicConfigurationBuilder;
-import org.apache.commons.configuration.builder.BuilderParameters;
+import org.apache.commons.configuration2.CombinedConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.builder.BasicBuilderParameters;
+import org.apache.commons.configuration2.builder.BasicConfigurationBuilder;
+import org.apache.commons.configuration2.builder.BuilderParameters;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationBuilderProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationBuilderProvider.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationBuilderProvider.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationBuilderProvider.java Fri Sep 12 18:04:36 2014
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.combined;
+package org.apache.commons.configuration2.builder.combined;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.builder.ConfigurationBuilder;
-import org.apache.commons.configuration.ex.ConfigurationException;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.builder.ConfigurationBuilder;
+import org.apache.commons.configuration2.ex.ConfigurationException;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.java Fri Sep 12 18:04:36 2014
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.combined;
+package org.apache.commons.configuration2.builder.combined;
import java.util.Set;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.configuration.beanutils.XMLBeanDeclaration;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.beanutils.XMLBeanDeclaration;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/FileExtensionConfigurationBuilderProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/FileExtensionConfigurationBuilderProvider.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/FileExtensionConfigurationBuilderProvider.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/FileExtensionConfigurationBuilderProvider.java Fri Sep 12 18:04:36 2014
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.combined;
+package org.apache.commons.configuration2.builder.combined;
import java.util.Collection;
-import org.apache.commons.configuration.builder.BuilderParameters;
-import org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl;
-import org.apache.commons.configuration.ex.ConfigurationException;
+import org.apache.commons.configuration2.builder.BuilderParameters;
+import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl;
+import org.apache.commons.configuration2.ex.ConfigurationException;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl.java Fri Sep 12 18:04:36 2014
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.combined;
+package org.apache.commons.configuration2.builder.combined;
import java.util.Map;
-import org.apache.commons.configuration.ConfigurationUtils;
-import org.apache.commons.configuration.builder.BasicBuilderParameters;
-import org.apache.commons.configuration.builder.BuilderParameters;
-import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
+import org.apache.commons.configuration2.ConfigurationUtils;
+import org.apache.commons.configuration2.builder.BasicBuilderParameters;
+import org.apache.commons.configuration2.builder.BuilderParameters;
+import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileBuilderProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileBuilderProperties.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileBuilderProperties.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileBuilderProperties.java Fri Sep 12 18:04:36 2014
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.combined;
+package org.apache.commons.configuration2.builder.combined;
-import org.apache.commons.configuration.builder.BuilderParameters;
+import org.apache.commons.configuration2.builder.BuilderParameters;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.java Fri Sep 12 18:04:36 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.combined;
+package org.apache.commons.configuration2.builder.combined;
import java.util.HashMap;
import java.util.Map;
@@ -22,21 +22,21 @@ import java.util.concurrent.ConcurrentHa
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.commons.configuration.ConfigurationUtils;
-import org.apache.commons.configuration.FileBasedConfiguration;
-import org.apache.commons.configuration.builder.BasicBuilderParameters;
-import org.apache.commons.configuration.builder.BasicConfigurationBuilder;
-import org.apache.commons.configuration.builder.BuilderParameters;
-import org.apache.commons.configuration.builder.ConfigurationBuilderEvent;
-import org.apache.commons.configuration.builder.ConfigurationBuilderResultCreatedEvent;
-import org.apache.commons.configuration.builder.FileBasedConfigurationBuilder;
-import org.apache.commons.configuration.event.Event;
-import org.apache.commons.configuration.event.EventListener;
-import org.apache.commons.configuration.event.EventListenerList;
-import org.apache.commons.configuration.event.EventType;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
-import org.apache.commons.configuration.interpol.InterpolatorSpecification;
+import org.apache.commons.configuration2.ConfigurationUtils;
+import org.apache.commons.configuration2.FileBasedConfiguration;
+import org.apache.commons.configuration2.builder.BasicBuilderParameters;
+import org.apache.commons.configuration2.builder.BasicConfigurationBuilder;
+import org.apache.commons.configuration2.builder.BuilderParameters;
+import org.apache.commons.configuration2.builder.ConfigurationBuilderEvent;
+import org.apache.commons.configuration2.builder.ConfigurationBuilderResultCreatedEvent;
+import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.event.Event;
+import org.apache.commons.configuration2.event.EventListener;
+import org.apache.commons.configuration2.event.EventListenerList;
+import org.apache.commons.configuration2.event.EventType;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
+import org.apache.commons.configuration2.interpol.InterpolatorSpecification;
import org.apache.commons.lang3.concurrent.ConcurrentUtils;
/**
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilderProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilderProvider.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilderProvider.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilderProvider.java Fri Sep 12 18:04:36 2014
@@ -14,22 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.combined;
+package org.apache.commons.configuration2.builder.combined;
import java.util.Arrays;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationUtils;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.configuration.builder.BuilderConfigurationWrapperFactory;
-import org.apache.commons.configuration.builder.BuilderConfigurationWrapperFactory.EventSourceSupport;
-import org.apache.commons.configuration.builder.ConfigurationBuilder;
-import org.apache.commons.configuration.event.Event;
-import org.apache.commons.configuration.event.EventListener;
-import org.apache.commons.configuration.event.EventType;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.reloading.ReloadingController;
-import org.apache.commons.configuration.reloading.ReloadingControllerSupport;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationUtils;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.builder.BuilderConfigurationWrapperFactory;
+import org.apache.commons.configuration2.builder.BuilderConfigurationWrapperFactory.EventSourceSupport;
+import org.apache.commons.configuration2.builder.ConfigurationBuilder;
+import org.apache.commons.configuration2.event.Event;
+import org.apache.commons.configuration2.event.EventListener;
+import org.apache.commons.configuration2.event.EventType;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.reloading.ReloadingController;
+import org.apache.commons.configuration2.reloading.ReloadingControllerSupport;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaBean.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaBean.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaBean.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaBean.java Fri Sep 12 18:04:36 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.combined;
+package org.apache.commons.configuration2.builder.combined;
import java.util.ArrayList;
import java.util.Collection;
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.commons.beanutils.DynaBean;
import org.apache.commons.beanutils.DynaClass;
import org.apache.commons.beanutils.DynaProperty;
-import org.apache.commons.configuration.beanutils.BeanHelper;
+import org.apache.commons.configuration2.beanutils.BeanHelper;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java Fri Sep 12 18:04:36 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.combined;
+package org.apache.commons.configuration2.builder.combined;
import java.util.Collection;
import java.util.HashMap;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingCombinedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingCombinedConfigurationBuilder.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingCombinedConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingCombinedConfigurationBuilder.java Fri Sep 12 18:04:36 2014
@@ -14,23 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.combined;
+package org.apache.commons.configuration2.builder.combined;
import java.util.Collection;
import java.util.LinkedList;
import java.util.Map;
-import org.apache.commons.configuration.CombinedConfiguration;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.commons.configuration.builder.BuilderParameters;
-import org.apache.commons.configuration.builder.ConfigurationBuilder;
-import org.apache.commons.configuration.builder.ReloadingFileBasedConfigurationBuilder;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.reloading.CombinedReloadingController;
-import org.apache.commons.configuration.reloading.ReloadingController;
-import org.apache.commons.configuration.reloading.ReloadingControllerSupport;
+import org.apache.commons.configuration2.CombinedConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.XMLConfiguration;
+import org.apache.commons.configuration2.builder.BuilderParameters;
+import org.apache.commons.configuration2.builder.ConfigurationBuilder;
+import org.apache.commons.configuration2.builder.ReloadingFileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.reloading.CombinedReloadingController;
+import org.apache.commons.configuration2.reloading.ReloadingController;
+import org.apache.commons.configuration2.reloading.ReloadingControllerSupport;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.java Fri Sep 12 18:04:36 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.combined;
+package org.apache.commons.configuration2.builder.combined;
import java.util.ArrayList;
import java.util.Collection;
@@ -22,13 +22,13 @@ import java.util.Collections;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.configuration.FileBasedConfiguration;
-import org.apache.commons.configuration.builder.FileBasedConfigurationBuilder;
-import org.apache.commons.configuration.builder.ReloadingFileBasedConfigurationBuilder;
-import org.apache.commons.configuration.ex.ConfigurationException;
-import org.apache.commons.configuration.reloading.CombinedReloadingController;
-import org.apache.commons.configuration.reloading.ReloadingController;
-import org.apache.commons.configuration.reloading.ReloadingControllerSupport;
+import org.apache.commons.configuration2.FileBasedConfiguration;
+import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.builder.ReloadingFileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.reloading.CombinedReloadingController;
+import org.apache.commons.configuration2.reloading.ReloadingController;
+import org.apache.commons.configuration2.reloading.ReloadingControllerSupport;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/package-info.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/package-info.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/package-info.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/combined/package-info.java Fri Sep 12 18:04:36 2014
@@ -37,4 +37,4 @@
*
* @version $Id$
*/
-package org.apache.commons.configuration.builder.combined;
+package org.apache.commons.configuration2.builder.combined;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/CombinedBuilderParameters.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/CombinedBuilderParameters.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/CombinedBuilderParameters.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/CombinedBuilderParameters.java Fri Sep 12 18:04:36 2014
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.fluent;
+package org.apache.commons.configuration2.builder.fluent;
-import org.apache.commons.configuration.builder.BasicBuilderProperties;
-import org.apache.commons.configuration.builder.BuilderParameters;
-import org.apache.commons.configuration.builder.combined.CombinedBuilderProperties;
+import org.apache.commons.configuration2.builder.BasicBuilderProperties;
+import org.apache.commons.configuration2.builder.BuilderParameters;
+import org.apache.commons.configuration2.builder.combined.CombinedBuilderProperties;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/Configurations.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/Configurations.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/Configurations.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/Configurations.java Fri Sep 12 18:04:36 2014
@@ -14,19 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.fluent;
+package org.apache.commons.configuration2.builder.fluent;
import java.io.File;
import java.net.URL;
-import org.apache.commons.configuration.CombinedConfiguration;
-import org.apache.commons.configuration.FileBasedConfiguration;
-import org.apache.commons.configuration.INIConfiguration;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.commons.configuration.builder.FileBasedConfigurationBuilder;
-import org.apache.commons.configuration.builder.combined.CombinedConfigurationBuilder;
-import org.apache.commons.configuration.ex.ConfigurationException;
+import org.apache.commons.configuration2.CombinedConfiguration;
+import org.apache.commons.configuration2.FileBasedConfiguration;
+import org.apache.commons.configuration2.INIConfiguration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.XMLConfiguration;
+import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder;
+import org.apache.commons.configuration2.ex.ConfigurationException;
/**
* <p>
@@ -80,7 +80,7 @@ import org.apache.commons.configuration.
*
* @version $Id$
* @since 2.0
- * @see org.apache.commons.configuration.builder.DefaultParametersManager
+ * @see org.apache.commons.configuration2.builder.DefaultParametersManager
*/
public class Configurations
{
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/DatabaseBuilderParameters.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/DatabaseBuilderParameters.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/DatabaseBuilderParameters.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/DatabaseBuilderParameters.java Fri Sep 12 18:04:36 2014
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.fluent;
+package org.apache.commons.configuration2.builder.fluent;
-import org.apache.commons.configuration.builder.BasicBuilderProperties;
-import org.apache.commons.configuration.builder.BuilderParameters;
-import org.apache.commons.configuration.builder.DatabaseBuilderProperties;
+import org.apache.commons.configuration2.builder.BasicBuilderProperties;
+import org.apache.commons.configuration2.builder.BuilderParameters;
+import org.apache.commons.configuration2.builder.DatabaseBuilderProperties;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/FileBasedBuilderParameters.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/FileBasedBuilderParameters.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/FileBasedBuilderParameters.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/FileBasedBuilderParameters.java Fri Sep 12 18:04:36 2014
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.fluent;
+package org.apache.commons.configuration2.builder.fluent;
-import org.apache.commons.configuration.builder.BasicBuilderProperties;
-import org.apache.commons.configuration.builder.BuilderParameters;
-import org.apache.commons.configuration.builder.FileBasedBuilderProperties;
+import org.apache.commons.configuration2.builder.BasicBuilderProperties;
+import org.apache.commons.configuration2.builder.BuilderParameters;
+import org.apache.commons.configuration2.builder.FileBasedBuilderProperties;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/HierarchicalBuilderParameters.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/HierarchicalBuilderParameters.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/HierarchicalBuilderParameters.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/HierarchicalBuilderParameters.java Fri Sep 12 18:04:36 2014
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.fluent;
+package org.apache.commons.configuration2.builder.fluent;
-import org.apache.commons.configuration.builder.BasicBuilderProperties;
-import org.apache.commons.configuration.builder.BuilderParameters;
-import org.apache.commons.configuration.builder.FileBasedBuilderProperties;
-import org.apache.commons.configuration.builder.HierarchicalBuilderProperties;
+import org.apache.commons.configuration2.builder.BasicBuilderProperties;
+import org.apache.commons.configuration2.builder.BuilderParameters;
+import org.apache.commons.configuration2.builder.FileBasedBuilderProperties;
+import org.apache.commons.configuration2.builder.HierarchicalBuilderProperties;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/JndiBuilderParameters.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/JndiBuilderParameters.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/JndiBuilderParameters.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/JndiBuilderParameters.java Fri Sep 12 18:04:36 2014
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.fluent;
+package org.apache.commons.configuration2.builder.fluent;
-import org.apache.commons.configuration.builder.BasicBuilderProperties;
-import org.apache.commons.configuration.builder.BuilderParameters;
-import org.apache.commons.configuration.builder.JndiBuilderProperties;
+import org.apache.commons.configuration2.builder.BasicBuilderProperties;
+import org.apache.commons.configuration2.builder.BuilderParameters;
+import org.apache.commons.configuration2.builder.JndiBuilderProperties;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/MultiFileBuilderParameters.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/MultiFileBuilderParameters.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/MultiFileBuilderParameters.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/MultiFileBuilderParameters.java Fri Sep 12 18:04:36 2014
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.fluent;
+package org.apache.commons.configuration2.builder.fluent;
-import org.apache.commons.configuration.builder.BasicBuilderProperties;
-import org.apache.commons.configuration.builder.BuilderParameters;
-import org.apache.commons.configuration.builder.combined.MultiFileBuilderProperties;
+import org.apache.commons.configuration2.builder.BasicBuilderProperties;
+import org.apache.commons.configuration2.builder.BuilderParameters;
+import org.apache.commons.configuration2.builder.combined.MultiFileBuilderProperties;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/Parameters.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/Parameters.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/Parameters.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/Parameters.java Fri Sep 12 18:04:36 2014
@@ -14,24 +14,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.fluent;
+package org.apache.commons.configuration2.builder.fluent;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
-import org.apache.commons.configuration.builder.BasicBuilderParameters;
-import org.apache.commons.configuration.builder.BuilderParameters;
-import org.apache.commons.configuration.builder.DatabaseBuilderParametersImpl;
-import org.apache.commons.configuration.builder.DefaultParametersHandler;
-import org.apache.commons.configuration.builder.DefaultParametersManager;
-import org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl;
-import org.apache.commons.configuration.builder.HierarchicalBuilderParametersImpl;
-import org.apache.commons.configuration.builder.JndiBuilderParametersImpl;
-import org.apache.commons.configuration.builder.PropertiesBuilderParametersImpl;
-import org.apache.commons.configuration.builder.XMLBuilderParametersImpl;
-import org.apache.commons.configuration.builder.combined.CombinedBuilderParametersImpl;
-import org.apache.commons.configuration.builder.combined.MultiFileBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.BasicBuilderParameters;
+import org.apache.commons.configuration2.builder.BuilderParameters;
+import org.apache.commons.configuration2.builder.DatabaseBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.DefaultParametersHandler;
+import org.apache.commons.configuration2.builder.DefaultParametersManager;
+import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.HierarchicalBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.JndiBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.PropertiesBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.XMLBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.combined.CombinedBuilderParametersImpl;
+import org.apache.commons.configuration2.builder.combined.MultiFileBuilderParametersImpl;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/PropertiesBuilderParameters.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/PropertiesBuilderParameters.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/PropertiesBuilderParameters.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/PropertiesBuilderParameters.java Fri Sep 12 18:04:36 2014
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.fluent;
+package org.apache.commons.configuration2.builder.fluent;
-import org.apache.commons.configuration.builder.BasicBuilderProperties;
-import org.apache.commons.configuration.builder.BuilderParameters;
-import org.apache.commons.configuration.builder.FileBasedBuilderProperties;
-import org.apache.commons.configuration.builder.PropertiesBuilderProperties;
+import org.apache.commons.configuration2.builder.BasicBuilderProperties;
+import org.apache.commons.configuration2.builder.BuilderParameters;
+import org.apache.commons.configuration2.builder.FileBasedBuilderProperties;
+import org.apache.commons.configuration2.builder.PropertiesBuilderProperties;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/XMLBuilderParameters.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/XMLBuilderParameters.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/XMLBuilderParameters.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/XMLBuilderParameters.java Fri Sep 12 18:04:36 2014
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.builder.fluent;
+package org.apache.commons.configuration2.builder.fluent;
-import org.apache.commons.configuration.builder.BasicBuilderProperties;
-import org.apache.commons.configuration.builder.BuilderParameters;
-import org.apache.commons.configuration.builder.FileBasedBuilderProperties;
-import org.apache.commons.configuration.builder.HierarchicalBuilderProperties;
-import org.apache.commons.configuration.builder.XMLBuilderProperties;
+import org.apache.commons.configuration2.builder.BasicBuilderProperties;
+import org.apache.commons.configuration2.builder.BuilderParameters;
+import org.apache.commons.configuration2.builder.FileBasedBuilderProperties;
+import org.apache.commons.configuration2.builder.HierarchicalBuilderProperties;
+import org.apache.commons.configuration2.builder.XMLBuilderProperties;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/package-info.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/package-info.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/package-info.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/fluent/package-info.java Fri Sep 12 18:04:36 2014
@@ -37,4 +37,4 @@
*
* @version $Id$
*/
-package org.apache.commons.configuration.builder.fluent;
+package org.apache.commons.configuration2.builder.fluent;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/package-info.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/package-info.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/package-info.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/builder/package-info.java Fri Sep 12 18:04:36 2014
@@ -39,4 +39,4 @@
*
* @version $Id$
*/
-package org.apache.commons.configuration.builder;
+package org.apache.commons.configuration2.builder;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java Fri Sep 12 18:04:36 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.convert;
+package org.apache.commons.configuration2.convert;
import java.lang.reflect.Array;
import java.util.ArrayList;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/ConversionHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/ConversionHandler.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/ConversionHandler.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/ConversionHandler.java Fri Sep 12 18:04:36 2014
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.convert;
+package org.apache.commons.configuration2.convert;
import java.util.Collection;
-import org.apache.commons.configuration.ex.ConversionException;
-import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
+import org.apache.commons.configuration2.ex.ConversionException;
+import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
/**
* <p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/DefaultConversionHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/DefaultConversionHandler.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/DefaultConversionHandler.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/DefaultConversionHandler.java Fri Sep 12 18:04:36 2014
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.convert;
+package org.apache.commons.configuration2.convert;
import java.lang.reflect.Array;
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedList;
-import org.apache.commons.configuration.ex.ConversionException;
-import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
+import org.apache.commons.configuration2.ex.ConversionException;
+import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
import org.apache.commons.lang3.ClassUtils;
/**
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/DefaultListDelimiterHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/DefaultListDelimiterHandler.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/DefaultListDelimiterHandler.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/DefaultListDelimiterHandler.java Fri Sep 12 18:04:36 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.convert;
+package org.apache.commons.configuration2.convert;
import java.util.Collection;
import java.util.LinkedList;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/DisabledListDelimiterHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/DisabledListDelimiterHandler.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/DisabledListDelimiterHandler.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/DisabledListDelimiterHandler.java Fri Sep 12 18:04:36 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.convert;
+package org.apache.commons.configuration2.convert;
import java.util.ArrayList;
import java.util.Collection;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java Fri Sep 12 18:04:36 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.convert;
+package org.apache.commons.configuration2.convert;
import java.util.ArrayList;
import java.util.Collection;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/ListDelimiterHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/ListDelimiterHandler.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/ListDelimiterHandler.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/ListDelimiterHandler.java Fri Sep 12 18:04:36 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.convert;
+package org.apache.commons.configuration2.convert;
import java.util.Collection;
import java.util.List;
@@ -25,11 +25,11 @@ import java.util.List;
* configuration properties.
* </p>
* <p>
- * {@link org.apache.commons.configuration.AbstractConfiguration
+ * {@link org.apache.commons.configuration2.AbstractConfiguration
* AbstractConfiguration} supports list delimiters in property values. If such a
* delimiter is found, the value actually contains multiple values and has to be
* split. This is useful for instance for
- * {@link org.apache.commons.configuration.PropertiesConfiguration
+ * {@link org.apache.commons.configuration2.PropertiesConfiguration
* PropertiesConfiguration}: properties files that have to be compatible with
* the {@code java.util.Properties} class cannot have multiple occurrences of a
* single property key, therefore a different storage scheme for multi-valued
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java Fri Sep 12 18:04:36 2014
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.configuration.convert;
+package org.apache.commons.configuration2.convert;
import java.awt.Color;
import java.lang.reflect.Constructor;
@@ -32,7 +32,7 @@ import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
-import org.apache.commons.configuration.ex.ConversionException;
+import org.apache.commons.configuration2.ex.ConversionException;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/ValueTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/ValueTransformer.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/ValueTransformer.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/ValueTransformer.java Fri Sep 12 18:04:36 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration.convert;
+package org.apache.commons.configuration2.convert;
/**
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/package-info.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/package-info.java?rev=1624601&r1=1624598&r2=1624601&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/package-info.java (original)
+++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/convert/package-info.java Fri Sep 12 18:04:36 2014
@@ -36,4 +36,4 @@
*
* @version $Id$
*/
-package org.apache.commons.configuration.convert;
+package org.apache.commons.configuration2.convert;