From 28c50c4a4d4dcbd392a689588acf5d796eb01674 Mon Sep 17 00:00:00 2001 From: dockxm Date: Mon, 18 Mar 2024 14:04:39 +0100 Subject: [PATCH 1/4] CONFIGURATION-836: Migrate to jakarta --- pom.xml | 563 +++++++++--------- .../configuration2/DataConfiguration.java | 2 +- .../convert/PropertyConverter.java | 6 +- .../web/ServletConfiguration.java | 4 +- .../web/ServletContextConfiguration.java | 4 +- .../web/ServletFilterConfiguration.java | 2 +- .../web/ServletRequestConfiguration.java | 2 +- .../MockInitialContextFactory.java | 49 +- .../web/TestServletConfiguration.java | 6 +- .../web/TestServletContextConfiguration.java | 8 +- .../web/TestServletFilterConfiguration.java | 15 +- .../web/TestServletRequestConfiguration.java | 2 +- 12 files changed, 340 insertions(+), 323 deletions(-) diff --git a/pom.xml b/pom.xml index 9b0606b5e6..08a0d7ad45 100644 --- a/pom.xml +++ b/pom.xml @@ -29,50 +29,10 @@ 2001 - Tools to assist in the reading of configuration/preferences files in various formats; requires Java 8. + Tools to assist in the reading of configuration/preferences files in + various formats - - configuration - org.apache.commons.configuration2 - 2.10.1 - 2.10.2 - (Java 8 or above) - commons-configuration-${commons.release.2.version} - 1.10 - (old 1.x version) - CONFIGURATION - 12310467 - 1.8 - 1.8 - https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-configuration - - - org.apache.commons.beanutils.*;resolution:=optional, - org.apache.commons.codec.*;resolution:=optional, - org.apache.commons.jxpath.*;resolution:=optional, - org.apache.xml.resolver.*;resolution:=optional, - javax.servlet.*;resolution:=optional, - org.apache.commons.jexl2.*;resolution:=optional, - org.apache.commons.vfs2.*;resolution:=optional, - org.springframework.*;resolution:=optional, - com.fasterxml.jackson.*;resolution:=optional, - org.yaml.snakeyaml.*;resolution:=optional, - * - - 2.23.1 - 2.0.12 - - 5.3.33 - false - - 2.10.0 - RC1 - true - scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid} - 2024-03-12T23:55:07Z - - https://commons.apache.org/proper/commons-configuration/ @@ -98,6 +58,233 @@ + + + Daniel Rall + dlr + dlr@finemaltcoding.com + CollabNet, Inc. + + Java Developer + + + + + Jason van Zyl + jvanzyl + jason@zenplex.com + Zenplex + + Java Developer + + + + + Martin Poeschl + mpoeschl + mpoeschl@marmot.at + tucana.at + + Java Developer + + + + + dIon Gillard + dion + dion@multitask.com.au + Multitask Consulting + + Java Developer + + + + + Henning P. Schmiedehausen + henning + hps@intermeta.de + INTERMETA - Gesellschaft fuer Mehrwertdienste mbH + 2 + + Java Developer + + + + + Eric Pugh + epugh + epugh@upstate.com + upstate.com + + Java Developer + + + + + Brian E. Dunbar + bdunbar + bdunbar@dunbarconsulting.org + dunbarconsulting.org + + Java Developer + + + + + Emmanuel Bourg + ebourg + ebourg@apache.org + Ariane Software + +1 + + Java Developer + + + + + Oliver Heger + oheger + oheger@apache.org + Bosch Software Innovations + +1 + + Java Developer + + + + + Jörg Schaible + joehni + joerg.schaible@gmx.de + +1 + + Java Developer + + + + + Ralph Goers + rgoers + rgoers@apache.org + Intuit + -8 + + Java Developer + + + + + ggregory + Gary Gregory + ggregory at apache.org + https://www.garygregory.com + The Apache Software Foundation + https://www.apache.org/ + + PMC Member + + America/New_York + + https://people.apache.org/~ggregory/img/garydgregory80.png + + + + + Claude Warren + claudenw + claude@apache.org + 0 + + Java Developer + + + + + Rob Tompkins + chtompki + chtompki@apache.org + -4 + + Java Developer + + + + + + + Konstantin Shaposhnikov + ksh@scand.com + scand.com + + + + Jamie M. Guillemette + JMGuillemette@gmail.com + TD Bank + + + + Jorge Ferrer + jorge.ferrer@gmail.com + + + + + Gabriele Garuglieri + gabriele.garuglieri@infoblu.it + Infoblu S.p.A + + + + Nicolas De Loof + nicolas.deloof@gmail.com + Cap Gemini + + + + Oliver Kopp + koppdev@gmail.com + + + + Dennis Kieselhorst + deki@apache.org + IRIAN Deutschland + + + + Raviteja Lokineni + raviteja.lokineni@gmail.com + + + + Vincent Maurin + vincent.maurin.fr@gmail.com + glispa GmbH + + + + The Alchemist + kap4020@gmail.com + + + + Pascal Essiembre + pascal.essiembre@norconex.com + Norconex Inc. + https://www.norconex.com + + developer + + -4 + + + + Patrick Schmidt + patrick.schmidt@codecamp.de + + + org.apache.commons @@ -216,9 +403,9 @@ - javax.servlet - servlet-api - 2.5 + jakarta.servlet + jakarta.servlet-api + 6.0.0 provided true @@ -337,14 +524,59 @@ test - - org.slf4j - slf4j-nop - ${slf4j.version} - test - + + org.slf4j + slf4j-nop + ${slf4j.version} + test + + + + + + configuration + org.apache.commons.configuration2 + 2.10.0 + 2.10.1 + (Java 8 or above) + commons-configuration-${commons.release.2.version} + 1.10 + (old 1.x version) + CONFIGURATION + 12310467 + 1.8 + 1.8 + + https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-configuration + + + + org.apache.commons.beanutils.*;resolution:=optional, + org.apache.commons.codec.*;resolution:=optional, + org.apache.commons.jxpath.*;resolution:=optional, + org.apache.xml.resolver.*;resolution:=optional, + javax.servlet.*;resolution:=optional, + org.apache.commons.jexl2.*;resolution:=optional, + org.apache.commons.vfs2.*;resolution:=optional, + org.springframework.*;resolution:=optional, + com.fasterxml.jackson.*;resolution:=optional, + org.yaml.snakeyaml.*;resolution:=optional, + * + + 2.23.1 + 2.0.12 + + 5.3.32 + + false - + + 2.9.0 + RC1 + true + scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid} + 2024-03-12T23:55:07Z + clean verify apache-rat:check japicmp:cmp checkstyle:check spotbugs:check pmd:check pmd:cpd-check javadoc:javadoc @@ -627,231 +859,4 @@ - - - Daniel Rall - dlr - dlr@finemaltcoding.com - CollabNet, Inc. - - Java Developer - - - - - Jason van Zyl - jvanzyl - jason@zenplex.com - Zenplex - - Java Developer - - - - - Martin Poeschl - mpoeschl - mpoeschl@marmot.at - tucana.at - - Java Developer - - - - - dIon Gillard - dion - dion@multitask.com.au - Multitask Consulting - - Java Developer - - - - - Henning P. Schmiedehausen - henning - hps@intermeta.de - INTERMETA - Gesellschaft fuer Mehrwertdienste mbH - 2 - - Java Developer - - - - - Eric Pugh - epugh - epugh@upstate.com - upstate.com - - Java Developer - - - - - Brian E. Dunbar - bdunbar - bdunbar@dunbarconsulting.org - dunbarconsulting.org - - Java Developer - - - - - Emmanuel Bourg - ebourg - ebourg@apache.org - Ariane Software - +1 - - Java Developer - - - - - Oliver Heger - oheger - oheger@apache.org - Bosch Software Innovations - +1 - - Java Developer - - - - - Jörg Schaible - joehni - joerg.schaible@gmx.de - +1 - - Java Developer - - - - - Ralph Goers - rgoers - rgoers@apache.org - Intuit - -8 - - Java Developer - - - - - ggregory - Gary Gregory - ggregory at apache.org - https://www.garygregory.com - The Apache Software Foundation - https://www.apache.org/ - - PMC Member - - America/New_York - - https://people.apache.org/~ggregory/img/garydgregory80.png - - - - - Claude Warren - claudenw - claude@apache.org - 0 - - Java Developer - - - - - Rob Tompkins - chtompki - chtompki@apache.org - -4 - - Java Developer - - - - - - - Konstantin Shaposhnikov - ksh@scand.com - scand.com - - - - Jamie M. Guillemette - JMGuillemette@gmail.com - TD Bank - - - - Jorge Ferrer - jorge.ferrer@gmail.com - - - - - Gabriele Garuglieri - gabriele.garuglieri@infoblu.it - Infoblu S.p.A - - - - Nicolas De Loof - nicolas.deloof@gmail.com - Cap Gemini - - - - Oliver Kopp - koppdev@gmail.com - - - - Dennis Kieselhorst - deki@apache.org - IRIAN Deutschland - - - - Raviteja Lokineni - raviteja.lokineni@gmail.com - - - - Vincent Maurin - vincent.maurin.fr@gmail.com - glispa GmbH - - - - The Alchemist - kap4020@gmail.com - - - - Pascal Essiembre - pascal.essiembre@norconex.com - Norconex Inc. - https://www.norconex.com - - developer - - -4 - - - - Patrick Schmidt - patrick.schmidt@codecamp.de - - - diff --git a/src/main/java/org/apache/commons/configuration2/DataConfiguration.java b/src/main/java/org/apache/commons/configuration2/DataConfiguration.java index 574256f643..6dd0396b37 100644 --- a/src/main/java/org/apache/commons/configuration2/DataConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/DataConfiguration.java @@ -45,7 +45,7 @@ *
  • {@link java.util.Calendar}
    • *
  • {@link java.awt.Color}
    • *
  • {@link java.net.InetAddress}
    • - *
  • {@code javax.mail.internet.InternetAddress} (requires Javamail in the classpath)
    • + *
  • {@code jakarta.mail.internet.InternetAddress} (requires Javamail in the classpath)
    • *
  • {@code jakarta.mail.internet.InternetAddress} (requires Javamail 2.+ in the classpath)
    • *
  • {@link Enum}
    • * diff --git a/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java b/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java index b45a1d9070..307d9de3e6 100644 --- a/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java +++ b/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java @@ -67,8 +67,8 @@ public final class PropertyConverter { /** Constant for the argument classes of the Number constructor that takes a String. */ private static final Class[] CONSTR_ARGS = {String.class}; - /** The fully qualified name of {@code javax.mail.internet.InternetAddress}, as used in the javamail-1.* API. */ - private static final String INTERNET_ADDRESS_CLASSNAME_JAVAX = "javax.mail.internet.InternetAddress"; + /** The fully qualified name of {@code jakarta.mail.internet.InternetAddress}, as used in the javamail-1.* API. */ + private static final String INTERNET_ADDRESS_CLASSNAME_JAVAX = "jakarta.mail.internet.InternetAddress"; /** The fully qualified name of {@code jakarta.mail.internet.InternetAddress}, as used in the javamail-2.0+ API. */ private static final String INTERNET_ADDRESS_CLASSNAME_JAKARTA = "jakarta.mail.internet.InternetAddress"; @@ -152,7 +152,7 @@ public static Object to(final Class cls, final Object value, final DefaultCon } else if (Color.class.equals(cls)) { return toColor(value); } else if (cls.getName().equals(INTERNET_ADDRESS_CLASSNAME_JAVAX)) { - // javamail-1.* With javax.mail.* namespace. + // javamail-1.* With jakarta.mail.* namespace. return toInternetAddress(value, INTERNET_ADDRESS_CLASSNAME_JAVAX); } else if (cls.getName().equals(INTERNET_ADDRESS_CLASSNAME_JAKARTA)) { // javamail-2.0+, with jakarta.mail.* namespace. diff --git a/src/main/java/org/apache/commons/configuration2/web/ServletConfiguration.java b/src/main/java/org/apache/commons/configuration2/web/ServletConfiguration.java index e0deedb814..188054b205 100644 --- a/src/main/java/org/apache/commons/configuration2/web/ServletConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/web/ServletConfiguration.java @@ -21,8 +21,8 @@ import java.util.Enumeration; import java.util.Iterator; -import javax.servlet.Servlet; -import javax.servlet.ServletConfig; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletConfig; /** * A configuration wrapper around a {@link ServletConfig}. This configuration is read only, adding or removing a diff --git a/src/main/java/org/apache/commons/configuration2/web/ServletContextConfiguration.java b/src/main/java/org/apache/commons/configuration2/web/ServletContextConfiguration.java index ab31109601..16fff0d90e 100644 --- a/src/main/java/org/apache/commons/configuration2/web/ServletContextConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/web/ServletContextConfiguration.java @@ -21,8 +21,8 @@ import java.util.Enumeration; import java.util.Iterator; -import javax.servlet.Servlet; -import javax.servlet.ServletContext; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletContext; /** * A configuration wrapper to read the initialization parameters of a servlet context. This configuration is read only, diff --git a/src/main/java/org/apache/commons/configuration2/web/ServletFilterConfiguration.java b/src/main/java/org/apache/commons/configuration2/web/ServletFilterConfiguration.java index 676fbfc389..06d4499f34 100644 --- a/src/main/java/org/apache/commons/configuration2/web/ServletFilterConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/web/ServletFilterConfiguration.java @@ -21,7 +21,7 @@ import java.util.Enumeration; import java.util.Iterator; -import javax.servlet.FilterConfig; +import jakarta.servlet.FilterConfig; /** * A configuration wrapper around a {@link FilterConfig}. This configuration is read only, adding or removing a property diff --git a/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java b/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java index 3c85eaa1dd..3efcf18620 100644 --- a/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; -import javax.servlet.ServletRequest; +import jakarta.servlet.ServletRequest; /** * A configuration wrapper to read the parameters of a servlet request. This configuration is read only, adding or diff --git a/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java b/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java index c9ce346204..622c6afe48 100644 --- a/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java +++ b/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java @@ -16,20 +16,15 @@ */ package org.apache.commons.configuration2; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - +import javax.naming.*; +import javax.naming.spi.InitialContextFactory; import java.util.ArrayList; import java.util.Hashtable; import java.util.Iterator; import java.util.List; -import javax.naming.Context; -import javax.naming.NameClassPair; -import javax.naming.NameNotFoundException; -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.spi.InitialContextFactory; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; /** * A mock implementation of the {@code InitialContextFactory} interface. This implementation will return a mock context @@ -79,26 +74,36 @@ public void close() throws NamingException { */ public static final String PROP_CYCLES = "useCycles"; - /** Constant for the name of the missing property. */ + /** + * Constant for the name of the missing property. + */ private static final String MISSING_PROP = "/missing"; - /** Constant for the name of the prefix. */ + /** + * Constant for the name of the prefix. + */ private static final String PREFIX = "test/"; - /** An array with the names of the supported properties. */ + /** + * An array with the names of the supported properties. + */ private static final String[] PROP_NAMES = {"key", "key2", "short", "boolean", "byte", "double", "float", "integer", "long", "onlyinjndi"}; - /** An array with the values of the supported properties. */ + /** + * An array with the values of the supported properties. + */ private static final String[] PROP_VALUES = {"jndivalue", "jndivalue2", "1", "true", "10", "10.25", "20.25", "10", "1000000", "true"}; - /** An array with properties that are requested, but are not in the context. */ + /** + * An array with properties that are requested, but are not in the context. + */ private static final String[] MISSING_NAMES = {"missing/list", "test/imaginarykey", "foo/bar"}; /** * Adds a new name-and-value pair to list of {@link NameClassPair}s. * * @param pairs the list to add to - * @param name the name + * @param name the name * @param value the value */ private void addEnumPair(final List pairs, final String name, final Object value) { @@ -110,8 +115,8 @@ private void addEnumPair(final List pairs, final String name, fin * Binds a property value to the mock context. * * @param mockCtx the context - * @param name the name of the property - * @param value the value of the property + * @param name the name of the property + * @param value the value of the property */ private void bind(final Context mockCtx, final String name, final String value) throws NamingException { when(mockCtx.lookup(name)).thenReturn(value); @@ -122,7 +127,7 @@ private void bind(final Context mockCtx, final String name, final String value) * Configures the mock to expect a call for a non existing property. * * @param mockCtx the mock - * @param name the name of the property + * @param name the name of the property */ private void bindError(final Context mockCtx, final String name) throws NamingException { when(mockCtx.lookup(name)).thenThrow(new NameNotFoundException("unknown property")); @@ -152,7 +157,7 @@ private Context createCtxMock(final String prefix) throws NamingException { * Creates and initializes a naming enumeration. This is a shortcut of wrapping the result of * {@link #createNameClassPairs(String[], Object[])} in an instance of {@link ListBasedNamingEnumeration}. * - * @param names the names contained in the iteration + * @param names the names contained in the iteration * @param values the corresponding values * @return the mock for the enumeration */ @@ -163,7 +168,7 @@ private NamingEnumeration createNamingEnumeration(final String[] /** * Creates and initializes a list of {@link NameClassPair}s that can be used to create a naming enumeration. * - * @param names the names contained in the iteration + * @param names the names contained in the iteration * @param values the corresponding values * @return the mock for the enumeration */ @@ -199,7 +204,7 @@ public Context getInitialContext(@SuppressWarnings("rawtypes") final Hashtable e if (useCycles) { when(mockTopCtx.lookup("cycle")).thenReturn(mockCycleCtx); when(mockTopCtx.list("")).thenAnswer(invocation -> - createNamingEnumeration(new String[] {"test", "cycle"}, new Object[] {mockPrfxCtx, mockCycleCtx})); + createNamingEnumeration(new String[]{"test", "cycle"}, new Object[]{mockPrfxCtx, mockCycleCtx})); when(mockCycleCtx.list("")).thenAnswer(invocation -> { final List pairs = createNameClassPairs(PROP_NAMES, PROP_VALUES); addEnumPair(pairs, "cycleCtx", mockCycleCtx); @@ -207,7 +212,7 @@ public Context getInitialContext(@SuppressWarnings("rawtypes") final Hashtable e }); when(mockCycleCtx.lookup("cycleCtx")).thenReturn(mockCycleCtx); } else { - when(mockTopCtx.list("")).thenAnswer(invocation -> createNamingEnumeration(new String[] {"test"}, new Object[] {mockPrfxCtx})); + when(mockTopCtx.list("")).thenAnswer(invocation -> createNamingEnumeration(new String[]{"test"}, new Object[]{mockPrfxCtx})); } return mockBaseCtx; } diff --git a/src/test/java/org/apache/commons/configuration2/web/TestServletConfiguration.java b/src/test/java/org/apache/commons/configuration2/web/TestServletConfiguration.java index 0a2c65e8e5..5aeb6979a6 100644 --- a/src/test/java/org/apache/commons/configuration2/web/TestServletConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/web/TestServletConfiguration.java @@ -23,9 +23,9 @@ import java.util.Properties; -import javax.servlet.Servlet; -import javax.servlet.ServletConfig; -import javax.servlet.http.HttpServlet; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.http.HttpServlet; import org.apache.commons.configuration2.AbstractConfiguration; import org.apache.commons.configuration2.TestAbstractConfiguration; diff --git a/src/test/java/org/apache/commons/configuration2/web/TestServletContextConfiguration.java b/src/test/java/org/apache/commons/configuration2/web/TestServletContextConfiguration.java index 35bf5b15fa..7f39505fc2 100644 --- a/src/test/java/org/apache/commons/configuration2/web/TestServletContextConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/web/TestServletContextConfiguration.java @@ -23,10 +23,10 @@ import java.util.Properties; -import javax.servlet.Servlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServlet; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServlet; import org.apache.commons.configuration2.AbstractConfiguration; import org.apache.commons.configuration2.TestAbstractConfiguration; diff --git a/src/test/java/org/apache/commons/configuration2/web/TestServletFilterConfiguration.java b/src/test/java/org/apache/commons/configuration2/web/TestServletFilterConfiguration.java index 7341e3bcdf..d2e21fe531 100644 --- a/src/test/java/org/apache/commons/configuration2/web/TestServletFilterConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/web/TestServletFilterConfiguration.java @@ -19,12 +19,16 @@ import static org.junit.jupiter.api.Assertions.assertThrows; +import java.util.Collections; import java.util.Enumeration; +import java.util.List; import java.util.Properties; +import java.util.stream.Collectors; -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletContext; +import org.apache.commons.collections.iterators.IteratorEnumeration; import org.apache.commons.configuration2.AbstractConfiguration; import org.apache.commons.configuration2.TestAbstractConfiguration; import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; @@ -47,9 +51,12 @@ public String getInitParameter(final String key) { return parameters.getProperty(key); } + + @Override - public Enumeration getInitParameterNames() { - return parameters.keys(); + public Enumeration getInitParameterNames() { + final List keys = parameters.keySet().stream().filter(o -> o instanceof String).map(o -> (String) o).collect(Collectors.toList()); + return Collections.enumeration(keys); } @Override diff --git a/src/test/java/org/apache/commons/configuration2/web/TestServletRequestConfiguration.java b/src/test/java/org/apache/commons/configuration2/web/TestServletRequestConfiguration.java index c8492ec4e0..58af8aee5c 100644 --- a/src/test/java/org/apache/commons/configuration2/web/TestServletRequestConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/web/TestServletRequestConfiguration.java @@ -26,7 +26,7 @@ import java.util.HashMap; import java.util.List; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.configuration2.AbstractConfiguration; import org.apache.commons.configuration2.BaseConfiguration; From defe1e2697d1b62e2311c454291e9d10419a8717 Mon Sep 17 00:00:00 2001 From: dockxm Date: Tue, 19 Mar 2024 07:08:30 +0100 Subject: [PATCH 2/4] CONFIGURATION-836: configuration3 --- RELEASE-NOTES.txt | 18 ++-- pom.xml | 16 +-- src/conf/findbugs-exclude-filter.xml | 28 +++--- .../AbstractConfiguration.java | 40 ++++---- .../AbstractHierarchicalConfiguration.java | 38 +++---- .../AbstractYAMLBasedConfiguration.java | 8 +- .../BaseConfiguration.java | 4 +- .../BaseConfigurationXMLReader.java | 2 +- .../BaseHierarchicalConfiguration.java | 32 +++--- .../CombinedConfiguration.java | 38 +++---- .../CompositeConfiguration.java | 6 +- .../Configuration.java | 8 +- .../ConfigurationComparator.java | 2 +- .../ConfigurationConsumer.java | 4 +- .../ConfigurationConverter.java | 4 +- .../ConfigurationDecoder.java | 2 +- .../ConfigurationLookup.java | 4 +- .../ConfigurationMap.java | 4 +- .../ConfigurationUtils.java | 20 ++-- .../ConfigurationXMLReader.java | 2 +- .../DataConfiguration.java | 8 +- .../DatabaseConfiguration.java | 14 +-- .../DynamicCombinedConfiguration.java | 22 ++-- .../EnvironmentConfiguration.java | 2 +- .../FileBasedConfiguration.java | 4 +- .../FindNodeVisitor.java | 6 +- .../HierarchicalConfiguration.java | 6 +- .../HierarchicalConfigurationConverter.java | 6 +- .../HierarchicalConfigurationXMLReader.java | 8 +- .../INIConfiguration.java | 24 ++--- .../ImmutableConfiguration.java | 84 ++++++++-------- ...mutableConfigurationInvocationHandler.java | 2 +- .../ImmutableHierarchicalConfiguration.java | 4 +- .../Initializable.java | 2 +- .../JNDIConfiguration.java | 6 +- .../JSONConfiguration.java | 8 +- .../MapConfiguration.java | 8 +- .../PatternSubtreeConfigurationWrapper.java | 16 +-- .../PrefixedKeysIterator.java | 2 +- .../PropertiesConfiguration.java | 22 ++-- .../PropertiesConfigurationLayout.java | 10 +- .../StrictConfigurationComparator.java | 2 +- .../SubnodeConfiguration.java | 14 +-- .../SubsetConfiguration.java | 4 +- .../SystemConfiguration.java | 6 +- .../XMLConfiguration.java | 22 ++-- .../XMLDocumentHelper.java | 4 +- .../XMLListReference.java | 10 +- .../XMLPropertiesConfiguration.java | 10 +- .../YAMLConfiguration.java | 8 +- .../beanutils/BeanCreationContext.java | 2 +- .../beanutils/BeanDeclaration.java | 2 +- .../beanutils/BeanFactory.java | 2 +- .../beanutils/BeanHelper.java | 4 +- .../beanutils/CombinedBeanDeclaration.java | 2 +- .../beanutils/ConfigurationDynaBean.java | 14 +-- .../beanutils/ConfigurationDynaClass.java | 6 +- .../beanutils/ConstructorArg.java | 2 +- .../beanutils/DefaultBeanFactory.java | 8 +- .../beanutils/XMLBeanDeclaration.java | 12 +-- .../beanutils/package-info.java | 2 +- .../builder/AutoSaveListener.java | 12 +-- .../builder/BasicBuilderParameters.java | 22 ++-- .../builder/BasicBuilderProperties.java | 20 ++-- .../builder/BasicConfigurationBuilder.java | 32 +++--- .../BuilderConfigurationWrapperFactory.java | 14 +-- .../builder/BuilderParameters.java | 2 +- .../builder/ConfigurationBuilder.java | 10 +- .../builder/ConfigurationBuilderEvent.java | 6 +- ...onfigurationBuilderResultCreatedEvent.java | 10 +- .../builder/CopyObjectDefaultHandler.java | 6 +- .../DatabaseBuilderParametersImpl.java | 2 +- .../builder/DatabaseBuilderProperties.java | 2 +- .../builder/DefaultParametersHandler.java | 4 +- .../builder/DefaultParametersManager.java | 8 +- .../DefaultReloadingDetectorFactory.java | 10 +- .../builder/EventListenerParameters.java | 12 +-- .../builder/EventListenerProvider.java | 4 +- .../FileBasedBuilderParametersImpl.java | 10 +- .../builder/FileBasedBuilderProperties.java | 8 +- .../FileBasedConfigurationBuilder.java | 14 +-- .../HierarchicalBuilderParametersImpl.java | 4 +- .../HierarchicalBuilderProperties.java | 4 +- .../builder/INIBuilderParametersImpl.java | 2 +- .../builder/INIBuilderProperties.java | 2 +- .../builder/JndiBuilderParametersImpl.java | 2 +- .../builder/JndiBuilderProperties.java | 2 +- .../PropertiesBuilderParametersImpl.java | 10 +- .../builder/PropertiesBuilderProperties.java | 10 +- .../ReloadingBuilderSupportListener.java | 10 +- .../builder/ReloadingDetectorFactory.java | 8 +- ...eloadingFileBasedConfigurationBuilder.java | 14 +-- .../builder/XMLBuilderParametersImpl.java | 2 +- .../builder/XMLBuilderProperties.java | 2 +- .../BaseConfigurationBuilderProvider.java | 14 +-- .../CombinedBuilderParametersImpl.java | 16 +-- .../combined/CombinedBuilderProperties.java | 12 +-- .../CombinedConfigurationBuilder.java | 94 +++++++++--------- .../CombinedConfigurationBuilderProvider.java | 22 ++-- .../ConfigurationBuilderProvider.java | 8 +- .../combined/ConfigurationDeclaration.java | 6 +- ...ExtensionConfigurationBuilderProvider.java | 8 +- .../MultiFileBuilderParametersImpl.java | 10 +- .../combined/MultiFileBuilderProperties.java | 4 +- .../MultiFileConfigurationBuilder.java | 32 +++--- ...MultiFileConfigurationBuilderProvider.java | 32 +++--- .../builder/combined/MultiWrapDynaBean.java | 4 +- .../builder/combined/MultiWrapDynaClass.java | 2 +- ...ReloadingCombinedConfigurationBuilder.java | 22 ++-- ...eloadingMultiFileConfigurationBuilder.java | 16 +-- .../builder/combined/package-info.java | 2 +- .../fluent/CombinedBuilderParameters.java | 8 +- .../builder/fluent/Configurations.java | 20 ++-- .../fluent/DatabaseBuilderParameters.java | 8 +- .../fluent/FileBasedBuilderParameters.java | 8 +- .../fluent/HierarchicalBuilderParameters.java | 10 +- .../builder/fluent/INIBuilderParameters.java | 12 +-- .../builder/fluent/JndiBuilderParameters.java | 8 +- .../fluent/MultiFileBuilderParameters.java | 8 +- .../builder/fluent/Parameters.java | 28 +++--- .../fluent/PropertiesBuilderParameters.java | 10 +- .../builder/fluent/XMLBuilderParameters.java | 12 +-- .../builder/fluent/package-info.java | 2 +- .../builder/package-info.java | 2 +- .../convert/AbstractListDelimiterHandler.java | 2 +- .../convert/ConversionHandler.java | 6 +- .../convert/DefaultConversionHandler.java | 6 +- .../convert/DefaultListDelimiterHandler.java | 2 +- .../convert/DisabledListDelimiterHandler.java | 2 +- .../convert/LegacyListDelimiterHandler.java | 2 +- .../convert/ListDelimiterHandler.java | 6 +- .../convert/PropertyConverter.java | 4 +- .../convert/ValueTransformer.java | 2 +- .../convert/package-info.java | 2 +- .../event/BaseEventSource.java | 4 +- .../event/ConfigurationErrorEvent.java | 6 +- .../event/ConfigurationEvent.java | 2 +- .../event/Event.java | 2 +- .../event/EventListener.java | 2 +- .../event/EventListenerList.java | 2 +- .../event/EventListenerRegistrationData.java | 2 +- .../event/EventSource.java | 2 +- .../event/EventType.java | 2 +- .../event/package-info.java | 2 +- .../ex/ConfigurationException.java | 2 +- .../ex/ConfigurationRuntimeException.java | 2 +- .../ex/ConversionException.java | 2 +- .../ex/package-info.java | 2 +- .../interpol/ConfigurationInterpolator.java | 6 +- .../interpol/ConstantLookup.java | 2 +- .../interpol/DefaultLookups.java | 2 +- .../interpol/DummyLookup.java | 2 +- .../interpol/EnvironmentLookup.java | 2 +- .../interpol/ExprLookup.java | 6 +- .../interpol/InterpolatorSpecification.java | 2 +- .../interpol/Lookup.java | 2 +- .../interpol/StringLookupAdapter.java | 2 +- .../interpol/SystemPropertiesLookup.java | 2 +- .../interpol/package-info.java | 2 +- .../io/AbsoluteNameLocationStrategy.java | 2 +- .../io/BasePathLocationStrategy.java | 2 +- .../io/ClasspathLocationStrategy.java | 2 +- .../io/CombinedLocationStrategy.java | 2 +- .../io/ConfigurationLogger.java | 4 +- .../io/DefaultFileSystem.java | 4 +- .../io/FileBased.java | 4 +- .../io/FileHandler.java | 14 +-- .../io/FileHandlerListener.java | 2 +- .../io/FileHandlerListenerAdapter.java | 2 +- .../io/FileLocationStrategy.java | 2 +- .../io/FileLocator.java | 2 +- .../io/FileLocatorAware.java | 2 +- .../io/FileLocatorUtils.java | 4 +- .../io/FileOptionsProvider.java | 2 +- .../io/FileSystem.java | 4 +- .../io/FileSystemLocationStrategy.java | 2 +- .../io/FileUtils.java | 2 +- .../io/HomeDirectoryLocationStrategy.java | 2 +- .../io/InputStreamSupport.java | 4 +- .../io/ProvidedURLLocationStrategy.java | 2 +- .../io/URLConnectionOptions.java | 2 +- .../io/VFSFileSystem.java | 6 +- .../io/VerifiableOutputStream.java | 2 +- .../io/package-info.java | 2 +- .../package-info.java | 2 +- .../plist/PropertyListConfiguration.java | 22 ++-- .../plist/XMLPropertyListConfiguration.java | 24 ++--- .../plist/package-info.java | 2 +- .../CombinedReloadingController.java | 2 +- .../FileHandlerReloadingDetector.java | 6 +- .../reloading/ManagedReloadingDetector.java | 4 +- .../ManagedReloadingDetectorMBean.java | 2 +- .../reloading/PeriodicReloadingTrigger.java | 2 +- .../reloading/ReloadingController.java | 12 +-- .../reloading/ReloadingControllerSupport.java | 2 +- .../reloading/ReloadingDetector.java | 2 +- .../reloading/ReloadingEvent.java | 6 +- .../VFSFileHandlerReloadingDetector.java | 8 +- .../reloading/package-info.java | 2 +- .../resolver/CatalogResolver.java | 12 +-- .../resolver/DefaultEntityResolver.java | 2 +- .../resolver/EntityRegistry.java | 2 +- .../resolver/EntityResolverSupport.java | 2 +- .../resolver/package-info.java | 2 +- .../ConfigurationPropertiesFactoryBean.java | 14 +-- .../spring/ConfigurationPropertySource.java | 4 +- .../spring/package-info.java | 2 +- .../sync/LockMode.java | 2 +- .../sync/NoOpSynchronizer.java | 2 +- .../sync/ReadWriteSynchronizer.java | 2 +- .../sync/Synchronizer.java | 4 +- .../sync/SynchronizerSupport.java | 2 +- .../sync/package-info.java | 2 +- .../tree/AbstractImmutableNodeHandler.java | 2 +- .../tree/ConfigurationNodeVisitor.java | 2 +- .../tree/ConfigurationNodeVisitorAdapter.java | 2 +- .../tree/DefaultConfigurationKey.java | 2 +- .../tree/DefaultExpressionEngine.java | 2 +- .../tree/DefaultExpressionEngineSymbols.java | 2 +- .../tree/ExpressionEngine.java | 4 +- .../tree/ImmutableNode.java | 2 +- .../tree/InMemoryNodeModel.java | 4 +- .../tree/InMemoryNodeModelSupport.java | 2 +- .../tree/MergeCombiner.java | 2 +- .../tree/ModelTransaction.java | 2 +- .../tree/NodeAddData.java | 2 +- .../tree/NodeCombiner.java | 2 +- .../tree/NodeHandler.java | 2 +- .../tree/NodeHandlerDecorator.java | 2 +- .../tree/NodeKeyResolver.java | 2 +- .../tree/NodeMatcher.java | 2 +- .../tree/NodeModel.java | 2 +- .../tree/NodeModelSupport.java | 2 +- .../tree/NodeNameMatchers.java | 2 +- .../tree/NodeSelector.java | 2 +- .../tree/NodeTracker.java | 4 +- .../tree/NodeTreeWalker.java | 2 +- .../tree/NodeUpdateData.java | 2 +- .../tree/OverrideCombiner.java | 2 +- .../tree/QueryResult.java | 2 +- .../tree/ReferenceNodeHandler.java | 2 +- .../tree/ReferenceTracker.java | 2 +- .../tree/TrackedNodeHandler.java | 2 +- .../tree/TrackedNodeModel.java | 2 +- .../tree/TreeData.java | 2 +- .../tree/TreeUtils.java | 2 +- .../tree/UnionCombiner.java | 2 +- .../tree/package-info.java | 2 +- .../AbstractConfigurationNodeIterator.java | 4 +- .../xpath/ConfigurationAttributePointer.java | 6 +- .../ConfigurationNodeIteratorAttribute.java | 2 +- .../ConfigurationNodeIteratorChildren.java | 2 +- .../tree/xpath/ConfigurationNodePointer.java | 4 +- .../ConfigurationNodePointerFactory.java | 4 +- .../tree/xpath/XPathContextFactory.java | 4 +- .../tree/xpath/XPathExpressionEngine.java | 12 +-- .../tree/xpath/package-info.java | 2 +- .../web/AppletConfiguration.java | 2 +- .../web/BaseWebConfiguration.java | 4 +- .../web/ServletConfiguration.java | 2 +- .../web/ServletContextConfiguration.java | 2 +- .../web/ServletFilterConfiguration.java | 2 +- .../web/ServletRequestConfiguration.java | 2 +- .../web/package-info.java | 2 +- src/main/javacc/PropertyListParser.jj | 6 +- .../xdoc/userguide/howto_basicfeatures.xml | 10 +- src/site/xdoc/userguide/howto_builders.xml | 2 +- .../xdoc/userguide/howto_combinedbuilder.xml | 20 ++-- src/site/xdoc/userguide/howto_events.xml | 4 +- src/site/xdoc/userguide/howto_filebased.xml | 4 +- src/site/xdoc/userguide/howto_multitenant.xml | 16 +-- src/site/xdoc/userguide/howto_utilities.xml | 2 +- src/site/xdoc/userguide/upgradeto2_0.xml | 2 +- src/site/xdoc/userguide/upgradeto2_x.xml | 2 +- .../BaseNonStringProperties.java | 2 +- .../ConfigurationAssert.java | 4 +- .../DatabaseConfigurationTestHelper.java | 14 +-- .../EnumFixture.java | 2 +- .../FileURLStreamHandler.java | 2 +- .../InterpolationTestHelper.java | 4 +- .../Logging.java | 2 +- .../MockInitialContextFactory.java | 2 +- .../NonCloneableConfiguration.java | 2 +- .../NonStringTestHolder.java | 2 +- .../SynchronizerTestImpl.java | 4 +- .../TempDirUtils.java | 2 +- .../TestAbstractConfiguration.java | 6 +- ...estAbstractConfigurationBasicFeatures.java | 20 ++-- ...tAbstractConfigurationSynchronization.java | 10 +- ...TestAbstractHierarchicalConfiguration.java | 28 +++--- .../TestBaseConfiguration.java | 16 +-- .../TestBaseConfigurationXMLReader.java | 2 +- ...rarchicalConfigurationSynchronization.java | 18 ++-- .../TestBaseNullConfiguration.java | 6 +- .../TestCatalogResolver.java | 10 +- .../TestCombinedConfiguration.java | 36 +++---- .../TestCompositeConfiguration.java | 18 ++-- ...ositeConfigurationNonStringProperties.java | 4 +- .../TestConfigurationConverter.java | 4 +- .../TestConfigurationLookup.java | 2 +- .../TestConfigurationMap.java | 2 +- .../TestConfigurationSet.java | 2 +- .../TestConfigurationUtils.java | 28 +++--- .../TestDataConfiguration.java | 8 +- .../TestDatabaseConfiguration.java | 16 +-- .../TestDefaultImmutableConfiguration.java | 4 +- .../TestDynamicCombinedConfiguration.java | 40 ++++---- .../TestEnvironmentConfiguration.java | 2 +- .../TestEqualBehavior.java | 10 +- .../TestEqualsProperty.java | 4 +- .../TestHierarchicalConfiguration.java | 14 +-- ...estHierarchicalConfigurationXMLReader.java | 6 +- .../TestHierarchicalXMLConfiguration.java | 6 +- .../TestINIConfiguration.java | 28 +++--- .../TestImmutableConfiguration.java | 8 +- .../TestJNDIConfiguration.java | 10 +- .../TestJNDIEnvironmentValues.java | 2 +- .../TestJSONConfiguration.java | 4 +- .../TestMapConfiguration.java | 10 +- .../TestNonStringProperties.java | 4 +- .../TestNullCompositeConfiguration.java | 8 +- .../TestNullJNDIEnvironmentValues.java | 2 +- .../TestPatternSubtreeConfiguration.java | 10 +- ...estPatternSubtreeConfigurationWrapper.java | 2 +- .../TestPropertiesConfiguration.java | 32 +++--- .../TestPropertiesConfigurationLayout.java | 12 +-- .../TestPropertiesSequence.java | 8 +- .../TestStrictConfigurationComparator.java | 2 +- .../TestSubnodeConfiguration.java | 22 ++-- .../TestSubsetConfiguration.java | 14 +-- .../TestSystemConfiguration.java | 8 +- .../TestThreesomeConfiguration.java | 8 +- .../TestXMLConfiguration.java | 26 ++--- .../TestXMLConfiguration_605.java | 12 +-- .../TestXMLDocumentHelper.java | 4 +- .../TestXMLListHandling.java | 12 +-- .../TestXMLPropertiesConfiguration.java | 8 +- .../TestYAMLConfiguration.java | 4 +- .../beanutils/BeanCreationTestBean.java | 2 +- .../BeanCreationTestBeanWithListChild.java | 2 +- .../beanutils/BeanCreationTestCtorBean.java | 2 +- .../beanutils/BeanDeclarationTestImpl.java | 2 +- .../beanutils/TestBeanHelper.java | 6 +- .../TestCombinedBeanDeclaration.java | 2 +- .../beanutils/TestConfigurationDynaBean.java | 8 +- .../TestConfigurationDynaBeanXMLConfig.java | 6 +- .../beanutils/TestConstructorArg.java | 2 +- .../beanutils/TestDefaultBeanFactory.java | 10 +- .../beanutils/TestXMLBeanDeclaration.java | 8 +- .../builder/BuilderEventListenerImpl.java | 6 +- .../builder/ParametersBeanTestImpl.java | 2 +- .../builder/TestAutoSaveListener.java | 8 +- .../builder/TestBasicBuilderParameters.java | 26 ++--- .../TestBasicConfigurationBuilder.java | 50 +++++----- .../TestBasicConfigurationBuilderEvents.java | 12 +-- ...estBuilderConfigurationWrapperFactory.java | 22 ++-- .../builder/TestCopyObjectDefaultHandler.java | 6 +- .../TestDatabaseBuilderParametersImpl.java | 4 +- .../builder/TestDefaultParametersManager.java | 14 +-- .../TestDefaultReloadingDetectorFactory.java | 8 +- .../builder/TestEventListenerParameters.java | 8 +- .../TestFileBasedBuilderParameters.java | 14 +-- .../TestFileBasedConfigurationBuilder.java | 38 +++---- ...TestHierarchicalBuilderParametersImpl.java | 6 +- .../TestJndiBuilderParametersImpl.java | 4 +- .../TestPropertiesBuilderParametersImpl.java | 12 +-- .../TestReloadingBuilderSupportListener.java | 14 +-- ...eloadingFileBasedConfigurationBuilder.java | 12 +-- .../builder/TestXMLBuilderParametersImpl.java | 4 +- ...ractMultiFileConfigurationBuilderTest.java | 10 +- .../TestBaseConfigurationBuilderProvider.java | 32 +++--- .../TestCombinedBuilderParametersImpl.java | 24 ++--- .../TestCombinedConfigurationBuilder.java | 94 +++++++++--------- .../TestCombinedConfigurationBuilderVFS.java | 20 ++-- .../TestConfigurationDeclaration.java | 8 +- ...ExtensionConfigurationBuilderProvider.java | 16 +-- .../TestMultiFileBuilderParametersImpl.java | 8 +- .../TestMultiFileConfigurationBuilder.java | 46 ++++----- .../combined/TestMultiWrapDynaBean.java | 10 +- ...ReloadingCombinedConfigurationBuilder.java | 20 ++-- ...CombinedConfigurationBuilderFileBased.java | 46 ++++----- ...eloadingMultiFileConfigurationBuilder.java | 20 ++-- .../builder/fluent/TestConfigurations.java | 24 ++--- .../builder/fluent/TestParameters.java | 28 +++--- .../convert/TestDefaultConversionHandler.java | 6 +- .../TestDefaultListDelimiterHandler.java | 2 +- .../TestDisabledListDelimiterHandler.java | 2 +- .../convert/TestPropertyConverter.java | 4 +- .../event/AbstractEventListenerTestImpl.java | 2 +- .../AbstractTestConfigurationEvents.java | 4 +- .../event/ErrorListenerTestImpl.java | 2 +- .../event/EventListenerTestImpl.java | 2 +- .../event/TestConfigurationEventTypes.java | 2 +- .../TestDatabaseConfigurationEvents.java | 8 +- .../event/TestEvent.java | 2 +- .../event/TestEventListenerList.java | 2 +- .../event/TestEventSource.java | 2 +- .../event/TestEventType.java | 2 +- .../TestHierarchicalConfigurationEvents.java | 16 +-- .../event/TestMapConfigurationEvents.java | 6 +- .../TestPropertiesConfigurationEvents.java | 6 +- .../event/TestSubsetConfigurationEvents.java | 8 +- .../event/TestXMLConfigurationEvents.java | 6 +- .../TestConfigurationInterpolator.java | 2 +- .../interpol/TestConstantLookup.java | 2 +- .../interpol/TestDummyLookup.java | 2 +- .../interpol/TestEnvironmentLookup.java | 2 +- .../interpol/TestExprLookup.java | 12 +-- .../TestInterpolatorSpecification.java | 2 +- .../interpol/TestSystemPropertiesLookup.java | 2 +- .../io/TestAbsoluteNameLocationStrategy.java | 4 +- .../io/TestBasePathLocationStrategy.java | 4 +- .../io/TestClasspathLocationStrategy.java | 10 +- .../io/TestCombinedLocationStrategy.java | 4 +- .../io/TestConfigurationLogger.java | 6 +- .../io/TestDefaultFileSystem.java | 4 +- .../io/TestFileHandler.java | 16 +-- .../io/TestFileLocator.java | 4 +- .../io/TestFileLocatorUtils.java | 8 +- .../io/TestFileSystemLocationStrategy.java | 4 +- .../io/TestHomeDirectoryLocationStrategy.java | 6 +- .../io/TestProvidedURLLocationStrategy.java | 4 +- .../plist/AbstractTestPListEvents.java | 6 +- .../plist/TestPropertyListConfiguration.java | 22 ++-- .../TestPropertyListConfigurationEvents.java | 12 +-- .../plist/TestPropertyListParser.java | 2 +- .../TestXMLPropertyListConfiguration.java | 16 +-- ...estXMLPropertyListConfigurationEvents.java | 12 +-- .../reloading/AlwaysReloadingDetector.java | 2 +- .../reloading/RandomReloadingDetector.java | 2 +- .../TestCombinedReloadingController.java | 2 +- .../TestFileHandlerReloadingDetector.java | 4 +- .../TestManagedReloadingDetector.java | 2 +- .../TestPeriodicReloadingTrigger.java | 2 +- .../reloading/TestReloadingController.java | 6 +- .../TestVFSFileHandlerReloadingDetector.java | 12 +-- ...estConfigurationPropertiesFactoryBean.java | 12 +-- .../TestConfigurationPropertySource.java | 4 +- .../sync/TestReadWriteSynchronizer.java | 2 +- .../test/HsqlDB.java | 2 +- .../tree/AbstractCombinerTest.java | 12 +-- .../AbstractImmutableNodeHandlerTest.java | 8 +- .../tree/NodeStructureHelper.java | 2 +- .../tree/TestDefaultConfigurationKey.java | 2 +- .../tree/TestDefaultExpressionEngine.java | 2 +- .../TestDefaultExpressionEngineSymbols.java | 2 +- .../tree/TestImmutableNode.java | 2 +- .../tree/TestInMemoryNodeModel.java | 10 +- .../tree/TestInMemoryNodeModelReferences.java | 2 +- .../TestInMemoryNodeModelTrackedNodes.java | 4 +- .../tree/TestMergeCombiner.java | 10 +- .../tree/TestNodeAddData.java | 2 +- .../tree/TestNodeHandlerDecorator.java | 2 +- .../tree/TestNodeNameMatchers.java | 2 +- .../tree/TestNodeSelector.java | 4 +- .../tree/TestNodeTreeWalker.java | 2 +- .../tree/TestNodeUpdateData.java | 2 +- .../tree/TestOverrideCombiner.java | 12 +-- .../tree/TestQueryResult.java | 4 +- .../tree/TestTrackedNodeHandler.java | 2 +- .../tree/TestTrackedNodeModel.java | 2 +- .../tree/TestTreeData.java | 2 +- .../tree/TestUnionCombiner.java | 6 +- .../tree/xpath/AbstractXPathTest.java | 8 +- .../TestConfigurationAttributePointer.java | 8 +- .../TestConfigurationIteratorAttributes.java | 4 +- ...TestConfigurationNodeIteratorChildren.java | 6 +- .../xpath/TestConfigurationNodePointer.java | 4 +- .../TestConfigurationNodePointerFactory.java | 4 +- .../tree/xpath/TestXPathContextFactory.java | 8 +- .../tree/xpath/TestXPathExpressionEngine.java | 12 +-- .../TestXPathExpressionEngineInConfig.java | 8 +- .../web/TestAppletConfiguration.java | 12 +-- .../web/TestServletConfiguration.java | 8 +- .../web/TestServletContextConfiguration.java | 8 +- .../web/TestServletFilterConfiguration.java | 9 +- .../web/TestServletRequestConfiguration.java | 14 +-- .../test.jar | Bin src/test/resources/testCCCustomProvider.xml | 2 +- src/test/resources/testCCEntityResolver.xml | 2 +- src/test/resources/testCCFileSystem.xml | 2 +- .../resources/testCCFileSystemSubConfig.xml | 4 +- src/test/resources/testCCLookup.xml | 2 +- src/test/resources/testCCMultiTenent.xml | 8 +- .../resources/testCCMultiTenentReloading.xml | 2 +- src/test/resources/testCCResultClass.xml | 4 +- .../resources/testCCResultInitialization.xml | 6 +- .../resources/testComplexInitialization.xml | 8 +- .../testConfigurationInterpolatorUpdate.xml | 12 +-- .../resources/testConfigurationProvider.xml | 10 +- .../resources/testDigesterCreateObject.xml | 2 +- src/test/resources/testExpression.xml | 18 ++-- src/test/resources/testExtendedClass.xml | 10 +- .../testExtendedXMLConfigurationProvider.xml | 12 +-- .../testFileReloadConfigurationBuilder.xml | 20 ++-- .../testFileReloadConfigurationBuilder2.xml | 20 ++-- src/test/resources/testFileSystem.xml | 12 +-- src/test/resources/testGlobalLookup.xml | 10 +- .../resources/testInterpolationBuilder.xml | 2 +- .../testMultiTenentConfigurationBuilder.xml | 14 +-- .../testMultiTenentConfigurationBuilder2.xml | 18 ++-- .../testMultiTenentConfigurationBuilder3.xml | 18 ++-- .../testMultiTenentConfigurationBuilder4.xml | 12 +-- .../testMultiTenentConfigurationBuilder5.xml | 10 +- src/test/resources/testSystemProperties.xml | 6 +- ...estVFSMultiTenentConfigurationBuilder1.xml | 20 ++-- ...estVFSMultiTenentConfigurationBuilder2.xml | 20 ++-- src/test/resources/testValidation.xml | 4 +- src/test/resources/testValidation2.xml | 4 +- src/test/resources/testValidation3.xml | 10 +- 510 files changed, 2048 insertions(+), 2049 deletions(-) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/AbstractConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/AbstractHierarchicalConfiguration.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/AbstractYAMLBasedConfiguration.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/BaseConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/BaseConfigurationXMLReader.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/BaseHierarchicalConfiguration.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/CombinedConfiguration.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/CompositeConfiguration.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/Configuration.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/ConfigurationComparator.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/ConfigurationConsumer.java (92%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/ConfigurationConverter.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/ConfigurationDecoder.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/ConfigurationLookup.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/ConfigurationMap.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/ConfigurationUtils.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/ConfigurationXMLReader.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/DataConfiguration.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/DatabaseConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/DynamicCombinedConfiguration.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/EnvironmentConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/FileBasedConfiguration.java (92%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/FindNodeVisitor.java (93%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/HierarchicalConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/HierarchicalConfigurationConverter.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/HierarchicalConfigurationXMLReader.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/INIConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/ImmutableConfiguration.java (92%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/ImmutableConfigurationInvocationHandler.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/ImmutableHierarchicalConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/Initializable.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/JNDIConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/JSONConfiguration.java (92%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/MapConfiguration.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/PatternSubtreeConfigurationWrapper.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/PrefixedKeysIterator.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/PropertiesConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/PropertiesConfigurationLayout.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/StrictConfigurationComparator.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/SubnodeConfiguration.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/SubsetConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/SystemConfiguration.java (95%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/XMLConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/XMLDocumentHelper.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/XMLListReference.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/XMLPropertiesConfiguration.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/YAMLConfiguration.java (94%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/beanutils/BeanCreationContext.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/beanutils/BeanDeclaration.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/beanutils/BeanFactory.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/beanutils/BeanHelper.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/beanutils/CombinedBeanDeclaration.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/beanutils/ConfigurationDynaBean.java (94%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/beanutils/ConfigurationDynaClass.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/beanutils/ConstructorArg.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/beanutils/DefaultBeanFactory.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/beanutils/XMLBeanDeclaration.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/beanutils/package-info.java (95%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/AutoSaveListener.java (92%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/BasicBuilderParameters.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/BasicBuilderProperties.java (93%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/BasicConfigurationBuilder.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/BuilderConfigurationWrapperFactory.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/BuilderParameters.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/ConfigurationBuilder.java (87%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/ConfigurationBuilderEvent.java (95%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/ConfigurationBuilderResultCreatedEvent.java (92%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/CopyObjectDefaultHandler.java (95%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/DatabaseBuilderParametersImpl.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/DatabaseBuilderProperties.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/DefaultParametersHandler.java (95%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/DefaultParametersManager.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/DefaultReloadingDetectorFactory.java (85%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/EventListenerParameters.java (91%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/EventListenerProvider.java (94%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/FileBasedBuilderParametersImpl.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/FileBasedBuilderProperties.java (94%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/FileBasedConfigurationBuilder.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/HierarchicalBuilderParametersImpl.java (94%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/HierarchicalBuilderProperties.java (93%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/INIBuilderParametersImpl.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/INIBuilderProperties.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/JndiBuilderParametersImpl.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/JndiBuilderProperties.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/PropertiesBuilderParametersImpl.java (91%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/PropertiesBuilderProperties.java (91%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/ReloadingBuilderSupportListener.java (92%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/ReloadingDetectorFactory.java (89%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/ReloadingFileBasedConfigurationBuilder.java (95%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/XMLBuilderParametersImpl.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/XMLBuilderProperties.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/BaseConfigurationBuilderProvider.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/CombinedBuilderParametersImpl.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/CombinedBuilderProperties.java (95%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/CombinedConfigurationBuilder.java (94%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/CombinedConfigurationBuilderProvider.java (87%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/ConfigurationBuilderProvider.java (88%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/ConfigurationDeclaration.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/FileExtensionConfigurationBuilderProvider.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/MultiFileBuilderParametersImpl.java (95%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/MultiFileBuilderProperties.java (94%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/MultiFileConfigurationBuilder.java (95%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/MultiFileConfigurationBuilderProvider.java (89%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/MultiWrapDynaBean.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/MultiWrapDynaClass.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/ReloadingCombinedConfigurationBuilder.java (91%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/ReloadingMultiFileConfigurationBuilder.java (91%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/package-info.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/fluent/CombinedBuilderParameters.java (84%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/fluent/Configurations.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/fluent/DatabaseBuilderParameters.java (84%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/fluent/FileBasedBuilderParameters.java (84%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/fluent/HierarchicalBuilderParameters.java (82%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/fluent/INIBuilderParameters.java (79%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/fluent/JndiBuilderParameters.java (84%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/fluent/MultiFileBuilderParameters.java (85%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/fluent/Parameters.java (93%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/fluent/PropertiesBuilderParameters.java (82%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/fluent/XMLBuilderParameters.java (79%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/fluent/package-info.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/builder/package-info.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/convert/AbstractListDelimiterHandler.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/convert/ConversionHandler.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/convert/DefaultConversionHandler.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/convert/DefaultListDelimiterHandler.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/convert/DisabledListDelimiterHandler.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/convert/LegacyListDelimiterHandler.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/convert/ListDelimiterHandler.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/convert/PropertyConverter.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/convert/ValueTransformer.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/convert/package-info.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/event/BaseEventSource.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/event/ConfigurationErrorEvent.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/event/ConfigurationEvent.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/event/Event.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/event/EventListener.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/event/EventListenerList.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/event/EventListenerRegistrationData.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/event/EventSource.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/event/EventType.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/event/package-info.java (95%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/ex/ConfigurationException.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/ex/ConfigurationRuntimeException.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/ex/ConversionException.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/ex/package-info.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/interpol/ConfigurationInterpolator.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/interpol/ConstantLookup.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/interpol/DefaultLookups.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/interpol/DummyLookup.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/interpol/EnvironmentLookup.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/interpol/ExprLookup.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/interpol/InterpolatorSpecification.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/interpol/Lookup.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/interpol/StringLookupAdapter.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/interpol/SystemPropertiesLookup.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/interpol/package-info.java (94%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/AbsoluteNameLocationStrategy.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/BasePathLocationStrategy.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/ClasspathLocationStrategy.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/CombinedLocationStrategy.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/ConfigurationLogger.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/DefaultFileSystem.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/FileBased.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/FileHandler.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/FileHandlerListener.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/FileHandlerListenerAdapter.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/FileLocationStrategy.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/FileLocator.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/FileLocatorAware.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/FileLocatorUtils.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/FileOptionsProvider.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/FileSystem.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/FileSystemLocationStrategy.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/FileUtils.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/HomeDirectoryLocationStrategy.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/InputStreamSupport.java (94%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/ProvidedURLLocationStrategy.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/URLConnectionOptions.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/VFSFileSystem.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/VerifiableOutputStream.java (95%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/io/package-info.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/package-info.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/plist/PropertyListConfiguration.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/plist/XMLPropertyListConfiguration.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/plist/package-info.java (94%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/reloading/CombinedReloadingController.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/reloading/FileHandlerReloadingDetector.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/reloading/ManagedReloadingDetector.java (94%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/reloading/ManagedReloadingDetectorMBean.java (95%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/reloading/PeriodicReloadingTrigger.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/reloading/ReloadingController.java (95%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/reloading/ReloadingControllerSupport.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/reloading/ReloadingDetector.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/reloading/ReloadingEvent.java (94%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/reloading/VFSFileHandlerReloadingDetector.java (95%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/reloading/package-info.java (95%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/resolver/CatalogResolver.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/resolver/DefaultEntityResolver.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/resolver/EntityRegistry.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/resolver/EntityResolverSupport.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/resolver/package-info.java (94%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/spring/ConfigurationPropertiesFactoryBean.java (93%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/spring/ConfigurationPropertySource.java (94%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/spring/package-info.java (94%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/sync/LockMode.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/sync/NoOpSynchronizer.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/sync/ReadWriteSynchronizer.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/sync/Synchronizer.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/sync/SynchronizerSupport.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/sync/package-info.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/AbstractImmutableNodeHandler.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/ConfigurationNodeVisitor.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/ConfigurationNodeVisitorAdapter.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/DefaultConfigurationKey.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/DefaultExpressionEngine.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/DefaultExpressionEngineSymbols.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/ExpressionEngine.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/ImmutableNode.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/InMemoryNodeModel.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/InMemoryNodeModelSupport.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/MergeCombiner.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/ModelTransaction.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/NodeAddData.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/NodeCombiner.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/NodeHandler.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/NodeHandlerDecorator.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/NodeKeyResolver.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/NodeMatcher.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/NodeModel.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/NodeModelSupport.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/NodeNameMatchers.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/NodeSelector.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/NodeTracker.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/NodeTreeWalker.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/NodeUpdateData.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/OverrideCombiner.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/QueryResult.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/ReferenceNodeHandler.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/ReferenceTracker.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/TrackedNodeHandler.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/TrackedNodeModel.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/TreeData.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/TreeUtils.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/UnionCombiner.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/package-info.java (94%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/xpath/AbstractConfigurationNodeIterator.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/xpath/ConfigurationAttributePointer.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/xpath/ConfigurationNodeIteratorAttribute.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/xpath/ConfigurationNodeIteratorChildren.java (99%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/xpath/ConfigurationNodePointer.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/xpath/ConfigurationNodePointerFactory.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/xpath/XPathContextFactory.java (93%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/xpath/XPathExpressionEngine.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/tree/xpath/package-info.java (94%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/web/AppletConfiguration.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/web/BaseWebConfiguration.java (96%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/web/ServletConfiguration.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/web/ServletContextConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/web/ServletFilterConfiguration.java (97%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/web/ServletRequestConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration2 => configuration3}/web/package-info.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/BaseNonStringProperties.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/ConfigurationAssert.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/DatabaseConfigurationTestHelper.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/EnumFixture.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/FileURLStreamHandler.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/InterpolationTestHelper.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/Logging.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/MockInitialContextFactory.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/NonCloneableConfiguration.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/NonStringTestHolder.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/SynchronizerTestImpl.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TempDirUtils.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestAbstractConfiguration.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestAbstractConfigurationBasicFeatures.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestAbstractConfigurationSynchronization.java (96%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestAbstractHierarchicalConfiguration.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestBaseConfiguration.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestBaseConfigurationXMLReader.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestBaseHierarchicalConfigurationSynchronization.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestBaseNullConfiguration.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestCatalogResolver.java (91%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestCombinedConfiguration.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestCompositeConfiguration.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestCompositeConfigurationNonStringProperties.java (94%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestConfigurationConverter.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestConfigurationLookup.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestConfigurationMap.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestConfigurationSet.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestConfigurationUtils.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestDataConfiguration.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestDatabaseConfiguration.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestDefaultImmutableConfiguration.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestDynamicCombinedConfiguration.java (93%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestEnvironmentConfiguration.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestEqualBehavior.java (96%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestEqualsProperty.java (93%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestHierarchicalConfiguration.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestHierarchicalConfigurationXMLReader.java (94%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestHierarchicalXMLConfiguration.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestINIConfiguration.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestImmutableConfiguration.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestJNDIConfiguration.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestJNDIEnvironmentValues.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestJSONConfiguration.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestMapConfiguration.java (94%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestNonStringProperties.java (93%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestNullCompositeConfiguration.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestNullJNDIEnvironmentValues.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestPatternSubtreeConfiguration.java (91%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestPatternSubtreeConfigurationWrapper.java (96%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestPropertiesConfiguration.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestPropertiesConfigurationLayout.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestPropertiesSequence.java (96%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestStrictConfigurationComparator.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestSubnodeConfiguration.java (96%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestSubsetConfiguration.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestSystemConfiguration.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestThreesomeConfiguration.java (91%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestXMLConfiguration.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestXMLConfiguration_605.java (93%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestXMLDocumentHelper.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestXMLListHandling.java (94%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestXMLPropertiesConfiguration.java (96%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/TestYAMLConfiguration.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/beanutils/BeanCreationTestBean.java (96%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/beanutils/BeanCreationTestBeanWithListChild.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/beanutils/BeanCreationTestCtorBean.java (96%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/beanutils/BeanDeclarationTestImpl.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/beanutils/TestBeanHelper.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/beanutils/TestCombinedBeanDeclaration.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/beanutils/TestConfigurationDynaBean.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/beanutils/TestConfigurationDynaBeanXMLConfig.java (89%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/beanutils/TestConstructorArg.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/beanutils/TestDefaultBeanFactory.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/beanutils/TestXMLBeanDeclaration.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/BuilderEventListenerImpl.java (94%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/ParametersBeanTestImpl.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/TestAutoSaveListener.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/TestBasicBuilderParameters.java (96%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/TestBasicConfigurationBuilder.java (93%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/TestBasicConfigurationBuilderEvents.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/TestBuilderConfigurationWrapperFactory.java (92%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/TestCopyObjectDefaultHandler.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/TestDatabaseBuilderParametersImpl.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/TestDefaultParametersManager.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/TestDefaultReloadingDetectorFactory.java (91%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/TestEventListenerParameters.java (92%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/TestFileBasedBuilderParameters.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/TestFileBasedConfigurationBuilder.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/TestHierarchicalBuilderParametersImpl.java (94%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/TestJndiBuilderParametersImpl.java (96%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/TestPropertiesBuilderParametersImpl.java (94%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/TestReloadingBuilderSupportListener.java (87%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/TestReloadingFileBasedConfigurationBuilder.java (96%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/TestXMLBuilderParametersImpl.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/AbstractMultiFileConfigurationBuilderTest.java (91%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/TestBaseConfigurationBuilderProvider.java (90%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/TestCombinedBuilderParametersImpl.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/TestCombinedConfigurationBuilder.java (94%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/TestCombinedConfigurationBuilderVFS.java (80%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/TestConfigurationDeclaration.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/TestFileExtensionConfigurationBuilderProvider.java (93%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/TestMultiFileBuilderParametersImpl.java (94%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/TestMultiFileConfigurationBuilder.java (91%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/TestMultiWrapDynaBean.java (96%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/TestReloadingCombinedConfigurationBuilder.java (89%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java (90%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/combined/TestReloadingMultiFileConfigurationBuilder.java (93%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/fluent/TestConfigurations.java (96%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/builder/fluent/TestParameters.java (94%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/convert/TestDefaultConversionHandler.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/convert/TestDefaultListDelimiterHandler.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/convert/TestDisabledListDelimiterHandler.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/convert/TestPropertyConverter.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/event/AbstractEventListenerTestImpl.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/event/AbstractTestConfigurationEvents.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/event/ErrorListenerTestImpl.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/event/EventListenerTestImpl.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/event/TestConfigurationEventTypes.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/event/TestDatabaseConfigurationEvents.java (87%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/event/TestEvent.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/event/TestEventListenerList.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/event/TestEventSource.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/event/TestEventType.java (96%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/event/TestHierarchicalConfigurationEvents.java (90%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/event/TestMapConfigurationEvents.java (86%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/event/TestPropertiesConfigurationEvents.java (86%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/event/TestSubsetConfigurationEvents.java (83%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/event/TestXMLConfigurationEvents.java (86%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/interpol/TestConfigurationInterpolator.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/interpol/TestConstantLookup.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/interpol/TestDummyLookup.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/interpol/TestEnvironmentLookup.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/interpol/TestExprLookup.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/interpol/TestInterpolatorSpecification.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/interpol/TestSystemPropertiesLookup.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/io/TestAbsoluteNameLocationStrategy.java (96%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/io/TestBasePathLocationStrategy.java (96%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/io/TestClasspathLocationStrategy.java (90%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/io/TestCombinedLocationStrategy.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/io/TestConfigurationLogger.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/io/TestDefaultFileSystem.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/io/TestFileHandler.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/io/TestFileLocator.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/io/TestFileLocatorUtils.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/io/TestFileSystemLocationStrategy.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/io/TestHomeDirectoryLocationStrategy.java (96%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/io/TestProvidedURLLocationStrategy.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/plist/AbstractTestPListEvents.java (92%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/plist/TestPropertyListConfiguration.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/plist/TestPropertyListConfigurationEvents.java (80%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/plist/TestPropertyListParser.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/plist/TestXMLPropertyListConfiguration.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/plist/TestXMLPropertyListConfigurationEvents.java (80%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/reloading/AlwaysReloadingDetector.java (96%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/reloading/RandomReloadingDetector.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/reloading/TestCombinedReloadingController.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/reloading/TestFileHandlerReloadingDetector.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/reloading/TestManagedReloadingDetector.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/reloading/TestPeriodicReloadingTrigger.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/reloading/TestReloadingController.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/reloading/TestVFSFileHandlerReloadingDetector.java (94%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/spring/TestConfigurationPropertiesFactoryBean.java (93%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/spring/TestConfigurationPropertySource.java (96%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/sync/TestReadWriteSynchronizer.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/test/HsqlDB.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/AbstractCombinerTest.java (89%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/AbstractImmutableNodeHandlerTest.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/NodeStructureHelper.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/TestDefaultConfigurationKey.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/TestDefaultExpressionEngine.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/TestDefaultExpressionEngineSymbols.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/TestImmutableNode.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/TestInMemoryNodeModel.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/TestInMemoryNodeModelReferences.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/TestInMemoryNodeModelTrackedNodes.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/TestMergeCombiner.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/TestNodeAddData.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/TestNodeHandlerDecorator.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/TestNodeNameMatchers.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/TestNodeSelector.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/TestNodeTreeWalker.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/TestNodeUpdateData.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/TestOverrideCombiner.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/TestQueryResult.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/TestTrackedNodeHandler.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/TestTrackedNodeModel.java (99%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/TestTreeData.java (96%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/TestUnionCombiner.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/xpath/AbstractXPathTest.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/xpath/TestConfigurationAttributePointer.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/xpath/TestConfigurationIteratorAttributes.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/xpath/TestConfigurationNodeIteratorChildren.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/xpath/TestConfigurationNodePointer.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/xpath/TestConfigurationNodePointerFactory.java (97%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/xpath/TestXPathContextFactory.java (89%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/xpath/TestXPathExpressionEngine.java (98%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/tree/xpath/TestXPathExpressionEngineInConfig.java (95%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/web/TestAppletConfiguration.java (91%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/web/TestServletConfiguration.java (93%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/web/TestServletContextConfiguration.java (94%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/web/TestServletFilterConfiguration.java (91%) rename src/test/java/org/apache/commons/{configuration2 => configuration3}/web/TestServletRequestConfiguration.java (91%) rename src/test/resources/org/apache/commons/{configuration2 => configuration3}/test.jar (100%) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index d3449696af..b9e7dc0dd2 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -212,8 +212,8 @@ Fixed Bugs * CONFIGURATION-822: Fix ambiguity on the section determining #229. Thanks to Branislav Be?o, Gary Gregory, Bruno P. Kinoshita. * Use Java style array decelerations #244. Thanks to Arturo Bernal. * Add ImmutableNode.stream(). Thanks to Gary Gregory. -* Avoid NullPointerException in org.apache.commons.configuration2.web.AppletConfiguration.getKeysInternal(). Thanks to Gary Gregory. -* Fix JDBC prepared statements leak in org.apache.commons.configuration2.DatabaseConfiguration.clearPropertyDirect(String). Thanks to Gary Gregory. +* Avoid NullPointerException in org.apache.commons.configuration3.web.AppletConfiguration.getKeysInternal(). Thanks to Gary Gregory. +* Fix JDBC prepared statements leak in org.apache.commons.configuration3.DatabaseConfiguration.clearPropertyDirect(String). Thanks to Gary Gregory. Changes ------- @@ -465,7 +465,7 @@ Fixed Bugs ---------- * CONFIGURATION-750: XMLPropertyListConfiguration cannot set arrays in the correct plist form. Thanks to Jason Pickens, Gary Gregory, Emmanuel Bourg. -* Fix Javadoc for org.apache.commons.configuration2.PropertiesConfiguration.getIncludeOptional(). Thanks to Gary Gregory. +* Fix Javadoc for org.apache.commons.configuration3.PropertiesConfiguration.getIncludeOptional(). Thanks to Gary Gregory. * CONFIGURATION-760: Properties file using cyclical includes cause a StackOverflowError instead of detecting the misconfiguration. Thanks to Gary Gregory. Changes @@ -587,7 +587,7 @@ Fixed Bugs * CONFIGURATION-710: Fixed numerous typos in user guides. Thanks to thc202. * CONFIGURATION-711: Update Apache Commons Lang from 3.7 to 3.8.1. -* CONFIGURATION-727: org.apache.commons.configuration2.DatabaseConfiguration never closes result sets and statements. +* CONFIGURATION-727: org.apache.commons.configuration3.DatabaseConfiguration never closes result sets and statements. Changes ------- @@ -643,7 +643,7 @@ New features Path. * CONFIGURATION-698 - Add org.apache.commons.configuration2.MapConfiguration.toString(). + Add org.apache.commons.configuration3.MapConfiguration.toString(). * CONFIGURATION-698 Add toString() methods here and there to help debugging. @@ -740,16 +740,16 @@ New features Add convenience ctor ConfigurationRuntimeException(String, Object...). * CONFIGURATION-665 - Add org.apache.commons.configuration2.AbstractHierarchicalConfiguration.toString(). + Add org.apache.commons.configuration3.AbstractHierarchicalConfiguration.toString(). * CONFIGURATION-664 - Add API org.apache.commons.configuration2.tree.ImmutableNode.getChildren(String). + Add API org.apache.commons.configuration3.tree.ImmutableNode.getChildren(String). * CONFIGURATION-660 Add toString() methods here and there to help debugging. * CONFIGURATION-658 - Add API org.apache.commons.configuration2.DataConfiguration.getURI(String) + Add API org.apache.commons.configuration3.DataConfiguration.getURI(String) methods. * CONFIGURATION-656 @@ -986,7 +986,7 @@ https://commons.apache.org/configuration/userguide/upgradeto2_0.html that describes all breaking changes and helps when upgrading to the new version. One obvious breaking change is the renaming of the main package -(all classes are now located under org.apache.commons.configuration2) and the +(all classes are now located under org.apache.commons.configuration3) and the Maven coordinates (groupId: org.apache.commons, artifactId: commons-configuration2). This was necessary to allow both versions to coexist on the classpath without conflicts. diff --git a/pom.xml b/pom.xml index 08a0d7ad45..defc526eb7 100644 --- a/pom.xml +++ b/pom.xml @@ -23,8 +23,8 @@ 67 4.0.0 - commons-configuration2 - 2.10.1-SNAPSHOT + commons-configuration3 + 3.0.0-SNAPSHOT Apache Commons Configuration 2001 @@ -402,7 +402,7 @@ - + jakarta.servlet jakarta.servlet-api 6.0.0 @@ -535,7 +535,7 @@ configuration - org.apache.commons.configuration2 + org.apache.commons.configuration3 2.10.0 2.10.1 (Java 8 or above) @@ -571,7 +571,7 @@ false - 2.9.0 + 3.0.0-SNAPSHOT RC1 true scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid} @@ -634,7 +634,7 @@ The below setting for not failing upon error stems from the fact that javacc's generated code. - Javacc is responsible for a portion of the code in the package org.apache.commons.configuration2.plist, + Javacc is responsible for a portion of the code in the package org.apache.commons.configuration3.plist, and only generates a portion of the package. Furthermore, the javacc parser generator generates javadoc that does not conform to the java 1.8 standard and causes the build to fail. For the sake of releasing commons-configuration-2.4. @@ -663,7 +663,7 @@ true - org.apache.commons.configuration2.Logging + org.apache.commons.configuration3.Logging @@ -715,7 +715,7 @@ - org.apache.commons.configuration2 + org.apache.commons.configuration3 diff --git a/src/conf/findbugs-exclude-filter.xml b/src/conf/findbugs-exclude-filter.xml index fa853dc153..4e6cc125ba 100644 --- a/src/conf/findbugs-exclude-filter.xml +++ b/src/conf/findbugs-exclude-filter.xml @@ -28,12 +28,12 @@ - + - + @@ -42,7 +42,7 @@ the default encoding is used. This is stated in the documentation. --> - + @@ -56,17 +56,17 @@ block. --> - + - + - + @@ -75,12 +75,12 @@ --> - - - - - - + + + + + + @@ -88,12 +88,12 @@ queries on configuration nodes. They are not intended to be serialized. --> - + - + diff --git a/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java b/src/main/java/org/apache/commons/configuration3/AbstractConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java rename to src/main/java/org/apache/commons/configuration3/AbstractConfiguration.java index 05be78bfae..42789da839 100644 --- a/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/AbstractConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.math.BigDecimal; import java.math.BigInteger; @@ -33,22 +33,22 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; -import org.apache.commons.configuration2.convert.ConversionHandler; -import org.apache.commons.configuration2.convert.DefaultConversionHandler; -import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler; -import org.apache.commons.configuration2.convert.ListDelimiterHandler; -import org.apache.commons.configuration2.event.BaseEventSource; -import org.apache.commons.configuration2.event.ConfigurationErrorEvent; -import org.apache.commons.configuration2.event.ConfigurationEvent; -import org.apache.commons.configuration2.event.EventListener; -import org.apache.commons.configuration2.ex.ConversionException; -import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration2.interpol.InterpolatorSpecification; -import org.apache.commons.configuration2.interpol.Lookup; -import org.apache.commons.configuration2.io.ConfigurationLogger; -import org.apache.commons.configuration2.sync.LockMode; -import org.apache.commons.configuration2.sync.NoOpSynchronizer; -import org.apache.commons.configuration2.sync.Synchronizer; +import org.apache.commons.configuration3.convert.ConversionHandler; +import org.apache.commons.configuration3.convert.DefaultConversionHandler; +import org.apache.commons.configuration3.convert.DisabledListDelimiterHandler; +import org.apache.commons.configuration3.convert.ListDelimiterHandler; +import org.apache.commons.configuration3.event.BaseEventSource; +import org.apache.commons.configuration3.event.ConfigurationErrorEvent; +import org.apache.commons.configuration3.event.ConfigurationEvent; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.ex.ConversionException; +import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration3.interpol.InterpolatorSpecification; +import org.apache.commons.configuration3.interpol.Lookup; +import org.apache.commons.configuration3.io.ConfigurationLogger; +import org.apache.commons.configuration3.sync.LockMode; +import org.apache.commons.configuration3.sync.NoOpSynchronizer; +import org.apache.commons.configuration3.sync.Synchronizer; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ClassUtils; import org.apache.commons.lang3.ObjectUtils; @@ -73,7 +73,7 @@ * and multiple values are added for this property. List splitting is controlled by a {@link ListDelimiterHandler} * object which can be set using the {@link #setListDelimiterHandler(ListDelimiterHandler)} method. It is disabled per * default. To enable this feature, set a suitable {@code ListDelimiterHandler}, e.g. an instance of - * {@link org.apache.commons.configuration2.convert.DefaultListDelimiterHandler DefaultListDelimiterHandler} configured + * {@link org.apache.commons.configuration3.convert.DefaultListDelimiterHandler DefaultListDelimiterHandler} configured * with the desired list delimiter character. *
  • Allows specifying how missing properties are treated. Per default the get methods returning an object will return * null if the searched property key is not found (and no default value is provided). With the @@ -142,7 +142,7 @@ public ListDelimiterHandler getListDelimiterHandler() { * Sets the {@code ListDelimiterHandler} to be used by this instance. This object is invoked every time when dealing * with string properties that may contain a list delimiter and thus have to be split to multiple values. Per default, a * {@code ListDelimiterHandler} implementation is set which does not support list splitting. This can be changed for - * instance by setting a {@link org.apache.commons.configuration2.convert.DefaultListDelimiterHandler + * instance by setting a {@link org.apache.commons.configuration3.convert.DefaultListDelimiterHandler * DefaultListDelimiterHandler} object. *

    *

    @@ -1364,7 +1364,7 @@ public void append(final Configuration c) { * component that does not support variable interpolation. * * @return a configuration with all variables interpolated - * @throws org.apache.commons.configuration2.ex.ConfigurationRuntimeException if this configuration cannot be cloned + * @throws org.apache.commons.configuration3.ex.ConfigurationRuntimeException if this configuration cannot be cloned * @since 1.5 */ public Configuration interpolatedConfiguration() { diff --git a/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java b/src/main/java/org/apache/commons/configuration3/AbstractHierarchicalConfiguration.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java rename to src/main/java/org/apache/commons/configuration3/AbstractHierarchicalConfiguration.java index bcfc07f32b..9a05525a65 100644 --- a/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/AbstractHierarchicalConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.util.Collection; import java.util.Collections; @@ -30,19 +30,19 @@ import java.util.Stack; import java.util.stream.Collectors; -import org.apache.commons.configuration2.event.ConfigurationEvent; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration2.sync.NoOpSynchronizer; -import org.apache.commons.configuration2.tree.ConfigurationNodeVisitorAdapter; -import org.apache.commons.configuration2.tree.DefaultExpressionEngine; -import org.apache.commons.configuration2.tree.ExpressionEngine; -import org.apache.commons.configuration2.tree.NodeAddData; -import org.apache.commons.configuration2.tree.NodeHandler; -import org.apache.commons.configuration2.tree.NodeKeyResolver; -import org.apache.commons.configuration2.tree.NodeModel; -import org.apache.commons.configuration2.tree.NodeTreeWalker; -import org.apache.commons.configuration2.tree.NodeUpdateData; -import org.apache.commons.configuration2.tree.QueryResult; +import org.apache.commons.configuration3.event.ConfigurationEvent; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.sync.NoOpSynchronizer; +import org.apache.commons.configuration3.tree.ConfigurationNodeVisitorAdapter; +import org.apache.commons.configuration3.tree.DefaultExpressionEngine; +import org.apache.commons.configuration3.tree.ExpressionEngine; +import org.apache.commons.configuration3.tree.NodeAddData; +import org.apache.commons.configuration3.tree.NodeHandler; +import org.apache.commons.configuration3.tree.NodeKeyResolver; +import org.apache.commons.configuration3.tree.NodeModel; +import org.apache.commons.configuration3.tree.NodeTreeWalker; +import org.apache.commons.configuration3.tree.NodeUpdateData; +import org.apache.commons.configuration3.tree.QueryResult; /** *

    @@ -115,7 +115,7 @@ * the stored properties. The examples above are valid for the default expression engine, which is used when a new * {@code AbstractHierarchicalConfiguration} instance is created. With the {@code setExpressionEngine()} method a * different expression engine can be set. For instance with - * {@link org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine} there is an expression engine available + * {@link org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine} there is an expression engine available * that supports configuration keys in XPATH syntax. *

    *

    @@ -135,14 +135,14 @@ * *

    * Whether an {@code AbstractHierarchicalConfiguration} object is thread-safe or not depends on the underlying - * {@code NodeModel} and the {@link org.apache.commons.configuration2.sync.Synchronizer Synchronizer} it is associated + * {@code NodeModel} and the {@link org.apache.commons.configuration3.sync.Synchronizer Synchronizer} it is associated * with. Some {@code NodeModel} implementations are inherently thread-safe; they do not require a special * {@code Synchronizer}. (Per default, a dummy {@code Synchronizer} is used which is not thread-safe!) The methods for * querying or updating configuration data invoke this {@code Synchronizer} accordingly. When accessing the * configuration's root node directly, the client application is responsible for proper synchronization. This is - * achieved by calling the methods {@link #lock(org.apache.commons.configuration2.sync.LockMode) lock()}, and - * {@link #unlock(org.apache.commons.configuration2.sync.LockMode) unlock()} with a proper - * {@link org.apache.commons.configuration2.sync.LockMode LockMode} argument. In any case, it is recommended to not + * achieved by calling the methods {@link #lock(org.apache.commons.configuration3.sync.LockMode) lock()}, and + * {@link #unlock(org.apache.commons.configuration3.sync.LockMode) unlock()} with a proper + * {@link org.apache.commons.configuration3.sync.LockMode LockMode} argument. In any case, it is recommended to not * access the root node directly, but to use corresponding methods for querying or updating configuration data instead. * Direct manipulations of a configuration's node structure circumvent many internal mechanisms and thus can cause * undesired effects. For concrete subclasses dealing with specific node structures, this situation may be different. diff --git a/src/main/java/org/apache/commons/configuration2/AbstractYAMLBasedConfiguration.java b/src/main/java/org/apache/commons/configuration3/AbstractYAMLBasedConfiguration.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/AbstractYAMLBasedConfiguration.java rename to src/main/java/org/apache/commons/configuration3/AbstractYAMLBasedConfiguration.java index a0e6c74798..64767df551 100644 --- a/src/main/java/org/apache/commons/configuration2/AbstractYAMLBasedConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/AbstractYAMLBasedConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.util.ArrayList; import java.util.Collection; @@ -25,9 +25,9 @@ import java.util.Map; import java.util.stream.Collectors; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.io.ConfigurationLogger; -import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.ConfigurationLogger; +import org.apache.commons.configuration3.tree.ImmutableNode; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/BaseConfiguration.java b/src/main/java/org/apache/commons/configuration3/BaseConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/BaseConfiguration.java rename to src/main/java/org/apache/commons/configuration3/BaseConfiguration.java index 73474b66d6..37e78856ac 100644 --- a/src/main/java/org/apache/commons/configuration2/BaseConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/BaseConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.util.ArrayList; import java.util.Collection; @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; /** * Basic configuration class. Stores the configuration data but does not provide any load or save functions. If you want diff --git a/src/main/java/org/apache/commons/configuration2/BaseConfigurationXMLReader.java b/src/main/java/org/apache/commons/configuration3/BaseConfigurationXMLReader.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/BaseConfigurationXMLReader.java rename to src/main/java/org/apache/commons/configuration3/BaseConfigurationXMLReader.java index 4a0593bb36..35e68367bb 100644 --- a/src/main/java/org/apache/commons/configuration2/BaseConfigurationXMLReader.java +++ b/src/main/java/org/apache/commons/configuration3/BaseConfigurationXMLReader.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java b/src/main/java/org/apache/commons/configuration3/BaseHierarchicalConfiguration.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java rename to src/main/java/org/apache/commons/configuration3/BaseHierarchicalConfiguration.java index 4392f1f483..0e1aa8ad29 100644 --- a/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/BaseHierarchicalConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.util.Collection; import java.util.Collections; @@ -26,21 +26,21 @@ import java.util.Map; import java.util.stream.Collectors; -import org.apache.commons.configuration2.event.ConfigurationEvent; -import org.apache.commons.configuration2.event.EventListener; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration2.tree.ConfigurationNodeVisitorAdapter; -import org.apache.commons.configuration2.tree.ImmutableNode; -import org.apache.commons.configuration2.tree.InMemoryNodeModel; -import org.apache.commons.configuration2.tree.InMemoryNodeModelSupport; -import org.apache.commons.configuration2.tree.NodeHandler; -import org.apache.commons.configuration2.tree.NodeModel; -import org.apache.commons.configuration2.tree.NodeSelector; -import org.apache.commons.configuration2.tree.NodeTreeWalker; -import org.apache.commons.configuration2.tree.QueryResult; -import org.apache.commons.configuration2.tree.ReferenceNodeHandler; -import org.apache.commons.configuration2.tree.TrackedNodeModel; +import org.apache.commons.configuration3.event.ConfigurationEvent; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration3.tree.ConfigurationNodeVisitorAdapter; +import org.apache.commons.configuration3.tree.ImmutableNode; +import org.apache.commons.configuration3.tree.InMemoryNodeModel; +import org.apache.commons.configuration3.tree.InMemoryNodeModelSupport; +import org.apache.commons.configuration3.tree.NodeHandler; +import org.apache.commons.configuration3.tree.NodeModel; +import org.apache.commons.configuration3.tree.NodeSelector; +import org.apache.commons.configuration3.tree.NodeTreeWalker; +import org.apache.commons.configuration3.tree.QueryResult; +import org.apache.commons.configuration3.tree.ReferenceNodeHandler; +import org.apache.commons.configuration3.tree.TrackedNodeModel; import org.apache.commons.lang3.ObjectUtils; /** diff --git a/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java b/src/main/java/org/apache/commons/configuration3/CombinedConfiguration.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java rename to src/main/java/org/apache/commons/configuration3/CombinedConfiguration.java index f11e5a767a..f8ff432d97 100644 --- a/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/CombinedConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -28,21 +28,21 @@ import java.util.Set; import java.util.stream.Collectors; -import org.apache.commons.configuration2.event.ConfigurationEvent; -import org.apache.commons.configuration2.event.EventListener; -import org.apache.commons.configuration2.event.EventSource; -import org.apache.commons.configuration2.event.EventType; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration2.sync.LockMode; -import org.apache.commons.configuration2.tree.DefaultConfigurationKey; -import org.apache.commons.configuration2.tree.DefaultExpressionEngine; -import org.apache.commons.configuration2.tree.ExpressionEngine; -import org.apache.commons.configuration2.tree.ImmutableNode; -import org.apache.commons.configuration2.tree.NodeCombiner; -import org.apache.commons.configuration2.tree.NodeTreeWalker; -import org.apache.commons.configuration2.tree.QueryResult; -import org.apache.commons.configuration2.tree.TreeUtils; -import org.apache.commons.configuration2.tree.UnionCombiner; +import org.apache.commons.configuration3.event.ConfigurationEvent; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.event.EventSource; +import org.apache.commons.configuration3.event.EventType; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.sync.LockMode; +import org.apache.commons.configuration3.tree.DefaultConfigurationKey; +import org.apache.commons.configuration3.tree.DefaultExpressionEngine; +import org.apache.commons.configuration3.tree.ExpressionEngine; +import org.apache.commons.configuration3.tree.ImmutableNode; +import org.apache.commons.configuration3.tree.NodeCombiner; +import org.apache.commons.configuration3.tree.NodeTreeWalker; +import org.apache.commons.configuration3.tree.QueryResult; +import org.apache.commons.configuration3.tree.TreeUtils; +import org.apache.commons.configuration3.tree.UnionCombiner; import org.apache.commons.lang3.StringUtils; /** @@ -53,7 +53,7 @@ * This class maintains a list of configuration objects, which can be added using the diverse {@code addConfiguration()} * methods. After that the configurations can be accessed either by name (if one was provided when the configuration was * added) or by index. For the whole set of managed configurations a logical node structure is constructed. For this - * purpose a {@link org.apache.commons.configuration2.tree.NodeCombiner NodeCombiner} object can be set. This makes it + * purpose a {@link org.apache.commons.configuration3.tree.NodeCombiner NodeCombiner} object can be set. This makes it * possible to specify different algorithms for the combination process. *

    *

    @@ -99,7 +99,7 @@ * * * - * As a {@code NodeCombiner} a {@link org.apache.commons.configuration2.tree.OverrideCombiner OverrideCombiner} is used. + * As a {@code NodeCombiner} a {@link org.apache.commons.configuration3.tree.OverrideCombiner OverrideCombiner} is used. * This combiner will ensure that defined user settings take precedence over the default values. If the resulting * {@code CombinedConfiguration} is queried for the background color, {@code blue} will be returned because this value * is defined in {@code user.properties}. Now consider what happens if the key {@code gui.background} is removed from @@ -201,7 +201,7 @@ public CombinedConfiguration(final NodeCombiner comb) { /** * Creates a new instance of {@code CombinedConfiguration} that uses a union combiner. * - * @see org.apache.commons.configuration2.tree.UnionCombiner + * @see org.apache.commons.configuration3.tree.UnionCombiner */ public CombinedConfiguration() { this(null); diff --git a/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java b/src/main/java/org/apache/commons/configuration3/CompositeConfiguration.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java rename to src/main/java/org/apache/commons/configuration3/CompositeConfiguration.java index 129aff7b3f..9fef163cf6 100644 --- a/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/CompositeConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.util.ArrayList; import java.util.Collection; @@ -26,8 +26,8 @@ import java.util.ListIterator; import java.util.Set; -import org.apache.commons.configuration2.convert.ListDelimiterHandler; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.convert.ListDelimiterHandler; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/Configuration.java b/src/main/java/org/apache/commons/configuration3/Configuration.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/Configuration.java rename to src/main/java/org/apache/commons/configuration3/Configuration.java index 76e4fe11d3..3c6fe9978c 100644 --- a/src/main/java/org/apache/commons/configuration2/Configuration.java +++ b/src/main/java/org/apache/commons/configuration3/Configuration.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.util.Collection; import java.util.Map; -import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration2.interpol.Lookup; -import org.apache.commons.configuration2.sync.SynchronizerSupport; +import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration3.interpol.Lookup; +import org.apache.commons.configuration3.sync.SynchronizerSupport; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/ConfigurationComparator.java b/src/main/java/org/apache/commons/configuration3/ConfigurationComparator.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/ConfigurationComparator.java rename to src/main/java/org/apache/commons/configuration3/ConfigurationComparator.java index 563b08fa72..6400da8482 100644 --- a/src/main/java/org/apache/commons/configuration2/ConfigurationComparator.java +++ b/src/main/java/org/apache/commons/configuration3/ConfigurationComparator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; /** * Comparator for configurations interface. diff --git a/src/main/java/org/apache/commons/configuration2/ConfigurationConsumer.java b/src/main/java/org/apache/commons/configuration3/ConfigurationConsumer.java similarity index 92% rename from src/main/java/org/apache/commons/configuration2/ConfigurationConsumer.java rename to src/main/java/org/apache/commons/configuration3/ConfigurationConsumer.java index b3e86f4140..c0eda68220 100644 --- a/src/main/java/org/apache/commons/configuration2/ConfigurationConsumer.java +++ b/src/main/java/org/apache/commons/configuration3/ConfigurationConsumer.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; -import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration3.ex.ConfigurationException; /** * A Configuration task that may throw a ConfigurationException. diff --git a/src/main/java/org/apache/commons/configuration2/ConfigurationConverter.java b/src/main/java/org/apache/commons/configuration3/ConfigurationConverter.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/ConfigurationConverter.java rename to src/main/java/org/apache/commons/configuration3/ConfigurationConverter.java index 0df7cfc805..78e21d11eb 100644 --- a/src/main/java/org/apache/commons/configuration2/ConfigurationConverter.java +++ b/src/main/java/org/apache/commons/configuration3/ConfigurationConverter.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Properties; -import org.apache.commons.configuration2.convert.ListDelimiterHandler; +import org.apache.commons.configuration3.convert.ListDelimiterHandler; import org.apache.commons.lang3.StringUtils; /** diff --git a/src/main/java/org/apache/commons/configuration2/ConfigurationDecoder.java b/src/main/java/org/apache/commons/configuration3/ConfigurationDecoder.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/ConfigurationDecoder.java rename to src/main/java/org/apache/commons/configuration3/ConfigurationDecoder.java index 07eb50d307..3c16b07e2c 100644 --- a/src/main/java/org/apache/commons/configuration2/ConfigurationDecoder.java +++ b/src/main/java/org/apache/commons/configuration3/ConfigurationDecoder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/ConfigurationLookup.java b/src/main/java/org/apache/commons/configuration3/ConfigurationLookup.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/ConfigurationLookup.java rename to src/main/java/org/apache/commons/configuration3/ConfigurationLookup.java index c88d1e744c..b09463dc66 100644 --- a/src/main/java/org/apache/commons/configuration2/ConfigurationLookup.java +++ b/src/main/java/org/apache/commons/configuration3/ConfigurationLookup.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; -import org.apache.commons.configuration2.interpol.Lookup; +import org.apache.commons.configuration3.interpol.Lookup; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/ConfigurationMap.java b/src/main/java/org/apache/commons/configuration3/ConfigurationMap.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/ConfigurationMap.java rename to src/main/java/org/apache/commons/configuration3/ConfigurationMap.java index 0ab0ce41b1..d8a246b8df 100644 --- a/src/main/java/org/apache/commons/configuration2/ConfigurationMap.java +++ b/src/main/java/org/apache/commons/configuration3/ConfigurationMap.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.util.AbstractMap; import java.util.AbstractSet; @@ -26,7 +26,7 @@ /** *

    - * The {@code ConfigurationMap} wraps a configuration-collection {@link org.apache.commons.configuration2.Configuration} + * The {@code ConfigurationMap} wraps a configuration-collection {@link org.apache.commons.configuration3.Configuration} * instance to provide a {@code Map} interface. *

    * diff --git a/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java b/src/main/java/org/apache/commons/configuration3/ConfigurationUtils.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java rename to src/main/java/org/apache/commons/configuration3/ConfigurationUtils.java index 22686f28ce..8fd7b6ee24 100644 --- a/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java +++ b/src/main/java/org/apache/commons/configuration3/ConfigurationUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.io.PrintStream; import java.io.PrintWriter; @@ -25,15 +25,15 @@ import java.lang.reflect.Proxy; import java.util.Iterator; -import org.apache.commons.configuration2.event.ConfigurationErrorEvent; -import org.apache.commons.configuration2.event.Event; -import org.apache.commons.configuration2.event.EventListener; -import org.apache.commons.configuration2.event.EventSource; -import org.apache.commons.configuration2.event.EventType; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration2.sync.NoOpSynchronizer; -import org.apache.commons.configuration2.sync.Synchronizer; -import org.apache.commons.configuration2.tree.ExpressionEngine; +import org.apache.commons.configuration3.event.ConfigurationErrorEvent; +import org.apache.commons.configuration3.event.Event; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.event.EventSource; +import org.apache.commons.configuration3.event.EventType; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.sync.NoOpSynchronizer; +import org.apache.commons.configuration3.sync.Synchronizer; +import org.apache.commons.configuration3.tree.ExpressionEngine; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/main/java/org/apache/commons/configuration2/ConfigurationXMLReader.java b/src/main/java/org/apache/commons/configuration3/ConfigurationXMLReader.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/ConfigurationXMLReader.java rename to src/main/java/org/apache/commons/configuration3/ConfigurationXMLReader.java index a0d072996c..d732347b4a 100644 --- a/src/main/java/org/apache/commons/configuration2/ConfigurationXMLReader.java +++ b/src/main/java/org/apache/commons/configuration3/ConfigurationXMLReader.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.io.IOException; diff --git a/src/main/java/org/apache/commons/configuration2/DataConfiguration.java b/src/main/java/org/apache/commons/configuration3/DataConfiguration.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/DataConfiguration.java rename to src/main/java/org/apache/commons/configuration3/DataConfiguration.java index 6dd0396b37..47ed193f5b 100644 --- a/src/main/java/org/apache/commons/configuration2/DataConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/DataConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.awt.Color; import java.math.BigDecimal; @@ -30,9 +30,9 @@ import java.util.Locale; import java.util.NoSuchElementException; -import org.apache.commons.configuration2.convert.ConversionHandler; -import org.apache.commons.configuration2.convert.DefaultConversionHandler; -import org.apache.commons.configuration2.ex.ConversionException; +import org.apache.commons.configuration3.convert.ConversionHandler; +import org.apache.commons.configuration3.convert.DefaultConversionHandler; +import org.apache.commons.configuration3.ex.ConversionException; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java b/src/main/java/org/apache/commons/configuration3/DatabaseConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java rename to src/main/java/org/apache/commons/configuration3/DatabaseConfiguration.java index bb90256cac..4215cb833c 100644 --- a/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/DatabaseConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.sql.Clob; import java.sql.Connection; @@ -30,12 +30,12 @@ import javax.sql.DataSource; -import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler; -import org.apache.commons.configuration2.convert.ListDelimiterHandler; -import org.apache.commons.configuration2.event.ConfigurationErrorEvent; -import org.apache.commons.configuration2.event.ConfigurationEvent; -import org.apache.commons.configuration2.event.EventType; -import org.apache.commons.configuration2.io.ConfigurationLogger; +import org.apache.commons.configuration3.convert.DisabledListDelimiterHandler; +import org.apache.commons.configuration3.convert.ListDelimiterHandler; +import org.apache.commons.configuration3.event.ConfigurationErrorEvent; +import org.apache.commons.configuration3.event.ConfigurationEvent; +import org.apache.commons.configuration3.event.EventType; +import org.apache.commons.configuration3.io.ConfigurationLogger; import org.apache.commons.lang3.StringUtils; /** diff --git a/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java b/src/main/java/org/apache/commons/configuration3/DynamicCombinedConfiguration.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java rename to src/main/java/org/apache/commons/configuration3/DynamicCombinedConfiguration.java index 263aea7ec4..6b6d2fd147 100644 --- a/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/DynamicCombinedConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.math.BigDecimal; import java.math.BigInteger; @@ -30,15 +30,15 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.apache.commons.configuration2.event.BaseEventSource; -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.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration2.interpol.Lookup; -import org.apache.commons.configuration2.io.ConfigurationLogger; -import org.apache.commons.configuration2.tree.ImmutableNode; -import org.apache.commons.configuration2.tree.NodeCombiner; +import org.apache.commons.configuration3.event.BaseEventSource; +import org.apache.commons.configuration3.event.Event; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.event.EventType; +import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration3.interpol.Lookup; +import org.apache.commons.configuration3.io.ConfigurationLogger; +import org.apache.commons.configuration3.tree.ImmutableNode; +import org.apache.commons.configuration3.tree.NodeCombiner; /** *

    @@ -99,7 +99,7 @@ public DynamicCombinedConfiguration(final NodeCombiner comb) { /** * Creates a new instance of {@code DynamicCombinedConfiguration} that uses a union combiner. * - * @see org.apache.commons.configuration2.tree.UnionCombiner + * @see org.apache.commons.configuration3.tree.UnionCombiner */ public DynamicCombinedConfiguration() { initLogger(new ConfigurationLogger(DynamicCombinedConfiguration.class)); diff --git a/src/main/java/org/apache/commons/configuration2/EnvironmentConfiguration.java b/src/main/java/org/apache/commons/configuration3/EnvironmentConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/EnvironmentConfiguration.java rename to src/main/java/org/apache/commons/configuration3/EnvironmentConfiguration.java index f3819c3be0..7612ebad6e 100644 --- a/src/main/java/org/apache/commons/configuration2/EnvironmentConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/EnvironmentConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.util.HashMap; diff --git a/src/main/java/org/apache/commons/configuration2/FileBasedConfiguration.java b/src/main/java/org/apache/commons/configuration3/FileBasedConfiguration.java similarity index 92% rename from src/main/java/org/apache/commons/configuration2/FileBasedConfiguration.java rename to src/main/java/org/apache/commons/configuration3/FileBasedConfiguration.java index bdb2eb8201..7e78668933 100644 --- a/src/main/java/org/apache/commons/configuration2/FileBasedConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/FileBasedConfiguration.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; -import org.apache.commons.configuration2.io.FileBased; +import org.apache.commons.configuration3.io.FileBased; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/FindNodeVisitor.java b/src/main/java/org/apache/commons/configuration3/FindNodeVisitor.java similarity index 93% rename from src/main/java/org/apache/commons/configuration2/FindNodeVisitor.java rename to src/main/java/org/apache/commons/configuration3/FindNodeVisitor.java index aeb67c0c90..dc75df67ad 100644 --- a/src/main/java/org/apache/commons/configuration2/FindNodeVisitor.java +++ b/src/main/java/org/apache/commons/configuration3/FindNodeVisitor.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; -import org.apache.commons.configuration2.tree.ConfigurationNodeVisitorAdapter; -import org.apache.commons.configuration2.tree.NodeHandler; +import org.apache.commons.configuration3.tree.ConfigurationNodeVisitorAdapter; +import org.apache.commons.configuration3.tree.NodeHandler; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/HierarchicalConfiguration.java b/src/main/java/org/apache/commons/configuration3/HierarchicalConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/HierarchicalConfiguration.java rename to src/main/java/org/apache/commons/configuration3/HierarchicalConfiguration.java index d4075e01bf..c1ae432b61 100644 --- a/src/main/java/org/apache/commons/configuration2/HierarchicalConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/HierarchicalConfiguration.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.util.Collection; import java.util.List; -import org.apache.commons.configuration2.tree.ExpressionEngine; -import org.apache.commons.configuration2.tree.NodeModelSupport; +import org.apache.commons.configuration3.tree.ExpressionEngine; +import org.apache.commons.configuration3.tree.NodeModelSupport; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationConverter.java b/src/main/java/org/apache/commons/configuration3/HierarchicalConfigurationConverter.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationConverter.java rename to src/main/java/org/apache/commons/configuration3/HierarchicalConfigurationConverter.java index 93725f7b90..c14f9dd645 100644 --- a/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationConverter.java +++ b/src/main/java/org/apache/commons/configuration3/HierarchicalConfigurationConverter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.util.ArrayList; import java.util.Collection; @@ -25,8 +25,8 @@ import java.util.List; import java.util.Set; -import org.apache.commons.configuration2.tree.DefaultConfigurationKey; -import org.apache.commons.configuration2.tree.DefaultExpressionEngine; +import org.apache.commons.configuration3.tree.DefaultConfigurationKey; +import org.apache.commons.configuration3.tree.DefaultExpressionEngine; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationXMLReader.java b/src/main/java/org/apache/commons/configuration3/HierarchicalConfigurationXMLReader.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationXMLReader.java rename to src/main/java/org/apache/commons/configuration3/HierarchicalConfigurationXMLReader.java index e84868f00e..c7078652a1 100644 --- a/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationXMLReader.java +++ b/src/main/java/org/apache/commons/configuration3/HierarchicalConfigurationXMLReader.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; -import org.apache.commons.configuration2.tree.ConfigurationNodeVisitorAdapter; -import org.apache.commons.configuration2.tree.NodeHandler; -import org.apache.commons.configuration2.tree.NodeTreeWalker; +import org.apache.commons.configuration3.tree.ConfigurationNodeVisitorAdapter; +import org.apache.commons.configuration3.tree.NodeHandler; +import org.apache.commons.configuration3.tree.NodeTreeWalker; import org.xml.sax.Attributes; import org.xml.sax.helpers.AttributesImpl; diff --git a/src/main/java/org/apache/commons/configuration2/INIConfiguration.java b/src/main/java/org/apache/commons/configuration3/INIConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/INIConfiguration.java rename to src/main/java/org/apache/commons/configuration3/INIConfiguration.java index 4749d9301c..593c741b24 100644 --- a/src/main/java/org/apache/commons/configuration2/INIConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/INIConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.io.BufferedReader; import java.io.IOException; @@ -28,16 +28,16 @@ import java.util.Set; import java.util.stream.Collectors; -import org.apache.commons.configuration2.convert.ListDelimiterHandler; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration2.tree.ImmutableNode; -import org.apache.commons.configuration2.tree.InMemoryNodeModel; -import org.apache.commons.configuration2.tree.InMemoryNodeModelSupport; -import org.apache.commons.configuration2.tree.NodeHandler; -import org.apache.commons.configuration2.tree.NodeHandlerDecorator; -import org.apache.commons.configuration2.tree.NodeSelector; -import org.apache.commons.configuration2.tree.TrackedNodeModel; +import org.apache.commons.configuration3.convert.ListDelimiterHandler; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.tree.ImmutableNode; +import org.apache.commons.configuration3.tree.InMemoryNodeModel; +import org.apache.commons.configuration3.tree.InMemoryNodeModelSupport; +import org.apache.commons.configuration3.tree.NodeHandler; +import org.apache.commons.configuration3.tree.NodeHandlerDecorator; +import org.apache.commons.configuration3.tree.NodeSelector; +import org.apache.commons.configuration3.tree.TrackedNodeModel; /** *

    @@ -101,7 +101,7 @@ * In all instances, a parameter's key is prepended with its section name and a '.' (period). Thus a parameter named * "var1" in "section1" will have the key {@code section1.var1} in this configuration. (This is the default behavior. * Because this is a hierarchical configuration you can change this by setting a different - * {@link org.apache.commons.configuration2.tree.ExpressionEngine}.) + * {@link org.apache.commons.configuration3.tree.ExpressionEngine}.) *

    *

    * Implementation Details: Consider the following ini file: diff --git a/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java b/src/main/java/org/apache/commons/configuration3/ImmutableConfiguration.java similarity index 92% rename from src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java rename to src/main/java/org/apache/commons/configuration3/ImmutableConfiguration.java index a76593394c..780aca8d8f 100644 --- a/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/ImmutableConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.math.BigDecimal; import java.math.BigInteger; @@ -25,8 +25,8 @@ import java.util.NoSuchElementException; import java.util.Properties; -import org.apache.commons.configuration2.convert.PropertyConverter; -import org.apache.commons.configuration2.ex.ConversionException; +import org.apache.commons.configuration3.convert.PropertyConverter; +import org.apache.commons.configuration3.ex.ConversionException; /** *

    @@ -73,7 +73,7 @@ public interface ImmutableConfiguration { * @return the value of the requested type for the key * @throws java.util.NoSuchElementException if the key doesn't map to an existing object and * {@code throwExceptionOnMissing=true} - * @throws org.apache.commons.configuration2.ex.ConversionException if the value is not compatible with the requested + * @throws org.apache.commons.configuration3.ex.ConversionException if the value is not compatible with the requested * type * @since 2.0 */ @@ -90,7 +90,7 @@ public interface ImmutableConfiguration { * * @return the value of the requested type for the key * - * @throws org.apache.commons.configuration2.ex.ConversionException if the value is not compatible with the requested + * @throws org.apache.commons.configuration3.ex.ConversionException if the value is not compatible with the requested * type * * @since 2.0 @@ -105,7 +105,7 @@ public interface ImmutableConfiguration { * @param key The configuration key. * @return The associated array if the key is found, and the value compatible with the type specified. * - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not * compatible with a list of the specified class. * * @since 2.0 @@ -121,7 +121,7 @@ public interface ImmutableConfiguration { * @param defaultValue the default value * @return The associated array if the key is found, and the value compatible with the type specified. * - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not * compatible with an array of the specified class. * @throws IllegalArgumentException if the default value is not an array of the specified type * @@ -177,7 +177,7 @@ public interface ImmutableConfiguration { * * @param key The configuration key. * @return The associated boolean. - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * Boolean. */ boolean getBoolean(String key); @@ -189,7 +189,7 @@ public interface ImmutableConfiguration { * @param key The configuration key. * @param defaultValue The default value. * @return The associated boolean. - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * Boolean. */ boolean getBoolean(String key, boolean defaultValue); @@ -200,7 +200,7 @@ public interface ImmutableConfiguration { * @param key The configuration key. * @param defaultValue The default value. * @return The associated boolean if key is found and has valid format, default value otherwise. - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * Boolean. */ Boolean getBoolean(String key, Boolean defaultValue); @@ -210,7 +210,7 @@ public interface ImmutableConfiguration { * * @param key The configuration key. * @return The associated byte. - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * Byte. */ byte getByte(String key); @@ -222,7 +222,7 @@ public interface ImmutableConfiguration { * @param key The configuration key. * @param defaultValue The default value. * @return The associated byte. - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * Byte. */ byte getByte(String key, byte defaultValue); @@ -233,7 +233,7 @@ public interface ImmutableConfiguration { * @param key The configuration key. * @param defaultValue The default value. * @return The associated byte if key is found and has valid format, default value otherwise. - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * Byte. */ Byte getByte(String key, Byte defaultValue); @@ -247,7 +247,7 @@ public interface ImmutableConfiguration { * @param key the configuration key * @param target the target collection (may be null) * @return the collection to which data was added - * @throws org.apache.commons.configuration2.ex.ConversionException if the conversion is not possible + * @throws org.apache.commons.configuration3.ex.ConversionException if the conversion is not possible * @since 2.0 */ Collection getCollection(Class cls, String key, Collection target); @@ -273,7 +273,7 @@ public interface ImmutableConfiguration { * @param target the target collection (may be null) * @param defaultValue the default value (may be null) * @return the collection to which data was added - * @throws org.apache.commons.configuration2.ex.ConversionException if the conversion is not possible + * @throws org.apache.commons.configuration3.ex.ConversionException if the conversion is not possible * @since 2.0 */ Collection getCollection(Class cls, String key, Collection target, Collection defaultValue); @@ -283,7 +283,7 @@ public interface ImmutableConfiguration { * * @param key The configuration key. * @return The associated double. - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * Double. */ double getDouble(String key); @@ -295,7 +295,7 @@ public interface ImmutableConfiguration { * @param key The configuration key. * @param defaultValue The default value. * @return The associated double. - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * Double. */ double getDouble(String key, double defaultValue); @@ -306,7 +306,7 @@ public interface ImmutableConfiguration { * @param key The configuration key. * @param defaultValue The default value. * @return The associated double if key is found and has valid format, default value otherwise. - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * Double. */ Double getDouble(String key, Double defaultValue); @@ -316,7 +316,7 @@ public interface ImmutableConfiguration { * * @param key The configuration key. * @return The associated Duration if key is found and has valid format, default value otherwise. - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * Duration. * @since 2.8.0 */ @@ -334,7 +334,7 @@ default Duration getDuration(final String key) { * @param key The configuration key. * @param defaultValue The default value. * @return The associated Duration if key is found and has valid format, default value otherwise. - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * Duration. * @since 2.8.0 */ @@ -376,7 +376,7 @@ default Duration getDuration(final String key, final Duration defaultValue) { * @param key The configuration key. * @return The associated enum. * - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * String. * @since 2.8.0 */ @@ -398,7 +398,7 @@ default > T getEnum(final String key, final Class enumType) * @param defaultValue The default value. * @return The associated enum if key is found and has valid format, default value otherwise. * - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * Enum. * @since 2.8.0 */ @@ -419,7 +419,7 @@ default > T getEnum(final String key, final Class enumType, * * @param key The configuration key. * @return The associated float. - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * Float. */ float getFloat(String key); @@ -431,7 +431,7 @@ default > T getEnum(final String key, final Class enumType, * @param key The configuration key. * @param defaultValue The default value. * @return The associated float. - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * Float. */ float getFloat(String key, float defaultValue); @@ -443,7 +443,7 @@ default > T getEnum(final String key, final Class enumType, * @param key The configuration key. * @param defaultValue The default value. * @return The associated float if key is found and has valid format, default value otherwise. - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * Float. */ Float getFloat(String key, Float defaultValue); @@ -453,7 +453,7 @@ default > T getEnum(final String key, final Class enumType, * * @param key The configuration key. * @return The associated int. - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * Integer. */ int getInt(String key); @@ -465,7 +465,7 @@ default > T getEnum(final String key, final Class enumType, * @param key The configuration key. * @param defaultValue The default value. * @return The associated int. - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * Integer. */ int getInt(String key, int defaultValue); @@ -477,7 +477,7 @@ default > T getEnum(final String key, final Class enumType, * @param key The configuration key. * @param defaultValue The default value. * @return The associated int if key is found and has valid format, default value otherwise. - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * Integer. */ Integer getInteger(String key, Integer defaultValue); @@ -537,7 +537,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * @param key The configuration key. * @return The associated list if the key is found. * - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not * compatible with a list of the specified class. * * @since 2.0 @@ -557,7 +557,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * @param defaultValue the default value. * @return The associated List. * - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not * compatible with a list of the specified class. * * @since 2.0 @@ -574,7 +574,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * @param key The configuration key. * @return The associated List. * - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * List. */ List getList(String key); @@ -587,7 +587,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * @param defaultValue The default value. * @return The associated List of strings. * - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * List. * @see #getList(Class, String, List) */ @@ -598,7 +598,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * * @param key The configuration key. * @return The associated long. - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * Long. */ long getLong(String key); @@ -611,7 +611,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * @param defaultValue The default value. * @return The associated long. * - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * Long. */ long getLong(String key, long defaultValue); @@ -624,7 +624,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * @param defaultValue The default value. * @return The associated long if key is found and has valid format, default value otherwise. * - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * Long. */ Long getLong(String key, Long defaultValue); @@ -637,7 +637,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * * @param key The configuration key. * @return The associated properties if key is found. - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * String/List. * @throws IllegalArgumentException if one of the tokens is malformed (does not contain an equals sign). */ @@ -663,7 +663,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * @param key The configuration key. * @return The associated short. * - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * Short. */ short getShort(String key); @@ -675,7 +675,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * @param defaultValue The default value. * @return The associated short. * - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * Short. */ short getShort(String key, short defaultValue); @@ -688,7 +688,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * @param defaultValue The default value. * @return The associated short if key is found and has valid format, default value otherwise. * - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * Short. */ Short getShort(String key, Short defaultValue); @@ -699,7 +699,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * @param key The configuration key. * @return The associated string. * - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * String. */ String getString(String key); @@ -712,7 +712,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * @param defaultValue The default value. * @return The associated string if key is found and has valid format, default value otherwise. * - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * String. */ String getString(String key, String defaultValue); @@ -724,7 +724,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * @param key The configuration key. * @return The associated string array if key is found. * - * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a * String/List of Strings. */ String[] getStringArray(String key); diff --git a/src/main/java/org/apache/commons/configuration2/ImmutableConfigurationInvocationHandler.java b/src/main/java/org/apache/commons/configuration3/ImmutableConfigurationInvocationHandler.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/ImmutableConfigurationInvocationHandler.java rename to src/main/java/org/apache/commons/configuration3/ImmutableConfigurationInvocationHandler.java index 5392062456..ab91a12ca6 100644 --- a/src/main/java/org/apache/commons/configuration2/ImmutableConfigurationInvocationHandler.java +++ b/src/main/java/org/apache/commons/configuration3/ImmutableConfigurationInvocationHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; diff --git a/src/main/java/org/apache/commons/configuration2/ImmutableHierarchicalConfiguration.java b/src/main/java/org/apache/commons/configuration3/ImmutableHierarchicalConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/ImmutableHierarchicalConfiguration.java rename to src/main/java/org/apache/commons/configuration3/ImmutableHierarchicalConfiguration.java index 4c966b89a0..23a49543ff 100644 --- a/src/main/java/org/apache/commons/configuration2/ImmutableHierarchicalConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/ImmutableHierarchicalConfiguration.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.util.List; -import org.apache.commons.configuration2.tree.ExpressionEngine; +import org.apache.commons.configuration3.tree.ExpressionEngine; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/Initializable.java b/src/main/java/org/apache/commons/configuration3/Initializable.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/Initializable.java rename to src/main/java/org/apache/commons/configuration3/Initializable.java index 359b566b62..9be3e92175 100644 --- a/src/main/java/org/apache/commons/configuration2/Initializable.java +++ b/src/main/java/org/apache/commons/configuration3/Initializable.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java b/src/main/java/org/apache/commons/configuration3/JNDIConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java rename to src/main/java/org/apache/commons/configuration3/JNDIConfiguration.java index 929156262a..e9c5446abc 100644 --- a/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/JNDIConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.util.ArrayList; import java.util.Arrays; @@ -32,8 +32,8 @@ import javax.naming.NamingException; import javax.naming.NotContextException; -import org.apache.commons.configuration2.event.ConfigurationErrorEvent; -import org.apache.commons.configuration2.io.ConfigurationLogger; +import org.apache.commons.configuration3.event.ConfigurationErrorEvent; +import org.apache.commons.configuration3.io.ConfigurationLogger; import org.apache.commons.lang3.StringUtils; /** diff --git a/src/main/java/org/apache/commons/configuration2/JSONConfiguration.java b/src/main/java/org/apache/commons/configuration3/JSONConfiguration.java similarity index 92% rename from src/main/java/org/apache/commons/configuration2/JSONConfiguration.java rename to src/main/java/org/apache/commons/configuration3/JSONConfiguration.java index d18060553a..542b1f09b0 100644 --- a/src/main/java/org/apache/commons/configuration2/JSONConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/JSONConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.io.IOException; import java.io.InputStream; @@ -23,9 +23,9 @@ import java.io.Writer; import java.util.Map; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.io.InputStreamSupport; -import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.InputStreamSupport; +import org.apache.commons.configuration3.tree.ImmutableNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.type.MapType; diff --git a/src/main/java/org/apache/commons/configuration2/MapConfiguration.java b/src/main/java/org/apache/commons/configuration3/MapConfiguration.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/MapConfiguration.java rename to src/main/java/org/apache/commons/configuration3/MapConfiguration.java index c42591e80f..b6d755ae62 100644 --- a/src/main/java/org/apache/commons/configuration2/MapConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/MapConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.util.ArrayList; import java.util.Collection; @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Properties; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; /** *

    @@ -50,11 +50,11 @@ *

    *

    * The handling of list delimiters is a bit different for this configuration implementation: When a property of type - * String is queried, it is passed to the current {@link org.apache.commons.configuration2.convert.ListDelimiterHandler + * String is queried, it is passed to the current {@link org.apache.commons.configuration3.convert.ListDelimiterHandler * ListDelimiterHandler} which may generate multiple values. Note that per default a list delimiter handler is set which * does not do any list splitting, so this feature is disabled. It can be enabled by setting a properly configured * {@code ListDelimiterHandler} implementation, e.g. a - * {@link org.apache.commons.configuration2.convert.DefaultListDelimiterHandler DefaultListDelimiterHandler} object. + * {@link org.apache.commons.configuration3.convert.DefaultListDelimiterHandler DefaultListDelimiterHandler} object. *

    *

    * Notice that list splitting is only performed for single string values. If a property has multiple values, the single diff --git a/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java b/src/main/java/org/apache/commons/configuration3/PatternSubtreeConfigurationWrapper.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java rename to src/main/java/org/apache/commons/configuration3/PatternSubtreeConfigurationWrapper.java index ab3b89e522..b3fe798955 100644 --- a/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java +++ b/src/main/java/org/apache/commons/configuration3/PatternSubtreeConfigurationWrapper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.io.IOException; import java.io.Reader; @@ -28,13 +28,13 @@ import java.util.Objects; import java.util.Properties; -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.io.FileBased; -import org.apache.commons.configuration2.tree.ExpressionEngine; -import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration3.event.Event; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.event.EventType; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.FileBased; +import org.apache.commons.configuration3.tree.ExpressionEngine; +import org.apache.commons.configuration3.tree.ImmutableNode; /** * Wraps a BaseHierarchicalConfiguration and allows subtrees to be accessed via a configured path with replaceable diff --git a/src/main/java/org/apache/commons/configuration2/PrefixedKeysIterator.java b/src/main/java/org/apache/commons/configuration3/PrefixedKeysIterator.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/PrefixedKeysIterator.java rename to src/main/java/org/apache/commons/configuration3/PrefixedKeysIterator.java index 2e40316904..7e30ccf747 100644 --- a/src/main/java/org/apache/commons/configuration2/PrefixedKeysIterator.java +++ b/src/main/java/org/apache/commons/configuration3/PrefixedKeysIterator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java b/src/main/java/org/apache/commons/configuration3/PropertiesConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java rename to src/main/java/org/apache/commons/configuration3/PropertiesConfiguration.java index c3e89663a2..d8ede33943 100644 --- a/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/PropertiesConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.io.FileNotFoundException; import java.io.FilterWriter; @@ -35,15 +35,15 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.configuration2.convert.ListDelimiterHandler; -import org.apache.commons.configuration2.convert.ValueTransformer; -import org.apache.commons.configuration2.event.ConfigurationEvent; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration2.io.FileHandler; -import org.apache.commons.configuration2.io.FileLocator; -import org.apache.commons.configuration2.io.FileLocatorAware; -import org.apache.commons.configuration2.io.FileLocatorUtils; +import org.apache.commons.configuration3.convert.ListDelimiterHandler; +import org.apache.commons.configuration3.convert.ValueTransformer; +import org.apache.commons.configuration3.event.ConfigurationEvent; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration3.io.FileLocator; +import org.apache.commons.configuration3.io.FileLocatorAware; +import org.apache.commons.configuration3.io.FileLocatorUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.StringEscapeUtils; @@ -87,7 +87,7 @@ * below. *

  • The list delimiter facilities provided by {@link AbstractConfiguration} are supported, too. If an appropriate * {@link ListDelimiterHandler} is set (for instance a - * {@link org.apache.commons.configuration2.convert.DefaultListDelimiterHandler D efaultListDelimiterHandler} object + * {@link org.apache.commons.configuration3.convert.DefaultListDelimiterHandler D efaultListDelimiterHandler} object * configured with a comma as delimiter character), value can contain value delimiters and will then be * interpreted as a list of tokens. So the following property definition * diff --git a/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java b/src/main/java/org/apache/commons/configuration3/PropertiesConfigurationLayout.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java rename to src/main/java/org/apache/commons/configuration3/PropertiesConfigurationLayout.java index 52f34e2f28..c1c517c5d2 100644 --- a/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java +++ b/src/main/java/org/apache/commons/configuration3/PropertiesConfigurationLayout.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.io.IOException; import java.io.Reader; @@ -29,10 +29,10 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.commons.configuration2.event.ConfigurationEvent; -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.configuration3.event.ConfigurationEvent; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; import org.apache.commons.lang3.StringUtils; /** diff --git a/src/main/java/org/apache/commons/configuration2/StrictConfigurationComparator.java b/src/main/java/org/apache/commons/configuration3/StrictConfigurationComparator.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/StrictConfigurationComparator.java rename to src/main/java/org/apache/commons/configuration3/StrictConfigurationComparator.java index 89d3b45aeb..8c154cf614 100644 --- a/src/main/java/org/apache/commons/configuration2/StrictConfigurationComparator.java +++ b/src/main/java/org/apache/commons/configuration3/StrictConfigurationComparator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.util.Iterator; diff --git a/src/main/java/org/apache/commons/configuration2/SubnodeConfiguration.java b/src/main/java/org/apache/commons/configuration3/SubnodeConfiguration.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/SubnodeConfiguration.java rename to src/main/java/org/apache/commons/configuration3/SubnodeConfiguration.java index 6ed272ece5..513b76f513 100644 --- a/src/main/java/org/apache/commons/configuration2/SubnodeConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/SubnodeConfiguration.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; -import org.apache.commons.configuration2.tree.ImmutableNode; -import org.apache.commons.configuration2.tree.InMemoryNodeModel; -import org.apache.commons.configuration2.tree.InMemoryNodeModelSupport; -import org.apache.commons.configuration2.tree.NodeModel; -import org.apache.commons.configuration2.tree.NodeSelector; -import org.apache.commons.configuration2.tree.TrackedNodeModel; +import org.apache.commons.configuration3.tree.ImmutableNode; +import org.apache.commons.configuration3.tree.InMemoryNodeModel; +import org.apache.commons.configuration3.tree.InMemoryNodeModelSupport; +import org.apache.commons.configuration3.tree.NodeModel; +import org.apache.commons.configuration3.tree.NodeSelector; +import org.apache.commons.configuration3.tree.TrackedNodeModel; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java b/src/main/java/org/apache/commons/configuration3/SubsetConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java rename to src/main/java/org/apache/commons/configuration3/SubsetConfiguration.java index fd87053f0f..71d5176378 100644 --- a/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/SubsetConfiguration.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.util.Iterator; -import org.apache.commons.configuration2.convert.ListDelimiterHandler; +import org.apache.commons.configuration3.convert.ListDelimiterHandler; import org.apache.commons.lang3.StringUtils; /** diff --git a/src/main/java/org/apache/commons/configuration2/SystemConfiguration.java b/src/main/java/org/apache/commons/configuration3/SystemConfiguration.java similarity index 95% rename from src/main/java/org/apache/commons/configuration2/SystemConfiguration.java rename to src/main/java/org/apache/commons/configuration3/SystemConfiguration.java index 6f2d688d35..05b5afe205 100644 --- a/src/main/java/org/apache/commons/configuration2/SystemConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/SystemConfiguration.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.util.Iterator; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.FileHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java b/src/main/java/org/apache/commons/configuration3/XMLConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/XMLConfiguration.java rename to src/main/java/org/apache/commons/configuration3/XMLConfiguration.java index 8b0c93bb7a..9c1693bd1b 100644 --- a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/XMLConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.io.IOException; import java.io.InputStream; @@ -41,16 +41,16 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.apache.commons.configuration2.convert.ListDelimiterHandler; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.io.ConfigurationLogger; -import org.apache.commons.configuration2.io.FileLocator; -import org.apache.commons.configuration2.io.FileLocatorAware; -import org.apache.commons.configuration2.io.InputStreamSupport; -import org.apache.commons.configuration2.resolver.DefaultEntityResolver; -import org.apache.commons.configuration2.tree.ImmutableNode; -import org.apache.commons.configuration2.tree.NodeTreeWalker; -import org.apache.commons.configuration2.tree.ReferenceNodeHandler; +import org.apache.commons.configuration3.convert.ListDelimiterHandler; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.ConfigurationLogger; +import org.apache.commons.configuration3.io.FileLocator; +import org.apache.commons.configuration3.io.FileLocatorAware; +import org.apache.commons.configuration3.io.InputStreamSupport; +import org.apache.commons.configuration3.resolver.DefaultEntityResolver; +import org.apache.commons.configuration3.tree.ImmutableNode; +import org.apache.commons.configuration3.tree.NodeTreeWalker; +import org.apache.commons.configuration3.tree.ReferenceNodeHandler; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.mutable.MutableObject; import org.w3c.dom.Attr; diff --git a/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java b/src/main/java/org/apache/commons/configuration3/XMLDocumentHelper.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java rename to src/main/java/org/apache/commons/configuration3/XMLDocumentHelper.java index 61be4c7a6c..4f012ca941 100644 --- a/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java +++ b/src/main/java/org/apache/commons/configuration3/XMLDocumentHelper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.util.Collections; import java.util.HashMap; @@ -32,7 +32,7 @@ import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; -import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration3.ex.ConfigurationException; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/src/main/java/org/apache/commons/configuration2/XMLListReference.java b/src/main/java/org/apache/commons/configuration3/XMLListReference.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/XMLListReference.java rename to src/main/java/org/apache/commons/configuration3/XMLListReference.java index d4e4a306ef..8a9d1dd910 100644 --- a/src/main/java/org/apache/commons/configuration2/XMLListReference.java +++ b/src/main/java/org/apache/commons/configuration3/XMLListReference.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.apache.commons.configuration2.convert.ListDelimiterHandler; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration2.tree.ImmutableNode; -import org.apache.commons.configuration2.tree.ReferenceNodeHandler; +import org.apache.commons.configuration3.convert.ListDelimiterHandler; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.tree.ImmutableNode; +import org.apache.commons.configuration3.tree.ReferenceNodeHandler; import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Element; diff --git a/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java b/src/main/java/org/apache/commons/configuration3/XMLPropertiesConfiguration.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java rename to src/main/java/org/apache/commons/configuration3/XMLPropertiesConfiguration.java index 645ee6c7f9..d518a7ce3e 100644 --- a/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/XMLPropertiesConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.io.PrintWriter; import java.io.Reader; @@ -27,10 +27,10 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import org.apache.commons.configuration2.convert.ListDelimiterHandler; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.io.FileLocator; -import org.apache.commons.configuration2.io.FileLocatorAware; +import org.apache.commons.configuration3.convert.ListDelimiterHandler; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.FileLocator; +import org.apache.commons.configuration3.io.FileLocatorAware; import org.apache.commons.text.StringEscapeUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/src/main/java/org/apache/commons/configuration2/YAMLConfiguration.java b/src/main/java/org/apache/commons/configuration3/YAMLConfiguration.java similarity index 94% rename from src/main/java/org/apache/commons/configuration2/YAMLConfiguration.java rename to src/main/java/org/apache/commons/configuration3/YAMLConfiguration.java index 7f392ccd60..bf0c44e025 100644 --- a/src/main/java/org/apache/commons/configuration2/YAMLConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/YAMLConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.io.IOException; import java.io.InputStream; @@ -23,9 +23,9 @@ import java.io.Writer; import java.util.Map; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.io.InputStreamSupport; -import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.InputStreamSupport; +import org.apache.commons.configuration3.tree.ImmutableNode; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.Yaml; diff --git a/src/main/java/org/apache/commons/configuration2/beanutils/BeanCreationContext.java b/src/main/java/org/apache/commons/configuration3/beanutils/BeanCreationContext.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/beanutils/BeanCreationContext.java rename to src/main/java/org/apache/commons/configuration3/beanutils/BeanCreationContext.java index 6f123179fd..58ca596479 100644 --- a/src/main/java/org/apache/commons/configuration2/beanutils/BeanCreationContext.java +++ b/src/main/java/org/apache/commons/configuration3/beanutils/BeanCreationContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.beanutils; +package org.apache.commons.configuration3.beanutils; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/beanutils/BeanDeclaration.java b/src/main/java/org/apache/commons/configuration3/beanutils/BeanDeclaration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/beanutils/BeanDeclaration.java rename to src/main/java/org/apache/commons/configuration3/beanutils/BeanDeclaration.java index 9dfd3a96f8..8a670dec8d 100644 --- a/src/main/java/org/apache/commons/configuration2/beanutils/BeanDeclaration.java +++ b/src/main/java/org/apache/commons/configuration3/beanutils/BeanDeclaration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.beanutils; +package org.apache.commons.configuration3.beanutils; import java.util.Collection; import java.util.Map; diff --git a/src/main/java/org/apache/commons/configuration2/beanutils/BeanFactory.java b/src/main/java/org/apache/commons/configuration3/beanutils/BeanFactory.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/beanutils/BeanFactory.java rename to src/main/java/org/apache/commons/configuration3/beanutils/BeanFactory.java index 295e0de28e..d219c97a6a 100644 --- a/src/main/java/org/apache/commons/configuration2/beanutils/BeanFactory.java +++ b/src/main/java/org/apache/commons/configuration3/beanutils/BeanFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.beanutils; +package org.apache.commons.configuration3.beanutils; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java b/src/main/java/org/apache/commons/configuration3/beanutils/BeanHelper.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java rename to src/main/java/org/apache/commons/configuration3/beanutils/BeanHelper.java index f5a2ecbd73..fd30bab67b 100644 --- a/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java +++ b/src/main/java/org/apache/commons/configuration3/beanutils/BeanHelper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.beanutils; +package org.apache.commons.configuration3.beanutils; import java.beans.PropertyDescriptor; import java.lang.reflect.InvocationTargetException; @@ -34,7 +34,7 @@ import org.apache.commons.beanutils.PropertyUtilsBean; import org.apache.commons.beanutils.WrapDynaBean; import org.apache.commons.beanutils.WrapDynaClass; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; import org.apache.commons.lang3.ClassUtils; /** diff --git a/src/main/java/org/apache/commons/configuration2/beanutils/CombinedBeanDeclaration.java b/src/main/java/org/apache/commons/configuration3/beanutils/CombinedBeanDeclaration.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/beanutils/CombinedBeanDeclaration.java rename to src/main/java/org/apache/commons/configuration3/beanutils/CombinedBeanDeclaration.java index 11f3160017..9827eba3a7 100644 --- a/src/main/java/org/apache/commons/configuration2/beanutils/CombinedBeanDeclaration.java +++ b/src/main/java/org/apache/commons/configuration3/beanutils/CombinedBeanDeclaration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.beanutils; +package org.apache.commons.configuration3.beanutils; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.java b/src/main/java/org/apache/commons/configuration3/beanutils/ConfigurationDynaBean.java similarity index 94% rename from src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.java rename to src/main/java/org/apache/commons/configuration3/beanutils/ConfigurationDynaBean.java index 5522ccca16..277374f8d8 100644 --- a/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.java +++ b/src/main/java/org/apache/commons/configuration3/beanutils/ConfigurationDynaBean.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2.beanutils; +package org.apache.commons.configuration3.beanutils; import java.lang.reflect.Array; import java.util.Collection; @@ -24,22 +24,22 @@ import org.apache.commons.beanutils.DynaBean; import org.apache.commons.beanutils.DynaClass; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ConfigurationMap; -import org.apache.commons.configuration2.SubsetConfiguration; +import org.apache.commons.configuration3.Configuration; +import org.apache.commons.configuration3.ConfigurationMap; +import org.apache.commons.configuration3.SubsetConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** * The {@code ConfigurationDynaBean} dynamically reads and writes configurations properties from a wrapped - * configuration-collection {@link org.apache.commons.configuration2.Configuration} instance. It also implements a + * configuration-collection {@link org.apache.commons.configuration3.Configuration} instance. It also implements a * {@link java.util.Map} interface so that it can be used in JSP 2.0 Expression Language expressions. * *

    * The {@code ConfigurationDynaBean} maps nested and mapped properties to the appropriate {@code Configuration} subset - * using the {@link org.apache.commons.configuration2.Configuration#subset} method. Similarly, indexed properties + * using the {@link org.apache.commons.configuration3.Configuration#subset} method. Similarly, indexed properties * reference lists of configuration properties using the - * {@link org.apache.commons.configuration2.Configuration#getList(String)} method. Setting an indexed property is + * {@link org.apache.commons.configuration3.Configuration#getList(String)} method. Setting an indexed property is * supported, too. *

    * diff --git a/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java b/src/main/java/org/apache/commons/configuration3/beanutils/ConfigurationDynaClass.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java rename to src/main/java/org/apache/commons/configuration3/beanutils/ConfigurationDynaClass.java index aeae16c08a..d74ee86004 100644 --- a/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java +++ b/src/main/java/org/apache/commons/configuration3/beanutils/ConfigurationDynaClass.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2.beanutils; +package org.apache.commons.configuration3.beanutils; import java.util.ArrayList; import java.util.Iterator; @@ -24,13 +24,13 @@ import org.apache.commons.beanutils.DynaBean; import org.apache.commons.beanutils.DynaClass; import org.apache.commons.beanutils.DynaProperty; -import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration3.Configuration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** * The {@code ConfigurationDynaClass} dynamically determines properties for a {@code ConfigurationDynaBean} from a - * wrapped configuration-collection {@link org.apache.commons.configuration2.Configuration} instance. + * wrapped configuration-collection {@link org.apache.commons.configuration3.Configuration} instance. * * @since 1.0-rc1 */ diff --git a/src/main/java/org/apache/commons/configuration2/beanutils/ConstructorArg.java b/src/main/java/org/apache/commons/configuration3/beanutils/ConstructorArg.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/beanutils/ConstructorArg.java rename to src/main/java/org/apache/commons/configuration3/beanutils/ConstructorArg.java index 09f62a1d66..e5b094af7b 100644 --- a/src/main/java/org/apache/commons/configuration2/beanutils/ConstructorArg.java +++ b/src/main/java/org/apache/commons/configuration3/beanutils/ConstructorArg.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.beanutils; +package org.apache.commons.configuration3.beanutils; import java.util.Objects; diff --git a/src/main/java/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.java b/src/main/java/org/apache/commons/configuration3/beanutils/DefaultBeanFactory.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.java rename to src/main/java/org/apache/commons/configuration3/beanutils/DefaultBeanFactory.java index c0a64f3e03..94680709af 100644 --- a/src/main/java/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.java +++ b/src/main/java/org/apache/commons/configuration3/beanutils/DefaultBeanFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.beanutils; +package org.apache.commons.configuration3.beanutils; import java.lang.reflect.Constructor; import java.util.Collection; @@ -22,9 +22,9 @@ import java.util.LinkedList; import java.util.List; -import org.apache.commons.configuration2.convert.ConversionHandler; -import org.apache.commons.configuration2.convert.DefaultConversionHandler; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.convert.ConversionHandler; +import org.apache.commons.configuration3.convert.DefaultConversionHandler; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java b/src/main/java/org/apache/commons/configuration3/beanutils/XMLBeanDeclaration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java rename to src/main/java/org/apache/commons/configuration3/beanutils/XMLBeanDeclaration.java index 2f8a93d70b..fdfc7d0f8d 100644 --- a/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java +++ b/src/main/java/org/apache/commons/configuration3/beanutils/XMLBeanDeclaration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.beanutils; +package org.apache.commons.configuration3.beanutils; import java.util.ArrayList; import java.util.Collection; @@ -26,11 +26,11 @@ import java.util.function.Function; import java.util.stream.Collectors; -import org.apache.commons.configuration2.BaseHierarchicalConfiguration; -import org.apache.commons.configuration2.HierarchicalConfiguration; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration2.tree.NodeHandler; +import org.apache.commons.configuration3.BaseHierarchicalConfiguration; +import org.apache.commons.configuration3.HierarchicalConfiguration; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration3.tree.NodeHandler; import org.apache.commons.lang3.StringUtils; /** diff --git a/src/main/java/org/apache/commons/configuration2/beanutils/package-info.java b/src/main/java/org/apache/commons/configuration3/beanutils/package-info.java similarity index 95% rename from src/main/java/org/apache/commons/configuration2/beanutils/package-info.java rename to src/main/java/org/apache/commons/configuration3/beanutils/package-info.java index d4a5656b08..78aa046463 100644 --- a/src/main/java/org/apache/commons/configuration2/beanutils/package-info.java +++ b/src/main/java/org/apache/commons/configuration3/beanutils/package-info.java @@ -22,4 +22,4 @@ * classes for declaring beans in configuration files, from which then instances can be created. *

    */ -package org.apache.commons.configuration2.beanutils; +package org.apache.commons.configuration3.beanutils; diff --git a/src/main/java/org/apache/commons/configuration2/builder/AutoSaveListener.java b/src/main/java/org/apache/commons/configuration3/builder/AutoSaveListener.java similarity index 92% rename from src/main/java/org/apache/commons/configuration2/builder/AutoSaveListener.java rename to src/main/java/org/apache/commons/configuration3/builder/AutoSaveListener.java index dfaae168a2..85b712abca 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/AutoSaveListener.java +++ b/src/main/java/org/apache/commons/configuration3/builder/AutoSaveListener.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; -import org.apache.commons.configuration2.event.ConfigurationEvent; -import org.apache.commons.configuration2.event.EventListener; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.io.FileHandler; -import org.apache.commons.configuration2.io.FileHandlerListenerAdapter; +import org.apache.commons.configuration3.event.ConfigurationEvent; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration3.io.FileHandlerListenerAdapter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java b/src/main/java/org/apache/commons/configuration3/builder/BasicBuilderParameters.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java rename to src/main/java/org/apache/commons/configuration3/builder/BasicBuilderParameters.java index 98d59d4866..c5df435f6a 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java +++ b/src/main/java/org/apache/commons/configuration3/builder/BasicBuilderParameters.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.apache.commons.configuration2.ConfigurationDecoder; -import org.apache.commons.configuration2.beanutils.BeanHelper; -import org.apache.commons.configuration2.convert.ConversionHandler; -import org.apache.commons.configuration2.convert.ListDelimiterHandler; -import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration2.interpol.InterpolatorSpecification; -import org.apache.commons.configuration2.interpol.Lookup; -import org.apache.commons.configuration2.io.ConfigurationLogger; -import org.apache.commons.configuration2.sync.Synchronizer; +import org.apache.commons.configuration3.ConfigurationDecoder; +import org.apache.commons.configuration3.beanutils.BeanHelper; +import org.apache.commons.configuration3.convert.ConversionHandler; +import org.apache.commons.configuration3.convert.ListDelimiterHandler; +import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration3.interpol.InterpolatorSpecification; +import org.apache.commons.configuration3.interpol.Lookup; +import org.apache.commons.configuration3.io.ConfigurationLogger; +import org.apache.commons.configuration3.sync.Synchronizer; /** *

    @@ -139,7 +139,7 @@ public BasicBuilderParameters setThrowExceptionOnMissing(final boolean b) { /** * Sets the value of the listDelimiterHandler property. This property defines the object responsible for * dealing with list delimiter and escaping characters. Note: - * {@link org.apache.commons.configuration2.AbstractConfiguration AbstractConfiguration} does not allow setting this + * {@link org.apache.commons.configuration3.AbstractConfiguration AbstractConfiguration} does not allow setting this * property to null. If the default {@code ListDelimiterHandler} is to be used, do not call this method. * * @param handler the {@code ListDelimiterHandler} diff --git a/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java b/src/main/java/org/apache/commons/configuration3/builder/BasicBuilderProperties.java similarity index 93% rename from src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java rename to src/main/java/org/apache/commons/configuration3/builder/BasicBuilderProperties.java index ac19e4e773..972693a45f 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java +++ b/src/main/java/org/apache/commons/configuration3/builder/BasicBuilderProperties.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import java.util.Collection; import java.util.Map; -import org.apache.commons.configuration2.ConfigurationDecoder; -import org.apache.commons.configuration2.beanutils.BeanHelper; -import org.apache.commons.configuration2.convert.ConversionHandler; -import org.apache.commons.configuration2.convert.ListDelimiterHandler; -import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration2.interpol.Lookup; -import org.apache.commons.configuration2.io.ConfigurationLogger; -import org.apache.commons.configuration2.sync.Synchronizer; +import org.apache.commons.configuration3.ConfigurationDecoder; +import org.apache.commons.configuration3.beanutils.BeanHelper; +import org.apache.commons.configuration3.convert.ConversionHandler; +import org.apache.commons.configuration3.convert.ListDelimiterHandler; +import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration3.interpol.Lookup; +import org.apache.commons.configuration3.io.ConfigurationLogger; +import org.apache.commons.configuration3.sync.Synchronizer; /** *

    @@ -105,7 +105,7 @@ public interface BasicBuilderProperties { /** * Sets the value of the listDelimiterHandler property. This property defines the object responsible for * dealing with list delimiter and escaping characters. Note: - * {@link org.apache.commons.configuration2.AbstractConfiguration AbstractConfiguration} does not allow setting this + * {@link org.apache.commons.configuration3.AbstractConfiguration AbstractConfiguration} does not allow setting this * property to null. If the default {@code ListDelimiterHandler} is to be used, do not call this method. * * @param handler the {@code ListDelimiterHandler} diff --git a/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java b/src/main/java/org/apache/commons/configuration3/builder/BasicConfigurationBuilder.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java rename to src/main/java/org/apache/commons/configuration3/builder/BasicConfigurationBuilder.java index 5fd501b5ad..34432e803d 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java +++ b/src/main/java/org/apache/commons/configuration3/builder/BasicConfigurationBuilder.java @@ -14,28 +14,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.apache.commons.configuration2.ConfigurationUtils; -import org.apache.commons.configuration2.ImmutableConfiguration; -import org.apache.commons.configuration2.Initializable; -import org.apache.commons.configuration2.beanutils.BeanDeclaration; -import org.apache.commons.configuration2.beanutils.BeanHelper; -import org.apache.commons.configuration2.beanutils.ConstructorArg; -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.EventListenerRegistrationData; -import org.apache.commons.configuration2.event.EventSource; -import org.apache.commons.configuration2.event.EventType; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration2.reloading.ReloadingController; +import org.apache.commons.configuration3.ConfigurationUtils; +import org.apache.commons.configuration3.ImmutableConfiguration; +import org.apache.commons.configuration3.Initializable; +import org.apache.commons.configuration3.beanutils.BeanDeclaration; +import org.apache.commons.configuration3.beanutils.BeanHelper; +import org.apache.commons.configuration3.beanutils.ConstructorArg; +import org.apache.commons.configuration3.event.Event; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.event.EventListenerList; +import org.apache.commons.configuration3.event.EventListenerRegistrationData; +import org.apache.commons.configuration3.event.EventSource; +import org.apache.commons.configuration3.event.EventType; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.reloading.ReloadingController; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory.java b/src/main/java/org/apache/commons/configuration3/builder/BuilderConfigurationWrapperFactory.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory.java rename to src/main/java/org/apache/commons/configuration3/builder/BuilderConfigurationWrapperFactory.java index 444673a101..c2198565e3 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory.java +++ b/src/main/java/org/apache/commons/configuration3/builder/BuilderConfigurationWrapperFactory.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import org.apache.commons.configuration2.ConfigurationUtils; -import org.apache.commons.configuration2.ImmutableConfiguration; -import org.apache.commons.configuration2.event.EventSource; -import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration3.ConfigurationUtils; +import org.apache.commons.configuration3.ImmutableConfiguration; +import org.apache.commons.configuration3.event.EventSource; +import org.apache.commons.configuration3.ex.ConfigurationException; /** *

    @@ -78,7 +78,7 @@ public BuilderConfigurationWrapperFactory() { * @param builder the wrapped {@code ConfigurationBuilder} (must not be null) * @return the wrapper configuration * @throws IllegalArgumentException if a required parameter is missing - * @throws org.apache.commons.configuration2.ex.ConfigurationRuntimeException if an error occurs when creating the + * @throws org.apache.commons.configuration3.ex.ConfigurationRuntimeException if an error occurs when creating the * result {@code ImmutableConfiguration} */ public T createBuilderConfigurationWrapper(final Class ifcClass, final ConfigurationBuilder builder) { @@ -107,7 +107,7 @@ public EventSourceSupport getEventSourceSupport() { * @param evSrcSupport the level of {@code EventSource} support * @return the wrapper configuration * @throws IllegalArgumentException if a required parameter is missing - * @throws org.apache.commons.configuration2.ex.ConfigurationRuntimeException if an error occurs when creating the + * @throws org.apache.commons.configuration3.ex.ConfigurationRuntimeException if an error occurs when creating the * result {@code ImmutableConfiguration} */ public static T createBuilderConfigurationWrapper(final Class ifcClass, diff --git a/src/main/java/org/apache/commons/configuration2/builder/BuilderParameters.java b/src/main/java/org/apache/commons/configuration3/builder/BuilderParameters.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/builder/BuilderParameters.java rename to src/main/java/org/apache/commons/configuration3/builder/BuilderParameters.java index c2cdc4ec9d..94f0312b9a 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/BuilderParameters.java +++ b/src/main/java/org/apache/commons/configuration3/builder/BuilderParameters.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import java.util.Map; diff --git a/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilder.java b/src/main/java/org/apache/commons/configuration3/builder/ConfigurationBuilder.java similarity index 87% rename from src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilder.java rename to src/main/java/org/apache/commons/configuration3/builder/ConfigurationBuilder.java index e00bc89e95..2c0bebf5d1 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilder.java +++ b/src/main/java/org/apache/commons/configuration3/builder/ConfigurationBuilder.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; -import org.apache.commons.configuration2.ImmutableConfiguration; -import org.apache.commons.configuration2.event.EventSource; -import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration3.ImmutableConfiguration; +import org.apache.commons.configuration3.event.EventSource; +import org.apache.commons.configuration3.ex.ConfigurationException; /** *

    * Definition of an interface for objects that can create {@link ImmutableConfiguration} or - * {@link org.apache.commons.configuration2.Configuration Configuration} objects of a specific type. + * {@link org.apache.commons.configuration3.Configuration Configuration} objects of a specific type. *

    *

    * This interface defines an abstract way of creating a {@code ImmutableConfiguration} object. It does not assume any diff --git a/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderEvent.java b/src/main/java/org/apache/commons/configuration3/builder/ConfigurationBuilderEvent.java similarity index 95% rename from src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderEvent.java rename to src/main/java/org/apache/commons/configuration3/builder/ConfigurationBuilderEvent.java index c5dc3eaabe..1de040de68 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderEvent.java +++ b/src/main/java/org/apache/commons/configuration3/builder/ConfigurationBuilderEvent.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; -import org.apache.commons.configuration2.event.Event; -import org.apache.commons.configuration2.event.EventType; +import org.apache.commons.configuration3.event.Event; +import org.apache.commons.configuration3.event.EventType; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderResultCreatedEvent.java b/src/main/java/org/apache/commons/configuration3/builder/ConfigurationBuilderResultCreatedEvent.java similarity index 92% rename from src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderResultCreatedEvent.java rename to src/main/java/org/apache/commons/configuration3/builder/ConfigurationBuilderResultCreatedEvent.java index 5b4e0f0d89..312c8b32de 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderResultCreatedEvent.java +++ b/src/main/java/org/apache/commons/configuration3/builder/ConfigurationBuilderResultCreatedEvent.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; -import org.apache.commons.configuration2.ImmutableConfiguration; -import org.apache.commons.configuration2.event.EventType; +import org.apache.commons.configuration3.ImmutableConfiguration; +import org.apache.commons.configuration3.event.EventType; /** *

    @@ -45,9 +45,9 @@ public class ConfigurationBuilderResultCreatedEvent extends ConfigurationBuilder public static final EventType RESULT_CREATED = new EventType<>(ANY, "RESULT_CREATED"); // SpotBugs - // [ERROR] Medium: Class org.apache.commons.configuration2.builder.ConfigurationBuilderResultCreatedEvent defines + // [ERROR] Medium: Class org.apache.commons.configuration3.builder.ConfigurationBuilderResultCreatedEvent defines // non-transient non-serializable instance field configuration - // [org.apache.commons.configuration2.builder.ConfigurationBuilderResultCreatedEvent] In + // [org.apache.commons.configuration3.builder.ConfigurationBuilderResultCreatedEvent] In // ConfigurationBuilderResultCreatedEvent.java SE_BAD_FIELD // // private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/apache/commons/configuration2/builder/CopyObjectDefaultHandler.java b/src/main/java/org/apache/commons/configuration3/builder/CopyObjectDefaultHandler.java similarity index 95% rename from src/main/java/org/apache/commons/configuration2/builder/CopyObjectDefaultHandler.java rename to src/main/java/org/apache/commons/configuration3/builder/CopyObjectDefaultHandler.java index 78ff60d1da..f66403d852 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/CopyObjectDefaultHandler.java +++ b/src/main/java/org/apache/commons/configuration3/builder/CopyObjectDefaultHandler.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; -import org.apache.commons.configuration2.beanutils.BeanHelper; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.beanutils.BeanHelper; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/builder/DatabaseBuilderParametersImpl.java b/src/main/java/org/apache/commons/configuration3/builder/DatabaseBuilderParametersImpl.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/builder/DatabaseBuilderParametersImpl.java rename to src/main/java/org/apache/commons/configuration3/builder/DatabaseBuilderParametersImpl.java index eecc2c26b2..09e6f004e5 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/DatabaseBuilderParametersImpl.java +++ b/src/main/java/org/apache/commons/configuration3/builder/DatabaseBuilderParametersImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import javax.sql.DataSource; diff --git a/src/main/java/org/apache/commons/configuration2/builder/DatabaseBuilderProperties.java b/src/main/java/org/apache/commons/configuration3/builder/DatabaseBuilderProperties.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/builder/DatabaseBuilderProperties.java rename to src/main/java/org/apache/commons/configuration3/builder/DatabaseBuilderProperties.java index e931869897..2aca4fe4d3 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/DatabaseBuilderProperties.java +++ b/src/main/java/org/apache/commons/configuration3/builder/DatabaseBuilderProperties.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import javax.sql.DataSource; diff --git a/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersHandler.java b/src/main/java/org/apache/commons/configuration3/builder/DefaultParametersHandler.java similarity index 95% rename from src/main/java/org/apache/commons/configuration2/builder/DefaultParametersHandler.java rename to src/main/java/org/apache/commons/configuration3/builder/DefaultParametersHandler.java index a58adbf2b7..3b76ea4b41 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersHandler.java +++ b/src/main/java/org/apache/commons/configuration3/builder/DefaultParametersHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; /** *

    @@ -22,7 +22,7 @@ *

    *

    * An object implementing this interface knows how to initialize a parameters object of a specific class with default - * values. Such objects can be registered at the {@link org.apache.commons.configuration2.builder.fluent.Parameters + * values. Such objects can be registered at the {@link org.apache.commons.configuration3.builder.fluent.Parameters * Parameters} class. Whenever a specific parameters object is created all registered {@code DefaultParametersHandler} * objects that can handle this parameters type are invoked, so that they get the chance to perform arbitrary * initialization. diff --git a/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersManager.java b/src/main/java/org/apache/commons/configuration3/builder/DefaultParametersManager.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/builder/DefaultParametersManager.java rename to src/main/java/org/apache/commons/configuration3/builder/DefaultParametersManager.java index 1f09202fee..16c9358616 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersManager.java +++ b/src/main/java/org/apache/commons/configuration3/builder/DefaultParametersManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import java.util.Collection; import java.util.concurrent.CopyOnWriteArrayList; @@ -74,15 +74,15 @@ public void registerDefaultsHandler(final Class paramsClass, final Defaul * classes do not stand in a real inheritance hierarchy; however, there is a logic hierarchy defined by the methods * supported by the different parameter objects. A properties parameter object for instance supports all methods defined * for a file-based parameter object. So one can argue that - * {@link org.apache.commons.configuration2.builder.fluent.FileBasedBuilderParameters FileBasedBuilderParameters} is a - * base interface of {@link org.apache.commons.configuration2.builder.fluent.PropertiesBuilderParameters + * {@link org.apache.commons.configuration3.builder.fluent.FileBasedBuilderParameters FileBasedBuilderParameters} is a + * base interface of {@link org.apache.commons.configuration3.builder.fluent.PropertiesBuilderParameters * PropertiesBuilderParameters} (although, for technical reasons, this relation is not reflected in the Java classes). A * {@link DefaultParametersHandler} object defined for a base interface can also deal with parameter objects "derived" * from this base interface (i.e. supporting a super set of the methods defined by the base interface). Now there may be * the use case that there is an implementation of {@code DefaultParametersHandler} for a base interface (e.g. * {@code FileBasedBuilderParameters}), but it should only process specific derived interfaces (say * {@code PropertiesBuilderParameters}, but not - * {@link org.apache.commons.configuration2.builder.fluent.XMLBuilderParameters XMLBuilderParameters}). This can be + * {@link org.apache.commons.configuration3.builder.fluent.XMLBuilderParameters XMLBuilderParameters}). This can be * achieved by passing in {@code PropertiesBuilderParameters} as start class. In this case, * {@code DefaultParametersManager} ensures that the handler is only called on parameter objects having both the start * class and the actual type supported by the handler as base interfaces. The passed in start class can be null; diff --git a/src/main/java/org/apache/commons/configuration2/builder/DefaultReloadingDetectorFactory.java b/src/main/java/org/apache/commons/configuration3/builder/DefaultReloadingDetectorFactory.java similarity index 85% rename from src/main/java/org/apache/commons/configuration2/builder/DefaultReloadingDetectorFactory.java rename to src/main/java/org/apache/commons/configuration3/builder/DefaultReloadingDetectorFactory.java index f0c736ddc3..09612e7d63 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/DefaultReloadingDetectorFactory.java +++ b/src/main/java/org/apache/commons/configuration3/builder/DefaultReloadingDetectorFactory.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; -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.ReloadingDetector; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration3.reloading.FileHandlerReloadingDetector; +import org.apache.commons.configuration3.reloading.ReloadingDetector; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/builder/EventListenerParameters.java b/src/main/java/org/apache/commons/configuration3/builder/EventListenerParameters.java similarity index 91% rename from src/main/java/org/apache/commons/configuration2/builder/EventListenerParameters.java rename to src/main/java/org/apache/commons/configuration3/builder/EventListenerParameters.java index 950cb1233d..6b076ad885 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/EventListenerParameters.java +++ b/src/main/java/org/apache/commons/configuration3/builder/EventListenerParameters.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import java.util.Collections; import java.util.Map; -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.EventListenerRegistrationData; -import org.apache.commons.configuration2.event.EventType; +import org.apache.commons.configuration3.event.Event; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.event.EventListenerList; +import org.apache.commons.configuration3.event.EventListenerRegistrationData; +import org.apache.commons.configuration3.event.EventType; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/builder/EventListenerProvider.java b/src/main/java/org/apache/commons/configuration3/builder/EventListenerProvider.java similarity index 94% rename from src/main/java/org/apache/commons/configuration2/builder/EventListenerProvider.java rename to src/main/java/org/apache/commons/configuration3/builder/EventListenerProvider.java index 8ef50f73ef..f1bb3efc88 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/EventListenerProvider.java +++ b/src/main/java/org/apache/commons/configuration3/builder/EventListenerProvider.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; -import org.apache.commons.configuration2.event.EventListenerList; +import org.apache.commons.configuration3.event.EventListenerList; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl.java b/src/main/java/org/apache/commons/configuration3/builder/FileBasedBuilderParametersImpl.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl.java rename to src/main/java/org/apache/commons/configuration3/builder/FileBasedBuilderParametersImpl.java index c5b872ace4..b9c0071bdb 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl.java +++ b/src/main/java/org/apache/commons/configuration3/builder/FileBasedBuilderParametersImpl.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import java.io.File; import java.net.URL; import java.util.Map; -import org.apache.commons.configuration2.io.FileHandler; -import org.apache.commons.configuration2.io.FileLocationStrategy; -import org.apache.commons.configuration2.io.FileSystem; -import org.apache.commons.configuration2.io.URLConnectionOptions; +import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration3.io.FileLocationStrategy; +import org.apache.commons.configuration3.io.FileSystem; +import org.apache.commons.configuration3.io.URLConnectionOptions; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderProperties.java b/src/main/java/org/apache/commons/configuration3/builder/FileBasedBuilderProperties.java similarity index 94% rename from src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderProperties.java rename to src/main/java/org/apache/commons/configuration3/builder/FileBasedBuilderProperties.java index 9035660198..bec93cef28 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderProperties.java +++ b/src/main/java/org/apache/commons/configuration3/builder/FileBasedBuilderProperties.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import java.io.File; import java.net.URL; -import org.apache.commons.configuration2.io.FileLocationStrategy; -import org.apache.commons.configuration2.io.FileSystem; -import org.apache.commons.configuration2.io.URLConnectionOptions; +import org.apache.commons.configuration3.io.FileLocationStrategy; +import org.apache.commons.configuration3.io.FileSystem; +import org.apache.commons.configuration3.io.URLConnectionOptions; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.java b/src/main/java/org/apache/commons/configuration3/builder/FileBasedConfigurationBuilder.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.java rename to src/main/java/org/apache/commons/configuration3/builder/FileBasedConfigurationBuilder.java index fe6e471e12..c57009ff83 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.java +++ b/src/main/java/org/apache/commons/configuration3/builder/FileBasedConfigurationBuilder.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -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.configuration3.FileBasedConfiguration; +import org.apache.commons.configuration3.PropertiesConfiguration; +import org.apache.commons.configuration3.XMLPropertiesConfiguration; +import org.apache.commons.configuration3.event.ConfigurationEvent; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.FileHandler; import org.apache.commons.lang3.ClassUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/org/apache/commons/configuration2/builder/HierarchicalBuilderParametersImpl.java b/src/main/java/org/apache/commons/configuration3/builder/HierarchicalBuilderParametersImpl.java similarity index 94% rename from src/main/java/org/apache/commons/configuration2/builder/HierarchicalBuilderParametersImpl.java rename to src/main/java/org/apache/commons/configuration3/builder/HierarchicalBuilderParametersImpl.java index 8fcfdad5d8..6f56f498f4 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/HierarchicalBuilderParametersImpl.java +++ b/src/main/java/org/apache/commons/configuration3/builder/HierarchicalBuilderParametersImpl.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import java.util.Map; -import org.apache.commons.configuration2.tree.ExpressionEngine; +import org.apache.commons.configuration3.tree.ExpressionEngine; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/builder/HierarchicalBuilderProperties.java b/src/main/java/org/apache/commons/configuration3/builder/HierarchicalBuilderProperties.java similarity index 93% rename from src/main/java/org/apache/commons/configuration2/builder/HierarchicalBuilderProperties.java rename to src/main/java/org/apache/commons/configuration3/builder/HierarchicalBuilderProperties.java index 8990b0f457..a4666cb275 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/HierarchicalBuilderProperties.java +++ b/src/main/java/org/apache/commons/configuration3/builder/HierarchicalBuilderProperties.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; -import org.apache.commons.configuration2.tree.ExpressionEngine; +import org.apache.commons.configuration3.tree.ExpressionEngine; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/builder/INIBuilderParametersImpl.java b/src/main/java/org/apache/commons/configuration3/builder/INIBuilderParametersImpl.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/builder/INIBuilderParametersImpl.java rename to src/main/java/org/apache/commons/configuration3/builder/INIBuilderParametersImpl.java index e1e8cfd044..5bcfc86fc5 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/INIBuilderParametersImpl.java +++ b/src/main/java/org/apache/commons/configuration3/builder/INIBuilderParametersImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import java.util.Map; diff --git a/src/main/java/org/apache/commons/configuration2/builder/INIBuilderProperties.java b/src/main/java/org/apache/commons/configuration3/builder/INIBuilderProperties.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/builder/INIBuilderProperties.java rename to src/main/java/org/apache/commons/configuration3/builder/INIBuilderProperties.java index 1fd9aa2541..edff7777b7 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/INIBuilderProperties.java +++ b/src/main/java/org/apache/commons/configuration3/builder/INIBuilderProperties.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/builder/JndiBuilderParametersImpl.java b/src/main/java/org/apache/commons/configuration3/builder/JndiBuilderParametersImpl.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/builder/JndiBuilderParametersImpl.java rename to src/main/java/org/apache/commons/configuration3/builder/JndiBuilderParametersImpl.java index c7782c5560..2c2ee24fb7 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/JndiBuilderParametersImpl.java +++ b/src/main/java/org/apache/commons/configuration3/builder/JndiBuilderParametersImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import javax.naming.Context; diff --git a/src/main/java/org/apache/commons/configuration2/builder/JndiBuilderProperties.java b/src/main/java/org/apache/commons/configuration3/builder/JndiBuilderProperties.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/builder/JndiBuilderProperties.java rename to src/main/java/org/apache/commons/configuration3/builder/JndiBuilderProperties.java index 654dfc1d01..50d78cfefa 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/JndiBuilderProperties.java +++ b/src/main/java/org/apache/commons/configuration3/builder/JndiBuilderProperties.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import javax.naming.Context; diff --git a/src/main/java/org/apache/commons/configuration2/builder/PropertiesBuilderParametersImpl.java b/src/main/java/org/apache/commons/configuration3/builder/PropertiesBuilderParametersImpl.java similarity index 91% rename from src/main/java/org/apache/commons/configuration2/builder/PropertiesBuilderParametersImpl.java rename to src/main/java/org/apache/commons/configuration3/builder/PropertiesBuilderParametersImpl.java index d4d2469612..7767a171c8 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/PropertiesBuilderParametersImpl.java +++ b/src/main/java/org/apache/commons/configuration3/builder/PropertiesBuilderParametersImpl.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import java.util.Map; -import org.apache.commons.configuration2.ConfigurationConsumer; -import org.apache.commons.configuration2.PropertiesConfiguration.IOFactory; -import org.apache.commons.configuration2.PropertiesConfigurationLayout; -import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration3.ConfigurationConsumer; +import org.apache.commons.configuration3.PropertiesConfiguration.IOFactory; +import org.apache.commons.configuration3.PropertiesConfigurationLayout; +import org.apache.commons.configuration3.ex.ConfigurationException; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/builder/PropertiesBuilderProperties.java b/src/main/java/org/apache/commons/configuration3/builder/PropertiesBuilderProperties.java similarity index 91% rename from src/main/java/org/apache/commons/configuration2/builder/PropertiesBuilderProperties.java rename to src/main/java/org/apache/commons/configuration3/builder/PropertiesBuilderProperties.java index b79ab4d39a..7f9bff5347 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/PropertiesBuilderProperties.java +++ b/src/main/java/org/apache/commons/configuration3/builder/PropertiesBuilderProperties.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; -import org.apache.commons.configuration2.ConfigurationConsumer; -import org.apache.commons.configuration2.PropertiesConfiguration.IOFactory; -import org.apache.commons.configuration2.PropertiesConfigurationLayout; -import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration3.ConfigurationConsumer; +import org.apache.commons.configuration3.PropertiesConfiguration.IOFactory; +import org.apache.commons.configuration3.PropertiesConfigurationLayout; +import org.apache.commons.configuration3.ex.ConfigurationException; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/builder/ReloadingBuilderSupportListener.java b/src/main/java/org/apache/commons/configuration3/builder/ReloadingBuilderSupportListener.java similarity index 92% rename from src/main/java/org/apache/commons/configuration2/builder/ReloadingBuilderSupportListener.java rename to src/main/java/org/apache/commons/configuration3/builder/ReloadingBuilderSupportListener.java index 925a5cd25f..2fa4c93ad0 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/ReloadingBuilderSupportListener.java +++ b/src/main/java/org/apache/commons/configuration3/builder/ReloadingBuilderSupportListener.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; -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; +import org.apache.commons.configuration3.event.Event; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.reloading.ReloadingController; +import org.apache.commons.configuration3.reloading.ReloadingEvent; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/builder/ReloadingDetectorFactory.java b/src/main/java/org/apache/commons/configuration3/builder/ReloadingDetectorFactory.java similarity index 89% rename from src/main/java/org/apache/commons/configuration2/builder/ReloadingDetectorFactory.java rename to src/main/java/org/apache/commons/configuration3/builder/ReloadingDetectorFactory.java index c6b066c1cd..ad2bc67d19 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/ReloadingDetectorFactory.java +++ b/src/main/java/org/apache/commons/configuration3/builder/ReloadingDetectorFactory.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.io.FileHandler; -import org.apache.commons.configuration2.reloading.ReloadingDetector; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration3.reloading.ReloadingDetector; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/builder/ReloadingFileBasedConfigurationBuilder.java b/src/main/java/org/apache/commons/configuration3/builder/ReloadingFileBasedConfigurationBuilder.java similarity index 95% rename from src/main/java/org/apache/commons/configuration2/builder/ReloadingFileBasedConfigurationBuilder.java rename to src/main/java/org/apache/commons/configuration3/builder/ReloadingFileBasedConfigurationBuilder.java index e25306a70a..253e9cb4a8 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/ReloadingFileBasedConfigurationBuilder.java +++ b/src/main/java/org/apache/commons/configuration3/builder/ReloadingFileBasedConfigurationBuilder.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import java.util.Map; -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.ReloadingController; -import org.apache.commons.configuration2.reloading.ReloadingControllerSupport; -import org.apache.commons.configuration2.reloading.ReloadingDetector; +import org.apache.commons.configuration3.FileBasedConfiguration; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration3.reloading.ReloadingController; +import org.apache.commons.configuration3.reloading.ReloadingControllerSupport; +import org.apache.commons.configuration3.reloading.ReloadingDetector; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/builder/XMLBuilderParametersImpl.java b/src/main/java/org/apache/commons/configuration3/builder/XMLBuilderParametersImpl.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/builder/XMLBuilderParametersImpl.java rename to src/main/java/org/apache/commons/configuration3/builder/XMLBuilderParametersImpl.java index 1eea12857b..3436a0266b 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/XMLBuilderParametersImpl.java +++ b/src/main/java/org/apache/commons/configuration3/builder/XMLBuilderParametersImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import java.util.Map; diff --git a/src/main/java/org/apache/commons/configuration2/builder/XMLBuilderProperties.java b/src/main/java/org/apache/commons/configuration3/builder/XMLBuilderProperties.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/builder/XMLBuilderProperties.java rename to src/main/java/org/apache/commons/configuration3/builder/XMLBuilderProperties.java index a7bf485098..f61bc8f86c 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/XMLBuilderProperties.java +++ b/src/main/java/org/apache/commons/configuration3/builder/XMLBuilderProperties.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import javax.xml.parsers.DocumentBuilder; diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.java b/src/main/java/org/apache/commons/configuration3/builder/combined/BaseConfigurationBuilderProvider.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.java rename to src/main/java/org/apache/commons/configuration3/builder/combined/BaseConfigurationBuilderProvider.java index 24c8a59399..234bab2111 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.java +++ b/src/main/java/org/apache/commons/configuration3/builder/combined/BaseConfigurationBuilderProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.combined; +package org.apache.commons.configuration3.builder.combined; import java.lang.reflect.Constructor; import java.util.ArrayList; @@ -22,12 +22,12 @@ import java.util.Collections; import java.util.Map; -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; +import org.apache.commons.configuration3.Configuration; +import org.apache.commons.configuration3.ConfigurationUtils; +import org.apache.commons.configuration3.builder.BasicConfigurationBuilder; +import org.apache.commons.configuration3.builder.BuilderParameters; +import org.apache.commons.configuration3.builder.ConfigurationBuilder; +import org.apache.commons.configuration3.ex.ConfigurationException; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.java b/src/main/java/org/apache/commons/configuration3/builder/combined/CombinedBuilderParametersImpl.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.java rename to src/main/java/org/apache/commons/configuration3/builder/combined/CombinedBuilderParametersImpl.java index 9a2d9ea5d9..376b3adcda 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.java +++ b/src/main/java/org/apache/commons/configuration3/builder/combined/CombinedBuilderParametersImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.combined; +package org.apache.commons.configuration3.builder.combined; import java.util.ArrayList; import java.util.Collection; @@ -23,13 +23,13 @@ import java.util.LinkedList; import java.util.Map; -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; +import org.apache.commons.configuration3.ConfigurationUtils; +import org.apache.commons.configuration3.HierarchicalConfiguration; +import org.apache.commons.configuration3.builder.BasicBuilderParameters; +import org.apache.commons.configuration3.builder.BuilderParameters; +import org.apache.commons.configuration3.builder.ConfigurationBuilder; +import org.apache.commons.configuration3.builder.DefaultParametersHandler; +import org.apache.commons.configuration3.builder.DefaultParametersManager; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderProperties.java b/src/main/java/org/apache/commons/configuration3/builder/combined/CombinedBuilderProperties.java similarity index 95% rename from src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderProperties.java rename to src/main/java/org/apache/commons/configuration3/builder/combined/CombinedBuilderProperties.java index a215f676bc..7a29fe585f 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderProperties.java +++ b/src/main/java/org/apache/commons/configuration3/builder/combined/CombinedBuilderProperties.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.combined; +package org.apache.commons.configuration3.builder.combined; -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; +import org.apache.commons.configuration3.HierarchicalConfiguration; +import org.apache.commons.configuration3.builder.BuilderParameters; +import org.apache.commons.configuration3.builder.ConfigurationBuilder; +import org.apache.commons.configuration3.builder.DefaultParametersHandler; +import org.apache.commons.configuration3.builder.DefaultParametersManager; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java b/src/main/java/org/apache/commons/configuration3/builder/combined/CombinedConfigurationBuilder.java similarity index 94% rename from src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java rename to src/main/java/org/apache/commons/configuration3/builder/combined/CombinedConfigurationBuilder.java index 68c47262ee..c3b8c360ee 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java +++ b/src/main/java/org/apache/commons/configuration3/builder/combined/CombinedConfigurationBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.combined; +package org.apache.commons.configuration3.builder.combined; import java.net.URL; import java.util.ArrayList; @@ -28,35 +28,35 @@ import java.util.Set; import java.util.stream.Collectors; -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.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.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.apache.commons.configuration3.CombinedConfiguration; +import org.apache.commons.configuration3.Configuration; +import org.apache.commons.configuration3.ConfigurationLookup; +import org.apache.commons.configuration3.HierarchicalConfiguration; +import org.apache.commons.configuration3.SystemConfiguration; +import org.apache.commons.configuration3.XMLConfiguration; +import org.apache.commons.configuration3.beanutils.BeanDeclaration; +import org.apache.commons.configuration3.beanutils.BeanHelper; +import org.apache.commons.configuration3.beanutils.CombinedBeanDeclaration; +import org.apache.commons.configuration3.beanutils.XMLBeanDeclaration; +import org.apache.commons.configuration3.builder.BasicBuilderParameters; +import org.apache.commons.configuration3.builder.BasicConfigurationBuilder; +import org.apache.commons.configuration3.builder.BuilderParameters; +import org.apache.commons.configuration3.builder.ConfigurationBuilder; +import org.apache.commons.configuration3.builder.ConfigurationBuilderEvent; +import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; +import org.apache.commons.configuration3.builder.FileBasedBuilderProperties; +import org.apache.commons.configuration3.builder.FileBasedConfigurationBuilder; +import org.apache.commons.configuration3.builder.XMLBuilderParametersImpl; +import org.apache.commons.configuration3.builder.XMLBuilderProperties; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration3.interpol.Lookup; +import org.apache.commons.configuration3.io.FileSystem; +import org.apache.commons.configuration3.resolver.CatalogResolver; +import org.apache.commons.configuration3.tree.DefaultExpressionEngineSymbols; +import org.apache.commons.configuration3.tree.OverrideCombiner; +import org.apache.commons.configuration3.tree.UnionCombiner; import org.xml.sax.EntityResolver; /** @@ -69,7 +69,7 @@ * into a single configuration object. The sources to be loaded are defined in an XML document that can contain certain * tags representing the different supported configuration 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.configuration2.beanutils.XMLBeanDeclaration XMLBeanDeclaration} will be used to + * (namely {@link org.apache.commons.configuration3.beanutils.XMLBeanDeclaration XMLBeanDeclaration} will be used to * extract the configuration's initialization parameters, which allows for complex initialization scenarios). *

    *

    @@ -322,47 +322,47 @@ public class CombinedConfigurationBuilder extends BasicConfigurationBuilder @@ -38,19 +38,19 @@ */ public class CombinedConfigurationBuilderProvider extends BaseConfigurationBuilderProvider { /** Constant for the name of the supported builder class. */ - private static final String BUILDER_CLASS = "org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder"; + private static final String BUILDER_CLASS = "org.apache.commons.configuration3.builder.combined.CombinedConfigurationBuilder"; /** Constant for the name of the supported reloading builder class. */ - private static final String RELOADING_BUILDER_CLASS = "org.apache.commons.configuration2.builder.combined.ReloadingCombinedConfigurationBuilder"; + private static final String RELOADING_BUILDER_CLASS = "org.apache.commons.configuration3.builder.combined.ReloadingCombinedConfigurationBuilder"; /** Constant for the name of the supported configuration class. */ - private static final String CONFIGURATION_CLASS = "org.apache.commons.configuration2.CombinedConfiguration"; + private static final String CONFIGURATION_CLASS = "org.apache.commons.configuration3.CombinedConfiguration"; /** Constant for the combined configuration builder parameters class. */ - private static final String COMBINED_PARAMS = "org.apache.commons.configuration2.builder.combined.CombinedBuilderParametersImpl"; + private static final String COMBINED_PARAMS = "org.apache.commons.configuration3.builder.combined.CombinedBuilderParametersImpl"; /** Constant for the name of the file-based builder parameters class. */ - private static final String FILE_PARAMS = "org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl"; + private static final String FILE_PARAMS = "org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl"; /** * Creates a new instance of {@code CombinedConfigurationBuilderProvider}. diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationBuilderProvider.java b/src/main/java/org/apache/commons/configuration3/builder/combined/ConfigurationBuilderProvider.java similarity index 88% rename from src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationBuilderProvider.java rename to src/main/java/org/apache/commons/configuration3/builder/combined/ConfigurationBuilderProvider.java index 23a5adf5d1..603b1ca243 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationBuilderProvider.java +++ b/src/main/java/org/apache/commons/configuration3/builder/combined/ConfigurationBuilderProvider.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.combined; +package org.apache.commons.configuration3.builder.combined; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.builder.ConfigurationBuilder; -import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration3.Configuration; +import org.apache.commons.configuration3.builder.ConfigurationBuilder; +import org.apache.commons.configuration3.ex.ConfigurationException; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.java b/src/main/java/org/apache/commons/configuration3/builder/combined/ConfigurationDeclaration.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.java rename to src/main/java/org/apache/commons/configuration3/builder/combined/ConfigurationDeclaration.java index e0d7cb5d83..af7940cf9c 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.java +++ b/src/main/java/org/apache/commons/configuration3/builder/combined/ConfigurationDeclaration.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.combined; +package org.apache.commons.configuration3.builder.combined; import java.util.Set; -import org.apache.commons.configuration2.HierarchicalConfiguration; -import org.apache.commons.configuration2.beanutils.XMLBeanDeclaration; +import org.apache.commons.configuration3.HierarchicalConfiguration; +import org.apache.commons.configuration3.beanutils.XMLBeanDeclaration; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/FileExtensionConfigurationBuilderProvider.java b/src/main/java/org/apache/commons/configuration3/builder/combined/FileExtensionConfigurationBuilderProvider.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/builder/combined/FileExtensionConfigurationBuilderProvider.java rename to src/main/java/org/apache/commons/configuration3/builder/combined/FileExtensionConfigurationBuilderProvider.java index 8b0d717240..84285ec038 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/combined/FileExtensionConfigurationBuilderProvider.java +++ b/src/main/java/org/apache/commons/configuration3/builder/combined/FileExtensionConfigurationBuilderProvider.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.combined; +package org.apache.commons.configuration3.builder.combined; import java.util.Collection; -import org.apache.commons.configuration2.builder.BuilderParameters; -import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl; -import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration3.builder.BuilderParameters; +import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; +import org.apache.commons.configuration3.ex.ConfigurationException; /** *

    diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl.java b/src/main/java/org/apache/commons/configuration3/builder/combined/MultiFileBuilderParametersImpl.java similarity index 95% rename from src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl.java rename to src/main/java/org/apache/commons/configuration3/builder/combined/MultiFileBuilderParametersImpl.java index 948054a9d4..b7c7273561 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl.java +++ b/src/main/java/org/apache/commons/configuration3/builder/combined/MultiFileBuilderParametersImpl.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.combined; +package org.apache.commons.configuration3.builder.combined; import java.util.Map; -import org.apache.commons.configuration2.ConfigurationUtils; -import org.apache.commons.configuration2.builder.BasicBuilderParameters; -import org.apache.commons.configuration2.builder.BuilderParameters; +import org.apache.commons.configuration3.ConfigurationUtils; +import org.apache.commons.configuration3.builder.BasicBuilderParameters; +import org.apache.commons.configuration3.builder.BuilderParameters; /** *

    @@ -32,7 +32,7 @@ * builder for this purpose. Therefore, parameters inherited from the super class are treated differently: *

    *
      - *
    • The {@link org.apache.commons.configuration2.interpol.ConfigurationInterpolator ConfigurationInterpolator} is + *
    • The {@link org.apache.commons.configuration3.interpol.ConfigurationInterpolator ConfigurationInterpolator} is * needed by a {@code MultiFileConfigurationBuilder} to resolve the file pattern. It is expected to be set and will not * be passed to sub configurations created by the builder.
      • *
    • All other parameters are evaluated when creating sub configurations. However, it is preferred to use the diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileBuilderProperties.java b/src/main/java/org/apache/commons/configuration3/builder/combined/MultiFileBuilderProperties.java similarity index 94% rename from src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileBuilderProperties.java rename to src/main/java/org/apache/commons/configuration3/builder/combined/MultiFileBuilderProperties.java index 786177094b..797f127cba 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileBuilderProperties.java +++ b/src/main/java/org/apache/commons/configuration3/builder/combined/MultiFileBuilderProperties.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.combined; +package org.apache.commons.configuration3.builder.combined; -import org.apache.commons.configuration2.builder.BuilderParameters; +import org.apache.commons.configuration3.builder.BuilderParameters; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.java b/src/main/java/org/apache/commons/configuration3/builder/combined/MultiFileConfigurationBuilder.java similarity index 95% rename from src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.java rename to src/main/java/org/apache/commons/configuration3/builder/combined/MultiFileConfigurationBuilder.java index d61558147f..b5873b27cf 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.java +++ b/src/main/java/org/apache/commons/configuration3/builder/combined/MultiFileConfigurationBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.combined; +package org.apache.commons.configuration3.builder.combined; import java.util.HashMap; import java.util.Map; @@ -22,21 +22,21 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicReference; -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.configuration3.ConfigurationUtils; +import org.apache.commons.configuration3.FileBasedConfiguration; +import org.apache.commons.configuration3.builder.BasicBuilderParameters; +import org.apache.commons.configuration3.builder.BasicConfigurationBuilder; +import org.apache.commons.configuration3.builder.BuilderParameters; +import org.apache.commons.configuration3.builder.ConfigurationBuilderEvent; +import org.apache.commons.configuration3.builder.ConfigurationBuilderResultCreatedEvent; +import org.apache.commons.configuration3.builder.FileBasedConfigurationBuilder; +import org.apache.commons.configuration3.event.Event; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.event.EventListenerList; +import org.apache.commons.configuration3.event.EventType; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration3.interpol.InterpolatorSpecification; import org.apache.commons.lang3.concurrent.ConcurrentUtils; /** diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilderProvider.java b/src/main/java/org/apache/commons/configuration3/builder/combined/MultiFileConfigurationBuilderProvider.java similarity index 89% rename from src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilderProvider.java rename to src/main/java/org/apache/commons/configuration3/builder/combined/MultiFileConfigurationBuilderProvider.java index 8120512c5d..5c5685945e 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilderProvider.java +++ b/src/main/java/org/apache/commons/configuration3/builder/combined/MultiFileConfigurationBuilderProvider.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.combined; +package org.apache.commons.configuration3.builder.combined; import java.util.Arrays; -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; +import org.apache.commons.configuration3.Configuration; +import org.apache.commons.configuration3.ConfigurationUtils; +import org.apache.commons.configuration3.HierarchicalConfiguration; +import org.apache.commons.configuration3.builder.BuilderConfigurationWrapperFactory; +import org.apache.commons.configuration3.builder.BuilderConfigurationWrapperFactory.EventSourceSupport; +import org.apache.commons.configuration3.builder.ConfigurationBuilder; +import org.apache.commons.configuration3.event.Event; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.event.EventType; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.reloading.ReloadingController; +import org.apache.commons.configuration3.reloading.ReloadingControllerSupport; /** *

      @@ -50,13 +50,13 @@ */ public class MultiFileConfigurationBuilderProvider extends BaseConfigurationBuilderProvider { /** Constant for the name of the builder class. */ - private static final String BUILDER_CLASS = "org.apache.commons.configuration2.builder.combined.MultiFileConfigurationBuilder"; + private static final String BUILDER_CLASS = "org.apache.commons.configuration3.builder.combined.MultiFileConfigurationBuilder"; /** Constant for the name of the reloading builder class. */ - private static final String RELOADING_BUILDER_CLASS = "org.apache.commons.configuration2.builder.combined.ReloadingMultiFileConfigurationBuilder"; + private static final String RELOADING_BUILDER_CLASS = "org.apache.commons.configuration3.builder.combined.ReloadingMultiFileConfigurationBuilder"; /** Constant for the name of the parameters class. */ - private static final String PARAM_CLASS = "org.apache.commons.configuration2.builder.combined.MultiFileBuilderParametersImpl"; + private static final String PARAM_CLASS = "org.apache.commons.configuration3.builder.combined.MultiFileBuilderParametersImpl"; /** * Creates a new instance of {@code MultiFileConfigurationBuilderProvider} and sets the name of the configuration class diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaBean.java b/src/main/java/org/apache/commons/configuration3/builder/combined/MultiWrapDynaBean.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaBean.java rename to src/main/java/org/apache/commons/configuration3/builder/combined/MultiWrapDynaBean.java index 7e0b2dc064..b3cbe67bdb 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaBean.java +++ b/src/main/java/org/apache/commons/configuration3/builder/combined/MultiWrapDynaBean.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.combined; +package org.apache.commons.configuration3.builder.combined; import java.util.ArrayList; import java.util.Collection; @@ -24,7 +24,7 @@ import org.apache.commons.beanutils.DynaBean; import org.apache.commons.beanutils.DynaClass; import org.apache.commons.beanutils.DynaProperty; -import org.apache.commons.configuration2.beanutils.BeanHelper; +import org.apache.commons.configuration3.beanutils.BeanHelper; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java b/src/main/java/org/apache/commons/configuration3/builder/combined/MultiWrapDynaClass.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java rename to src/main/java/org/apache/commons/configuration3/builder/combined/MultiWrapDynaClass.java index c662bc0944..b1724e65f7 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java +++ b/src/main/java/org/apache/commons/configuration3/builder/combined/MultiWrapDynaClass.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.combined; +package org.apache.commons.configuration3.builder.combined; import java.util.Collection; import java.util.HashMap; diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingCombinedConfigurationBuilder.java b/src/main/java/org/apache/commons/configuration3/builder/combined/ReloadingCombinedConfigurationBuilder.java similarity index 91% rename from src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingCombinedConfigurationBuilder.java rename to src/main/java/org/apache/commons/configuration3/builder/combined/ReloadingCombinedConfigurationBuilder.java index 29d9f3e55b..046b548c09 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingCombinedConfigurationBuilder.java +++ b/src/main/java/org/apache/commons/configuration3/builder/combined/ReloadingCombinedConfigurationBuilder.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.combined; +package org.apache.commons.configuration3.builder.combined; import java.util.Collection; import java.util.LinkedList; import java.util.Map; -import org.apache.commons.configuration2.CombinedConfiguration; -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; +import org.apache.commons.configuration3.CombinedConfiguration; +import org.apache.commons.configuration3.HierarchicalConfiguration; +import org.apache.commons.configuration3.XMLConfiguration; +import org.apache.commons.configuration3.builder.BuilderParameters; +import org.apache.commons.configuration3.builder.ConfigurationBuilder; +import org.apache.commons.configuration3.builder.ReloadingFileBasedConfigurationBuilder; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.reloading.CombinedReloadingController; +import org.apache.commons.configuration3.reloading.ReloadingController; +import org.apache.commons.configuration3.reloading.ReloadingControllerSupport; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.java b/src/main/java/org/apache/commons/configuration3/builder/combined/ReloadingMultiFileConfigurationBuilder.java similarity index 91% rename from src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.java rename to src/main/java/org/apache/commons/configuration3/builder/combined/ReloadingMultiFileConfigurationBuilder.java index 89d692755c..193747b226 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.java +++ b/src/main/java/org/apache/commons/configuration3/builder/combined/ReloadingMultiFileConfigurationBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.combined; +package org.apache.commons.configuration3.builder.combined; import java.util.Collection; import java.util.Collections; @@ -22,13 +22,13 @@ import java.util.Set; import java.util.stream.Collectors; -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; +import org.apache.commons.configuration3.FileBasedConfiguration; +import org.apache.commons.configuration3.builder.FileBasedConfigurationBuilder; +import org.apache.commons.configuration3.builder.ReloadingFileBasedConfigurationBuilder; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.reloading.CombinedReloadingController; +import org.apache.commons.configuration3.reloading.ReloadingController; +import org.apache.commons.configuration3.reloading.ReloadingControllerSupport; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/package-info.java b/src/main/java/org/apache/commons/configuration3/builder/combined/package-info.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/builder/combined/package-info.java rename to src/main/java/org/apache/commons/configuration3/builder/combined/package-info.java index 7ddf3120ba..a6ae44e600 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/combined/package-info.java +++ b/src/main/java/org/apache/commons/configuration3/builder/combined/package-info.java @@ -31,4 +31,4 @@ * production, etc. *

      */ -package org.apache.commons.configuration2.builder.combined; +package org.apache.commons.configuration3.builder.combined; diff --git a/src/main/java/org/apache/commons/configuration2/builder/fluent/CombinedBuilderParameters.java b/src/main/java/org/apache/commons/configuration3/builder/fluent/CombinedBuilderParameters.java similarity index 84% rename from src/main/java/org/apache/commons/configuration2/builder/fluent/CombinedBuilderParameters.java rename to src/main/java/org/apache/commons/configuration3/builder/fluent/CombinedBuilderParameters.java index 454fc62832..e8788e81b2 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/fluent/CombinedBuilderParameters.java +++ b/src/main/java/org/apache/commons/configuration3/builder/fluent/CombinedBuilderParameters.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.fluent; +package org.apache.commons.configuration3.builder.fluent; -import org.apache.commons.configuration2.builder.BasicBuilderProperties; -import org.apache.commons.configuration2.builder.BuilderParameters; -import org.apache.commons.configuration2.builder.combined.CombinedBuilderProperties; +import org.apache.commons.configuration3.builder.BasicBuilderProperties; +import org.apache.commons.configuration3.builder.BuilderParameters; +import org.apache.commons.configuration3.builder.combined.CombinedBuilderProperties; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/builder/fluent/Configurations.java b/src/main/java/org/apache/commons/configuration3/builder/fluent/Configurations.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/builder/fluent/Configurations.java rename to src/main/java/org/apache/commons/configuration3/builder/fluent/Configurations.java index 61e6fff92d..20cb8a0bbd 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/fluent/Configurations.java +++ b/src/main/java/org/apache/commons/configuration3/builder/fluent/Configurations.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.fluent; +package org.apache.commons.configuration3.builder.fluent; import java.io.File; import java.net.URL; -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; +import org.apache.commons.configuration3.CombinedConfiguration; +import org.apache.commons.configuration3.FileBasedConfiguration; +import org.apache.commons.configuration3.INIConfiguration; +import org.apache.commons.configuration3.PropertiesConfiguration; +import org.apache.commons.configuration3.XMLConfiguration; +import org.apache.commons.configuration3.builder.FileBasedConfigurationBuilder; +import org.apache.commons.configuration3.builder.combined.CombinedConfigurationBuilder; +import org.apache.commons.configuration3.ex.ConfigurationException; //@formatter:off /** @@ -67,7 +67,7 @@ *

      * * @since 2.0 - * @see org.apache.commons.configuration2.builder.DefaultParametersManager + * @see org.apache.commons.configuration3.builder.DefaultParametersManager */ //@formatter:off public class Configurations { diff --git a/src/main/java/org/apache/commons/configuration2/builder/fluent/DatabaseBuilderParameters.java b/src/main/java/org/apache/commons/configuration3/builder/fluent/DatabaseBuilderParameters.java similarity index 84% rename from src/main/java/org/apache/commons/configuration2/builder/fluent/DatabaseBuilderParameters.java rename to src/main/java/org/apache/commons/configuration3/builder/fluent/DatabaseBuilderParameters.java index a54543199c..0b804c4afe 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/fluent/DatabaseBuilderParameters.java +++ b/src/main/java/org/apache/commons/configuration3/builder/fluent/DatabaseBuilderParameters.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.fluent; +package org.apache.commons.configuration3.builder.fluent; -import org.apache.commons.configuration2.builder.BasicBuilderProperties; -import org.apache.commons.configuration2.builder.BuilderParameters; -import org.apache.commons.configuration2.builder.DatabaseBuilderProperties; +import org.apache.commons.configuration3.builder.BasicBuilderProperties; +import org.apache.commons.configuration3.builder.BuilderParameters; +import org.apache.commons.configuration3.builder.DatabaseBuilderProperties; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/builder/fluent/FileBasedBuilderParameters.java b/src/main/java/org/apache/commons/configuration3/builder/fluent/FileBasedBuilderParameters.java similarity index 84% rename from src/main/java/org/apache/commons/configuration2/builder/fluent/FileBasedBuilderParameters.java rename to src/main/java/org/apache/commons/configuration3/builder/fluent/FileBasedBuilderParameters.java index 99f09b6310..3fdc8af4e2 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/fluent/FileBasedBuilderParameters.java +++ b/src/main/java/org/apache/commons/configuration3/builder/fluent/FileBasedBuilderParameters.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.fluent; +package org.apache.commons.configuration3.builder.fluent; -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.configuration3.builder.BasicBuilderProperties; +import org.apache.commons.configuration3.builder.BuilderParameters; +import org.apache.commons.configuration3.builder.FileBasedBuilderProperties; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/builder/fluent/HierarchicalBuilderParameters.java b/src/main/java/org/apache/commons/configuration3/builder/fluent/HierarchicalBuilderParameters.java similarity index 82% rename from src/main/java/org/apache/commons/configuration2/builder/fluent/HierarchicalBuilderParameters.java rename to src/main/java/org/apache/commons/configuration3/builder/fluent/HierarchicalBuilderParameters.java index f5638ea164..35810d14fb 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/fluent/HierarchicalBuilderParameters.java +++ b/src/main/java/org/apache/commons/configuration3/builder/fluent/HierarchicalBuilderParameters.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.fluent; +package org.apache.commons.configuration3.builder.fluent; -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.configuration3.builder.BasicBuilderProperties; +import org.apache.commons.configuration3.builder.BuilderParameters; +import org.apache.commons.configuration3.builder.FileBasedBuilderProperties; +import org.apache.commons.configuration3.builder.HierarchicalBuilderProperties; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/builder/fluent/INIBuilderParameters.java b/src/main/java/org/apache/commons/configuration3/builder/fluent/INIBuilderParameters.java similarity index 79% rename from src/main/java/org/apache/commons/configuration2/builder/fluent/INIBuilderParameters.java rename to src/main/java/org/apache/commons/configuration3/builder/fluent/INIBuilderParameters.java index 691c1de7c6..b5c6aa0661 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/fluent/INIBuilderParameters.java +++ b/src/main/java/org/apache/commons/configuration3/builder/fluent/INIBuilderParameters.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.fluent; +package org.apache.commons.configuration3.builder.fluent; -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.INIBuilderProperties; +import org.apache.commons.configuration3.builder.BasicBuilderProperties; +import org.apache.commons.configuration3.builder.BuilderParameters; +import org.apache.commons.configuration3.builder.FileBasedBuilderProperties; +import org.apache.commons.configuration3.builder.HierarchicalBuilderProperties; +import org.apache.commons.configuration3.builder.INIBuilderProperties; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/builder/fluent/JndiBuilderParameters.java b/src/main/java/org/apache/commons/configuration3/builder/fluent/JndiBuilderParameters.java similarity index 84% rename from src/main/java/org/apache/commons/configuration2/builder/fluent/JndiBuilderParameters.java rename to src/main/java/org/apache/commons/configuration3/builder/fluent/JndiBuilderParameters.java index 957f842020..2fa70f6a03 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/fluent/JndiBuilderParameters.java +++ b/src/main/java/org/apache/commons/configuration3/builder/fluent/JndiBuilderParameters.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.fluent; +package org.apache.commons.configuration3.builder.fluent; -import org.apache.commons.configuration2.builder.BasicBuilderProperties; -import org.apache.commons.configuration2.builder.BuilderParameters; -import org.apache.commons.configuration2.builder.JndiBuilderProperties; +import org.apache.commons.configuration3.builder.BasicBuilderProperties; +import org.apache.commons.configuration3.builder.BuilderParameters; +import org.apache.commons.configuration3.builder.JndiBuilderProperties; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/builder/fluent/MultiFileBuilderParameters.java b/src/main/java/org/apache/commons/configuration3/builder/fluent/MultiFileBuilderParameters.java similarity index 85% rename from src/main/java/org/apache/commons/configuration2/builder/fluent/MultiFileBuilderParameters.java rename to src/main/java/org/apache/commons/configuration3/builder/fluent/MultiFileBuilderParameters.java index cb6827fff1..ecf8b16ed0 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/fluent/MultiFileBuilderParameters.java +++ b/src/main/java/org/apache/commons/configuration3/builder/fluent/MultiFileBuilderParameters.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.fluent; +package org.apache.commons.configuration3.builder.fluent; -import org.apache.commons.configuration2.builder.BasicBuilderProperties; -import org.apache.commons.configuration2.builder.BuilderParameters; -import org.apache.commons.configuration2.builder.combined.MultiFileBuilderProperties; +import org.apache.commons.configuration3.builder.BasicBuilderProperties; +import org.apache.commons.configuration3.builder.BuilderParameters; +import org.apache.commons.configuration3.builder.combined.MultiFileBuilderProperties; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/builder/fluent/Parameters.java b/src/main/java/org/apache/commons/configuration3/builder/fluent/Parameters.java similarity index 93% rename from src/main/java/org/apache/commons/configuration2/builder/fluent/Parameters.java rename to src/main/java/org/apache/commons/configuration3/builder/fluent/Parameters.java index d8eb9ad6c1..41d2be3fc3 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/fluent/Parameters.java +++ b/src/main/java/org/apache/commons/configuration3/builder/fluent/Parameters.java @@ -14,25 +14,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.fluent; +package org.apache.commons.configuration3.builder.fluent; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -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.INIBuilderParametersImpl; -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; +import org.apache.commons.configuration3.builder.BasicBuilderParameters; +import org.apache.commons.configuration3.builder.BuilderParameters; +import org.apache.commons.configuration3.builder.DatabaseBuilderParametersImpl; +import org.apache.commons.configuration3.builder.DefaultParametersHandler; +import org.apache.commons.configuration3.builder.DefaultParametersManager; +import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; +import org.apache.commons.configuration3.builder.HierarchicalBuilderParametersImpl; +import org.apache.commons.configuration3.builder.INIBuilderParametersImpl; +import org.apache.commons.configuration3.builder.JndiBuilderParametersImpl; +import org.apache.commons.configuration3.builder.PropertiesBuilderParametersImpl; +import org.apache.commons.configuration3.builder.XMLBuilderParametersImpl; +import org.apache.commons.configuration3.builder.combined.CombinedBuilderParametersImpl; +import org.apache.commons.configuration3.builder.combined.MultiFileBuilderParametersImpl; //@formatter:off /** diff --git a/src/main/java/org/apache/commons/configuration2/builder/fluent/PropertiesBuilderParameters.java b/src/main/java/org/apache/commons/configuration3/builder/fluent/PropertiesBuilderParameters.java similarity index 82% rename from src/main/java/org/apache/commons/configuration2/builder/fluent/PropertiesBuilderParameters.java rename to src/main/java/org/apache/commons/configuration3/builder/fluent/PropertiesBuilderParameters.java index 2a947830f3..79c19b1662 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/fluent/PropertiesBuilderParameters.java +++ b/src/main/java/org/apache/commons/configuration3/builder/fluent/PropertiesBuilderParameters.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.fluent; +package org.apache.commons.configuration3.builder.fluent; -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; +import org.apache.commons.configuration3.builder.BasicBuilderProperties; +import org.apache.commons.configuration3.builder.BuilderParameters; +import org.apache.commons.configuration3.builder.FileBasedBuilderProperties; +import org.apache.commons.configuration3.builder.PropertiesBuilderProperties; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/builder/fluent/XMLBuilderParameters.java b/src/main/java/org/apache/commons/configuration3/builder/fluent/XMLBuilderParameters.java similarity index 79% rename from src/main/java/org/apache/commons/configuration2/builder/fluent/XMLBuilderParameters.java rename to src/main/java/org/apache/commons/configuration3/builder/fluent/XMLBuilderParameters.java index 495c62f68f..3b7944c7cf 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/fluent/XMLBuilderParameters.java +++ b/src/main/java/org/apache/commons/configuration3/builder/fluent/XMLBuilderParameters.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.fluent; +package org.apache.commons.configuration3.builder.fluent; -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; +import org.apache.commons.configuration3.builder.BasicBuilderProperties; +import org.apache.commons.configuration3.builder.BuilderParameters; +import org.apache.commons.configuration3.builder.FileBasedBuilderProperties; +import org.apache.commons.configuration3.builder.HierarchicalBuilderProperties; +import org.apache.commons.configuration3.builder.XMLBuilderProperties; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/builder/fluent/package-info.java b/src/main/java/org/apache/commons/configuration3/builder/fluent/package-info.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/builder/fluent/package-info.java rename to src/main/java/org/apache/commons/configuration3/builder/fluent/package-info.java index b417dae3b4..38b934591e 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/fluent/package-info.java +++ b/src/main/java/org/apache/commons/configuration3/builder/fluent/package-info.java @@ -32,4 +32,4 @@ * happen even in minor releases. *

      */ -package org.apache.commons.configuration2.builder.fluent; +package org.apache.commons.configuration3.builder.fluent; diff --git a/src/main/java/org/apache/commons/configuration2/builder/package-info.java b/src/main/java/org/apache/commons/configuration3/builder/package-info.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/builder/package-info.java rename to src/main/java/org/apache/commons/configuration3/builder/package-info.java index 4bb4fd26c7..5fe4cadfc9 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/package-info.java +++ b/src/main/java/org/apache/commons/configuration3/builder/package-info.java @@ -35,4 +35,4 @@ * happen even in minor releases. *

      */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; diff --git a/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java b/src/main/java/org/apache/commons/configuration3/convert/AbstractListDelimiterHandler.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java rename to src/main/java/org/apache/commons/configuration3/convert/AbstractListDelimiterHandler.java index e4ab1554a6..0140947b89 100644 --- a/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java +++ b/src/main/java/org/apache/commons/configuration3/convert/AbstractListDelimiterHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.convert; +package org.apache.commons.configuration3.convert; import java.lang.reflect.Array; import java.nio.file.Path; diff --git a/src/main/java/org/apache/commons/configuration2/convert/ConversionHandler.java b/src/main/java/org/apache/commons/configuration3/convert/ConversionHandler.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/convert/ConversionHandler.java rename to src/main/java/org/apache/commons/configuration3/convert/ConversionHandler.java index dd83f5cada..d57b22c488 100644 --- a/src/main/java/org/apache/commons/configuration2/convert/ConversionHandler.java +++ b/src/main/java/org/apache/commons/configuration3/convert/ConversionHandler.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.convert; +package org.apache.commons.configuration3.convert; import java.util.Collection; -import org.apache.commons.configuration2.ex.ConversionException; -import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration3.ex.ConversionException; +import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/convert/DefaultConversionHandler.java b/src/main/java/org/apache/commons/configuration3/convert/DefaultConversionHandler.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/convert/DefaultConversionHandler.java rename to src/main/java/org/apache/commons/configuration3/convert/DefaultConversionHandler.java index 7f53a429ab..edefc4919a 100644 --- a/src/main/java/org/apache/commons/configuration2/convert/DefaultConversionHandler.java +++ b/src/main/java/org/apache/commons/configuration3/convert/DefaultConversionHandler.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.convert; +package org.apache.commons.configuration3.convert; import java.lang.reflect.Array; import java.util.Collection; import java.util.Iterator; import java.util.LinkedList; -import org.apache.commons.configuration2.ex.ConversionException; -import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration3.ex.ConversionException; +import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; import org.apache.commons.lang3.ClassUtils; /** diff --git a/src/main/java/org/apache/commons/configuration2/convert/DefaultListDelimiterHandler.java b/src/main/java/org/apache/commons/configuration3/convert/DefaultListDelimiterHandler.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/convert/DefaultListDelimiterHandler.java rename to src/main/java/org/apache/commons/configuration3/convert/DefaultListDelimiterHandler.java index f7e7531253..2ae8d4251e 100644 --- a/src/main/java/org/apache/commons/configuration2/convert/DefaultListDelimiterHandler.java +++ b/src/main/java/org/apache/commons/configuration3/convert/DefaultListDelimiterHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.convert; +package org.apache.commons.configuration3.convert; import java.util.Collection; import java.util.LinkedList; diff --git a/src/main/java/org/apache/commons/configuration2/convert/DisabledListDelimiterHandler.java b/src/main/java/org/apache/commons/configuration3/convert/DisabledListDelimiterHandler.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/convert/DisabledListDelimiterHandler.java rename to src/main/java/org/apache/commons/configuration3/convert/DisabledListDelimiterHandler.java index 3a9afbe72f..c2c34b8098 100644 --- a/src/main/java/org/apache/commons/configuration2/convert/DisabledListDelimiterHandler.java +++ b/src/main/java/org/apache/commons/configuration3/convert/DisabledListDelimiterHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.convert; +package org.apache.commons.configuration3.convert; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java b/src/main/java/org/apache/commons/configuration3/convert/LegacyListDelimiterHandler.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java rename to src/main/java/org/apache/commons/configuration3/convert/LegacyListDelimiterHandler.java index 7e0fbce0b4..d12008edb6 100644 --- a/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java +++ b/src/main/java/org/apache/commons/configuration3/convert/LegacyListDelimiterHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.convert; +package org.apache.commons.configuration3.convert; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/configuration2/convert/ListDelimiterHandler.java b/src/main/java/org/apache/commons/configuration3/convert/ListDelimiterHandler.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/convert/ListDelimiterHandler.java rename to src/main/java/org/apache/commons/configuration3/convert/ListDelimiterHandler.java index 61b2407b9a..bb1a81dad3 100644 --- a/src/main/java/org/apache/commons/configuration2/convert/ListDelimiterHandler.java +++ b/src/main/java/org/apache/commons/configuration3/convert/ListDelimiterHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.convert; +package org.apache.commons.configuration3.convert; import java.util.Collection; import java.util.Collections; @@ -26,9 +26,9 @@ * Definition of an interface that controls the handling of list delimiters in configuration properties. *

      *

      - * {@link org.apache.commons.configuration2.AbstractConfiguration AbstractConfiguration} supports list delimiters in + * {@link org.apache.commons.configuration3.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.configuration2.PropertiesConfiguration PropertiesConfiguration}: + * is useful for instance for {@link org.apache.commons.configuration3.PropertiesConfiguration PropertiesConfiguration}: * properties files that have to be compatible with the {@link java.util.Properties} class cannot have multiple * occurrences of a single property key, therefore a different storage scheme for multi-valued properties is needed. A * possible storage scheme could look as follows: diff --git a/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java b/src/main/java/org/apache/commons/configuration3/convert/PropertyConverter.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java rename to src/main/java/org/apache/commons/configuration3/convert/PropertyConverter.java index 307d9de3e6..c7f8861c1a 100644 --- a/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java +++ b/src/main/java/org/apache/commons/configuration3/convert/PropertyConverter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2.convert; +package org.apache.commons.configuration3.convert; import java.awt.Color; import java.io.File; @@ -41,7 +41,7 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import org.apache.commons.configuration2.ex.ConversionException; +import org.apache.commons.configuration3.ex.ConversionException; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/org/apache/commons/configuration2/convert/ValueTransformer.java b/src/main/java/org/apache/commons/configuration3/convert/ValueTransformer.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/convert/ValueTransformer.java rename to src/main/java/org/apache/commons/configuration3/convert/ValueTransformer.java index ef9e351e63..23a52ae3be 100644 --- a/src/main/java/org/apache/commons/configuration2/convert/ValueTransformer.java +++ b/src/main/java/org/apache/commons/configuration3/convert/ValueTransformer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.convert; +package org.apache.commons.configuration3.convert; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/convert/package-info.java b/src/main/java/org/apache/commons/configuration3/convert/package-info.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/convert/package-info.java rename to src/main/java/org/apache/commons/configuration3/convert/package-info.java index 39597d968e..444f02eef4 100644 --- a/src/main/java/org/apache/commons/configuration2/convert/package-info.java +++ b/src/main/java/org/apache/commons/configuration3/convert/package-info.java @@ -31,4 +31,4 @@ * handling. Client code can choose the one which is most suitable for the current use case. *

      */ -package org.apache.commons.configuration2.convert; +package org.apache.commons.configuration3.convert; diff --git a/src/main/java/org/apache/commons/configuration2/event/BaseEventSource.java b/src/main/java/org/apache/commons/configuration3/event/BaseEventSource.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/event/BaseEventSource.java rename to src/main/java/org/apache/commons/configuration3/event/BaseEventSource.java index 98b167af6b..e921cc15b2 100644 --- a/src/main/java/org/apache/commons/configuration2/event/BaseEventSource.java +++ b/src/main/java/org/apache/commons/configuration3/event/BaseEventSource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.event; +package org.apache.commons.configuration3.event; import java.util.Collection; import java.util.Collections; @@ -42,7 +42,7 @@ * listeners will receive property set events, property clear events, and property add events). If this mode is turned * off (which is the default), detail events are suppressed, so only property set events will be received. Note that the * number of received detail events may differ for different configuration implementations. - * {@link org.apache.commons.configuration2.BaseHierarchicalConfiguration BaseHierarchicalConfiguration} for instance + * {@link org.apache.commons.configuration3.BaseHierarchicalConfiguration BaseHierarchicalConfiguration} for instance * has a custom implementation of {@code setProperty()}, which does not generate any detail events. *

      *

      diff --git a/src/main/java/org/apache/commons/configuration2/event/ConfigurationErrorEvent.java b/src/main/java/org/apache/commons/configuration3/event/ConfigurationErrorEvent.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/event/ConfigurationErrorEvent.java rename to src/main/java/org/apache/commons/configuration3/event/ConfigurationErrorEvent.java index b7ee96e11a..cbbb7c2307 100644 --- a/src/main/java/org/apache/commons/configuration2/event/ConfigurationErrorEvent.java +++ b/src/main/java/org/apache/commons/configuration3/event/ConfigurationErrorEvent.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.event; +package org.apache.commons.configuration3.event; /** *

      * An event class that is used for reporting errors that occurred while processing configuration properties. *

      *

      - * Some configuration implementations (e.g. {@link org.apache.commons.configuration2.DatabaseConfiguration} or - * {@link org.apache.commons.configuration2.JNDIConfiguration} use an underlying storage that can throw an exception on + * Some configuration implementations (e.g. {@link org.apache.commons.configuration3.DatabaseConfiguration} or + * {@link org.apache.commons.configuration3.JNDIConfiguration} use an underlying storage that can throw an exception on * each property access. In earlier versions of this library such exceptions were logged and then silently ignored. This * makes it impossible for a client to find out that something went wrong. *

      diff --git a/src/main/java/org/apache/commons/configuration2/event/ConfigurationEvent.java b/src/main/java/org/apache/commons/configuration3/event/ConfigurationEvent.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/event/ConfigurationEvent.java rename to src/main/java/org/apache/commons/configuration3/event/ConfigurationEvent.java index f02ec93da7..3884029ae7 100644 --- a/src/main/java/org/apache/commons/configuration2/event/ConfigurationEvent.java +++ b/src/main/java/org/apache/commons/configuration3/event/ConfigurationEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.event; +package org.apache.commons.configuration3.event; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/event/Event.java b/src/main/java/org/apache/commons/configuration3/event/Event.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/event/Event.java rename to src/main/java/org/apache/commons/configuration3/event/Event.java index 7dd0007373..1f868bdb46 100644 --- a/src/main/java/org/apache/commons/configuration2/event/Event.java +++ b/src/main/java/org/apache/commons/configuration3/event/Event.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.event; +package org.apache.commons.configuration3.event; import java.util.EventObject; diff --git a/src/main/java/org/apache/commons/configuration2/event/EventListener.java b/src/main/java/org/apache/commons/configuration3/event/EventListener.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/event/EventListener.java rename to src/main/java/org/apache/commons/configuration3/event/EventListener.java index 611c14b1e5..bce9f48f4c 100644 --- a/src/main/java/org/apache/commons/configuration2/event/EventListener.java +++ b/src/main/java/org/apache/commons/configuration3/event/EventListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.event; +package org.apache.commons.configuration3.event; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/event/EventListenerList.java b/src/main/java/org/apache/commons/configuration3/event/EventListenerList.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/event/EventListenerList.java rename to src/main/java/org/apache/commons/configuration3/event/EventListenerList.java index 9a805e4291..c7e900e7a7 100644 --- a/src/main/java/org/apache/commons/configuration2/event/EventListenerList.java +++ b/src/main/java/org/apache/commons/configuration3/event/EventListenerList.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.event; +package org.apache.commons.configuration3.event; import java.util.Collections; import java.util.HashMap; diff --git a/src/main/java/org/apache/commons/configuration2/event/EventListenerRegistrationData.java b/src/main/java/org/apache/commons/configuration3/event/EventListenerRegistrationData.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/event/EventListenerRegistrationData.java rename to src/main/java/org/apache/commons/configuration3/event/EventListenerRegistrationData.java index ae7e49a079..115756f9a3 100644 --- a/src/main/java/org/apache/commons/configuration2/event/EventListenerRegistrationData.java +++ b/src/main/java/org/apache/commons/configuration3/event/EventListenerRegistrationData.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.event; +package org.apache.commons.configuration3.event; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/event/EventSource.java b/src/main/java/org/apache/commons/configuration3/event/EventSource.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/event/EventSource.java rename to src/main/java/org/apache/commons/configuration3/event/EventSource.java index 0b81f50009..951edf1938 100644 --- a/src/main/java/org/apache/commons/configuration2/event/EventSource.java +++ b/src/main/java/org/apache/commons/configuration3/event/EventSource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.event; +package org.apache.commons.configuration3.event; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/event/EventType.java b/src/main/java/org/apache/commons/configuration3/event/EventType.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/event/EventType.java rename to src/main/java/org/apache/commons/configuration3/event/EventType.java index eae3f4b50b..834ec14902 100644 --- a/src/main/java/org/apache/commons/configuration2/event/EventType.java +++ b/src/main/java/org/apache/commons/configuration3/event/EventType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.event; +package org.apache.commons.configuration3.event; import java.io.Serializable; import java.util.HashSet; diff --git a/src/main/java/org/apache/commons/configuration2/event/package-info.java b/src/main/java/org/apache/commons/configuration3/event/package-info.java similarity index 95% rename from src/main/java/org/apache/commons/configuration2/event/package-info.java rename to src/main/java/org/apache/commons/configuration3/event/package-info.java index df403b5994..1099f29f61 100644 --- a/src/main/java/org/apache/commons/configuration2/event/package-info.java +++ b/src/main/java/org/apache/commons/configuration3/event/package-info.java @@ -20,4 +20,4 @@ * This package contains interfaces and classes for receiving notifications about changes at configurations. *

      */ -package org.apache.commons.configuration2.event; +package org.apache.commons.configuration3.event; diff --git a/src/main/java/org/apache/commons/configuration2/ex/ConfigurationException.java b/src/main/java/org/apache/commons/configuration3/ex/ConfigurationException.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/ex/ConfigurationException.java rename to src/main/java/org/apache/commons/configuration3/ex/ConfigurationException.java index e2833ae3b2..3b41431fe5 100644 --- a/src/main/java/org/apache/commons/configuration2/ex/ConfigurationException.java +++ b/src/main/java/org/apache/commons/configuration3/ex/ConfigurationException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2.ex; +package org.apache.commons.configuration3.ex; /** * Any exception that occurs while initializing a Configuration object. diff --git a/src/main/java/org/apache/commons/configuration2/ex/ConfigurationRuntimeException.java b/src/main/java/org/apache/commons/configuration3/ex/ConfigurationRuntimeException.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/ex/ConfigurationRuntimeException.java rename to src/main/java/org/apache/commons/configuration3/ex/ConfigurationRuntimeException.java index fc6c335514..9cb1c280d4 100644 --- a/src/main/java/org/apache/commons/configuration2/ex/ConfigurationRuntimeException.java +++ b/src/main/java/org/apache/commons/configuration3/ex/ConfigurationRuntimeException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2.ex; +package org.apache.commons.configuration3.ex; /** * A configuration related runtime exception. diff --git a/src/main/java/org/apache/commons/configuration2/ex/ConversionException.java b/src/main/java/org/apache/commons/configuration3/ex/ConversionException.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/ex/ConversionException.java rename to src/main/java/org/apache/commons/configuration3/ex/ConversionException.java index 53912b0e19..6b78f2bd66 100644 --- a/src/main/java/org/apache/commons/configuration2/ex/ConversionException.java +++ b/src/main/java/org/apache/commons/configuration3/ex/ConversionException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2.ex; +package org.apache.commons.configuration3.ex; /** * Thrown when a property is incompatible with the type requested. diff --git a/src/main/java/org/apache/commons/configuration2/ex/package-info.java b/src/main/java/org/apache/commons/configuration3/ex/package-info.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/ex/package-info.java rename to src/main/java/org/apache/commons/configuration3/ex/package-info.java index 26631b86e6..fcdef4dd8c 100644 --- a/src/main/java/org/apache/commons/configuration2/ex/package-info.java +++ b/src/main/java/org/apache/commons/configuration3/ex/package-info.java @@ -24,4 +24,4 @@ * multiple other packages, they are located in their own package to avoid cyclic dependencies. *

      */ -package org.apache.commons.configuration2.ex; +package org.apache.commons.configuration3.ex; diff --git a/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java b/src/main/java/org/apache/commons/configuration3/interpol/ConfigurationInterpolator.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java rename to src/main/java/org/apache/commons/configuration3/interpol/ConfigurationInterpolator.java index 14f30d8832..f9d8fd4264 100644 --- a/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java +++ b/src/main/java/org/apache/commons/configuration3/interpol/ConfigurationInterpolator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.interpol; +package org.apache.commons.configuration3.interpol; import java.lang.reflect.Array; import java.util.ArrayList; @@ -75,7 +75,7 @@ * {@link #setStringConverter(Function) string converter} to perform this conversion. The default implementation of this * function simply uses the value's {@code toString} method in the majority of cases. However, for maximum * consistency with - * {@link org.apache.commons.configuration2.convert.DefaultConversionHandler DefaultConversionHandler}, when a variable + * {@link org.apache.commons.configuration3.convert.DefaultConversionHandler DefaultConversionHandler}, when a variable * value is a container type (such as a collection or array), then only the first element of the container is converted * to a string instead of the container itself. For example, if the variable {@code x} resolves to the integer array * {@code [1, 2, 3]}, then the string "my value = ${x}" will by default be interpolated to @@ -98,7 +98,7 @@ public class ConfigurationInterpolator { * @since 2.8.0 */ public static final String DEFAULT_PREFIX_LOOKUPS_PROPERTY = - "org.apache.commons.configuration2.interpol.ConfigurationInterpolator.defaultPrefixLookups"; + "org.apache.commons.configuration3.interpol.ConfigurationInterpolator.defaultPrefixLookups"; /** Constant for the prefix separator. */ private static final char PREFIX_SEPARATOR = ':'; diff --git a/src/main/java/org/apache/commons/configuration2/interpol/ConstantLookup.java b/src/main/java/org/apache/commons/configuration3/interpol/ConstantLookup.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/interpol/ConstantLookup.java rename to src/main/java/org/apache/commons/configuration3/interpol/ConstantLookup.java index eb71bbe39c..6f7ceec72d 100644 --- a/src/main/java/org/apache/commons/configuration2/interpol/ConstantLookup.java +++ b/src/main/java/org/apache/commons/configuration3/interpol/ConstantLookup.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.interpol; +package org.apache.commons.configuration3.interpol; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/org/apache/commons/configuration2/interpol/DefaultLookups.java b/src/main/java/org/apache/commons/configuration3/interpol/DefaultLookups.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/interpol/DefaultLookups.java rename to src/main/java/org/apache/commons/configuration3/interpol/DefaultLookups.java index 13fdcdec96..04505bfed4 100644 --- a/src/main/java/org/apache/commons/configuration2/interpol/DefaultLookups.java +++ b/src/main/java/org/apache/commons/configuration3/interpol/DefaultLookups.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.interpol; +package org.apache.commons.configuration3.interpol; import org.apache.commons.text.lookup.StringLookupFactory; diff --git a/src/main/java/org/apache/commons/configuration2/interpol/DummyLookup.java b/src/main/java/org/apache/commons/configuration3/interpol/DummyLookup.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/interpol/DummyLookup.java rename to src/main/java/org/apache/commons/configuration3/interpol/DummyLookup.java index 479995b90d..701016c510 100644 --- a/src/main/java/org/apache/commons/configuration2/interpol/DummyLookup.java +++ b/src/main/java/org/apache/commons/configuration3/interpol/DummyLookup.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.interpol; +package org.apache.commons.configuration3.interpol; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/interpol/EnvironmentLookup.java b/src/main/java/org/apache/commons/configuration3/interpol/EnvironmentLookup.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/interpol/EnvironmentLookup.java rename to src/main/java/org/apache/commons/configuration3/interpol/EnvironmentLookup.java index c664ea735e..b5ec642efe 100644 --- a/src/main/java/org/apache/commons/configuration2/interpol/EnvironmentLookup.java +++ b/src/main/java/org/apache/commons/configuration3/interpol/EnvironmentLookup.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.interpol; +package org.apache.commons.configuration3.interpol; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java b/src/main/java/org/apache/commons/configuration3/interpol/ExprLookup.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java rename to src/main/java/org/apache/commons/configuration3/interpol/ExprLookup.java index 6463fae2d3..9b4ce72490 100644 --- a/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java +++ b/src/main/java/org/apache/commons/configuration3/interpol/ExprLookup.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.interpol; +package org.apache.commons.configuration3.interpol; import java.util.ArrayList; import java.util.Objects; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration2.io.ConfigurationLogger; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.io.ConfigurationLogger; import org.apache.commons.jexl2.Expression; import org.apache.commons.jexl2.JexlContext; import org.apache.commons.jexl2.JexlEngine; diff --git a/src/main/java/org/apache/commons/configuration2/interpol/InterpolatorSpecification.java b/src/main/java/org/apache/commons/configuration3/interpol/InterpolatorSpecification.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/interpol/InterpolatorSpecification.java rename to src/main/java/org/apache/commons/configuration3/interpol/InterpolatorSpecification.java index c06248ef29..bc81b4f914 100644 --- a/src/main/java/org/apache/commons/configuration2/interpol/InterpolatorSpecification.java +++ b/src/main/java/org/apache/commons/configuration3/interpol/InterpolatorSpecification.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.interpol; +package org.apache.commons.configuration3.interpol; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/configuration2/interpol/Lookup.java b/src/main/java/org/apache/commons/configuration3/interpol/Lookup.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/interpol/Lookup.java rename to src/main/java/org/apache/commons/configuration3/interpol/Lookup.java index edb07059cb..de38e2e6cc 100644 --- a/src/main/java/org/apache/commons/configuration2/interpol/Lookup.java +++ b/src/main/java/org/apache/commons/configuration3/interpol/Lookup.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.interpol; +package org.apache.commons.configuration3.interpol; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/interpol/StringLookupAdapter.java b/src/main/java/org/apache/commons/configuration3/interpol/StringLookupAdapter.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/interpol/StringLookupAdapter.java rename to src/main/java/org/apache/commons/configuration3/interpol/StringLookupAdapter.java index e659574c82..ffaec03fde 100644 --- a/src/main/java/org/apache/commons/configuration2/interpol/StringLookupAdapter.java +++ b/src/main/java/org/apache/commons/configuration3/interpol/StringLookupAdapter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.interpol; +package org.apache.commons.configuration3.interpol; import java.util.Objects; diff --git a/src/main/java/org/apache/commons/configuration2/interpol/SystemPropertiesLookup.java b/src/main/java/org/apache/commons/configuration3/interpol/SystemPropertiesLookup.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/interpol/SystemPropertiesLookup.java rename to src/main/java/org/apache/commons/configuration3/interpol/SystemPropertiesLookup.java index 286bcbba98..f47329a7d0 100644 --- a/src/main/java/org/apache/commons/configuration2/interpol/SystemPropertiesLookup.java +++ b/src/main/java/org/apache/commons/configuration3/interpol/SystemPropertiesLookup.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.interpol; +package org.apache.commons.configuration3.interpol; import org.apache.commons.text.lookup.StringLookupFactory; diff --git a/src/main/java/org/apache/commons/configuration2/interpol/package-info.java b/src/main/java/org/apache/commons/configuration3/interpol/package-info.java similarity index 94% rename from src/main/java/org/apache/commons/configuration2/interpol/package-info.java rename to src/main/java/org/apache/commons/configuration3/interpol/package-info.java index ab99a5e240..e7a8bfabec 100644 --- a/src/main/java/org/apache/commons/configuration2/interpol/package-info.java +++ b/src/main/java/org/apache/commons/configuration3/interpol/package-info.java @@ -20,4 +20,4 @@ * A package with helper classes used for interpolation (variable substitution). *

      */ -package org.apache.commons.configuration2.interpol; +package org.apache.commons.configuration3.interpol; diff --git a/src/main/java/org/apache/commons/configuration2/io/AbsoluteNameLocationStrategy.java b/src/main/java/org/apache/commons/configuration3/io/AbsoluteNameLocationStrategy.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/io/AbsoluteNameLocationStrategy.java rename to src/main/java/org/apache/commons/configuration3/io/AbsoluteNameLocationStrategy.java index ce01c127c0..6e935353ed 100644 --- a/src/main/java/org/apache/commons/configuration2/io/AbsoluteNameLocationStrategy.java +++ b/src/main/java/org/apache/commons/configuration3/io/AbsoluteNameLocationStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; import java.io.File; import java.net.URL; diff --git a/src/main/java/org/apache/commons/configuration2/io/BasePathLocationStrategy.java b/src/main/java/org/apache/commons/configuration3/io/BasePathLocationStrategy.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/io/BasePathLocationStrategy.java rename to src/main/java/org/apache/commons/configuration3/io/BasePathLocationStrategy.java index de09d24015..19013ee674 100644 --- a/src/main/java/org/apache/commons/configuration2/io/BasePathLocationStrategy.java +++ b/src/main/java/org/apache/commons/configuration3/io/BasePathLocationStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; import java.io.File; import java.net.URL; diff --git a/src/main/java/org/apache/commons/configuration2/io/ClasspathLocationStrategy.java b/src/main/java/org/apache/commons/configuration3/io/ClasspathLocationStrategy.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/io/ClasspathLocationStrategy.java rename to src/main/java/org/apache/commons/configuration3/io/ClasspathLocationStrategy.java index a0e8071631..f468b33842 100644 --- a/src/main/java/org/apache/commons/configuration2/io/ClasspathLocationStrategy.java +++ b/src/main/java/org/apache/commons/configuration3/io/ClasspathLocationStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; import java.net.URL; diff --git a/src/main/java/org/apache/commons/configuration2/io/CombinedLocationStrategy.java b/src/main/java/org/apache/commons/configuration3/io/CombinedLocationStrategy.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/io/CombinedLocationStrategy.java rename to src/main/java/org/apache/commons/configuration3/io/CombinedLocationStrategy.java index 3414396182..340dea93d3 100644 --- a/src/main/java/org/apache/commons/configuration2/io/CombinedLocationStrategy.java +++ b/src/main/java/org/apache/commons/configuration3/io/CombinedLocationStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; import java.net.URL; import java.util.ArrayList; diff --git a/src/main/java/org/apache/commons/configuration2/io/ConfigurationLogger.java b/src/main/java/org/apache/commons/configuration3/io/ConfigurationLogger.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/io/ConfigurationLogger.java rename to src/main/java/org/apache/commons/configuration3/io/ConfigurationLogger.java index 6aa1447e26..9545f575f7 100644 --- a/src/main/java/org/apache/commons/configuration2/io/ConfigurationLogger.java +++ b/src/main/java/org/apache/commons/configuration3/io/ConfigurationLogger.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -29,7 +29,7 @@ * When reading configuration files in complex scenarios having log output is useful for diagnostic purposes. Therefore, * Commons Configuration produces some logging output. As concrete projects have different requirements on the * amount and detail of logging, there is a way of configuring logging: All classes derived from - * {@link org.apache.commons.configuration2.AbstractConfiguration} can be assigned a logger which is then used for all + * {@link org.apache.commons.configuration3.AbstractConfiguration} can be assigned a logger which is then used for all * log statements generated. *

      *

      diff --git a/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java b/src/main/java/org/apache/commons/configuration3/io/DefaultFileSystem.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java rename to src/main/java/org/apache/commons/configuration3/io/DefaultFileSystem.java index 75c46e4334..6d7ccf426e 100644 --- a/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java +++ b/src/main/java/org/apache/commons/configuration3/io/DefaultFileSystem.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; import java.io.File; import java.io.FileNotFoundException; @@ -27,7 +27,7 @@ import java.net.URL; import java.net.URLConnection; -import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration3.ex.ConfigurationException; /** * FileSystem that uses java.io.File or HttpClient. diff --git a/src/main/java/org/apache/commons/configuration2/io/FileBased.java b/src/main/java/org/apache/commons/configuration3/io/FileBased.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/io/FileBased.java rename to src/main/java/org/apache/commons/configuration3/io/FileBased.java index 65c3da6892..e3f8de2d4d 100644 --- a/src/main/java/org/apache/commons/configuration2/io/FileBased.java +++ b/src/main/java/org/apache/commons/configuration3/io/FileBased.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; import java.io.IOException; import java.io.Reader; import java.io.Writer; -import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration3.ex.ConfigurationException; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/io/FileHandler.java b/src/main/java/org/apache/commons/configuration3/io/FileHandler.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/io/FileHandler.java rename to src/main/java/org/apache/commons/configuration3/io/FileHandler.java index fa2af7850d..7bef3faf5c 100644 --- a/src/main/java/org/apache/commons/configuration2/io/FileHandler.java +++ b/src/main/java/org/apache/commons/configuration3/io/FileHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; import java.io.Closeable; import java.io.File; @@ -33,12 +33,12 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicReference; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.io.FileLocator.FileLocatorBuilder; -import org.apache.commons.configuration2.sync.LockMode; -import org.apache.commons.configuration2.sync.NoOpSynchronizer; -import org.apache.commons.configuration2.sync.Synchronizer; -import org.apache.commons.configuration2.sync.SynchronizerSupport; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.FileLocator.FileLocatorBuilder; +import org.apache.commons.configuration3.sync.LockMode; +import org.apache.commons.configuration3.sync.NoOpSynchronizer; +import org.apache.commons.configuration3.sync.Synchronizer; +import org.apache.commons.configuration3.sync.SynchronizerSupport; import org.apache.commons.logging.LogFactory; /** diff --git a/src/main/java/org/apache/commons/configuration2/io/FileHandlerListener.java b/src/main/java/org/apache/commons/configuration3/io/FileHandlerListener.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/io/FileHandlerListener.java rename to src/main/java/org/apache/commons/configuration3/io/FileHandlerListener.java index 91ee3ab068..908b607867 100644 --- a/src/main/java/org/apache/commons/configuration2/io/FileHandlerListener.java +++ b/src/main/java/org/apache/commons/configuration3/io/FileHandlerListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/io/FileHandlerListenerAdapter.java b/src/main/java/org/apache/commons/configuration3/io/FileHandlerListenerAdapter.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/io/FileHandlerListenerAdapter.java rename to src/main/java/org/apache/commons/configuration3/io/FileHandlerListenerAdapter.java index 4d1320c7d5..20ddad538d 100644 --- a/src/main/java/org/apache/commons/configuration2/io/FileHandlerListenerAdapter.java +++ b/src/main/java/org/apache/commons/configuration3/io/FileHandlerListenerAdapter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/io/FileLocationStrategy.java b/src/main/java/org/apache/commons/configuration3/io/FileLocationStrategy.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/io/FileLocationStrategy.java rename to src/main/java/org/apache/commons/configuration3/io/FileLocationStrategy.java index cdc5076df8..1b1d60b238 100644 --- a/src/main/java/org/apache/commons/configuration2/io/FileLocationStrategy.java +++ b/src/main/java/org/apache/commons/configuration3/io/FileLocationStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; import java.net.URL; diff --git a/src/main/java/org/apache/commons/configuration2/io/FileLocator.java b/src/main/java/org/apache/commons/configuration3/io/FileLocator.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/io/FileLocator.java rename to src/main/java/org/apache/commons/configuration3/io/FileLocator.java index e5868aaf33..240661cc9f 100644 --- a/src/main/java/org/apache/commons/configuration2/io/FileLocator.java +++ b/src/main/java/org/apache/commons/configuration3/io/FileLocator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; import java.net.URL; import java.util.Objects; diff --git a/src/main/java/org/apache/commons/configuration2/io/FileLocatorAware.java b/src/main/java/org/apache/commons/configuration3/io/FileLocatorAware.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/io/FileLocatorAware.java rename to src/main/java/org/apache/commons/configuration3/io/FileLocatorAware.java index af756f34ca..9753414337 100644 --- a/src/main/java/org/apache/commons/configuration2/io/FileLocatorAware.java +++ b/src/main/java/org/apache/commons/configuration3/io/FileLocatorAware.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java b/src/main/java/org/apache/commons/configuration3/io/FileLocatorUtils.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java rename to src/main/java/org/apache/commons/configuration3/io/FileLocatorUtils.java index f40a79ee33..78f277af57 100644 --- a/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java +++ b/src/main/java/org/apache/commons/configuration3/io/FileLocatorUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; import java.io.File; import java.net.MalformedURLException; @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.Map; -import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration3.ex.ConfigurationException; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; diff --git a/src/main/java/org/apache/commons/configuration2/io/FileOptionsProvider.java b/src/main/java/org/apache/commons/configuration3/io/FileOptionsProvider.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/io/FileOptionsProvider.java rename to src/main/java/org/apache/commons/configuration3/io/FileOptionsProvider.java index 83f6702a0e..e69ef28e96 100644 --- a/src/main/java/org/apache/commons/configuration2/io/FileOptionsProvider.java +++ b/src/main/java/org/apache/commons/configuration3/io/FileOptionsProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; import java.util.Map; diff --git a/src/main/java/org/apache/commons/configuration2/io/FileSystem.java b/src/main/java/org/apache/commons/configuration3/io/FileSystem.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/io/FileSystem.java rename to src/main/java/org/apache/commons/configuration3/io/FileSystem.java index 745ec26e3b..405efb0e2b 100644 --- a/src/main/java/org/apache/commons/configuration2/io/FileSystem.java +++ b/src/main/java/org/apache/commons/configuration3/io/FileSystem.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; import java.io.File; import java.io.InputStream; @@ -22,7 +22,7 @@ import java.net.MalformedURLException; import java.net.URL; -import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration3.ex.ConfigurationException; /** * Abstract layer to allow various types of file systems. diff --git a/src/main/java/org/apache/commons/configuration2/io/FileSystemLocationStrategy.java b/src/main/java/org/apache/commons/configuration3/io/FileSystemLocationStrategy.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/io/FileSystemLocationStrategy.java rename to src/main/java/org/apache/commons/configuration3/io/FileSystemLocationStrategy.java index 144661df09..34139a3bbb 100644 --- a/src/main/java/org/apache/commons/configuration2/io/FileSystemLocationStrategy.java +++ b/src/main/java/org/apache/commons/configuration3/io/FileSystemLocationStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; import java.net.URL; diff --git a/src/main/java/org/apache/commons/configuration2/io/FileUtils.java b/src/main/java/org/apache/commons/configuration3/io/FileUtils.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/io/FileUtils.java rename to src/main/java/org/apache/commons/configuration3/io/FileUtils.java index df2fc74844..8b6faad4df 100644 --- a/src/main/java/org/apache/commons/configuration2/io/FileUtils.java +++ b/src/main/java/org/apache/commons/configuration3/io/FileUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; import java.io.File; import java.net.URL; diff --git a/src/main/java/org/apache/commons/configuration2/io/HomeDirectoryLocationStrategy.java b/src/main/java/org/apache/commons/configuration3/io/HomeDirectoryLocationStrategy.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/io/HomeDirectoryLocationStrategy.java rename to src/main/java/org/apache/commons/configuration3/io/HomeDirectoryLocationStrategy.java index f2cca561d4..56b7eac070 100644 --- a/src/main/java/org/apache/commons/configuration2/io/HomeDirectoryLocationStrategy.java +++ b/src/main/java/org/apache/commons/configuration3/io/HomeDirectoryLocationStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; import java.io.File; import java.net.URL; diff --git a/src/main/java/org/apache/commons/configuration2/io/InputStreamSupport.java b/src/main/java/org/apache/commons/configuration3/io/InputStreamSupport.java similarity index 94% rename from src/main/java/org/apache/commons/configuration2/io/InputStreamSupport.java rename to src/main/java/org/apache/commons/configuration3/io/InputStreamSupport.java index ffcac4ea07..6197fac7df 100644 --- a/src/main/java/org/apache/commons/configuration2/io/InputStreamSupport.java +++ b/src/main/java/org/apache/commons/configuration3/io/InputStreamSupport.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; import java.io.IOException; import java.io.InputStream; -import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration3.ex.ConfigurationException; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/io/ProvidedURLLocationStrategy.java b/src/main/java/org/apache/commons/configuration3/io/ProvidedURLLocationStrategy.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/io/ProvidedURLLocationStrategy.java rename to src/main/java/org/apache/commons/configuration3/io/ProvidedURLLocationStrategy.java index ea1428da06..2a898f75e6 100644 --- a/src/main/java/org/apache/commons/configuration2/io/ProvidedURLLocationStrategy.java +++ b/src/main/java/org/apache/commons/configuration3/io/ProvidedURLLocationStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; import java.net.URL; diff --git a/src/main/java/org/apache/commons/configuration2/io/URLConnectionOptions.java b/src/main/java/org/apache/commons/configuration3/io/URLConnectionOptions.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/io/URLConnectionOptions.java rename to src/main/java/org/apache/commons/configuration3/io/URLConnectionOptions.java index 6a45943f4f..8932f13221 100644 --- a/src/main/java/org/apache/commons/configuration2/io/URLConnectionOptions.java +++ b/src/main/java/org/apache/commons/configuration3/io/URLConnectionOptions.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; import java.io.IOException; import java.net.URL; diff --git a/src/main/java/org/apache/commons/configuration2/io/VFSFileSystem.java b/src/main/java/org/apache/commons/configuration3/io/VFSFileSystem.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/io/VFSFileSystem.java rename to src/main/java/org/apache/commons/configuration3/io/VFSFileSystem.java index f815c82d94..a49eecd9de 100644 --- a/src/main/java/org/apache/commons/configuration2/io/VFSFileSystem.java +++ b/src/main/java/org/apache/commons/configuration3/io/VFSFileSystem.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; import java.io.File; import java.io.IOException; @@ -27,8 +27,8 @@ import java.net.URLStreamHandler; import java.util.Map; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.vfs2.FileContent; diff --git a/src/main/java/org/apache/commons/configuration2/io/VerifiableOutputStream.java b/src/main/java/org/apache/commons/configuration3/io/VerifiableOutputStream.java similarity index 95% rename from src/main/java/org/apache/commons/configuration2/io/VerifiableOutputStream.java rename to src/main/java/org/apache/commons/configuration3/io/VerifiableOutputStream.java index 64249f920e..91fc781ac8 100644 --- a/src/main/java/org/apache/commons/configuration2/io/VerifiableOutputStream.java +++ b/src/main/java/org/apache/commons/configuration3/io/VerifiableOutputStream.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/org/apache/commons/configuration2/io/package-info.java b/src/main/java/org/apache/commons/configuration3/io/package-info.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/io/package-info.java rename to src/main/java/org/apache/commons/configuration3/io/package-info.java index 99c9849f7d..95045705d0 100644 --- a/src/main/java/org/apache/commons/configuration2/io/package-info.java +++ b/src/main/java/org/apache/commons/configuration3/io/package-info.java @@ -26,4 +26,4 @@ * for the configuration sources of a specific application. *

      */ -package org.apache.commons.configuration2.io; +package org.apache.commons.configuration3.io; diff --git a/src/main/java/org/apache/commons/configuration2/package-info.java b/src/main/java/org/apache/commons/configuration3/package-info.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/package-info.java rename to src/main/java/org/apache/commons/configuration3/package-info.java index a812aaffff..5e83ddb473 100644 --- a/src/main/java/org/apache/commons/configuration2/package-info.java +++ b/src/main/java/org/apache/commons/configuration3/package-info.java @@ -22,4 +22,4 @@ * {@code XMLConfiguration} that can load XML documents. *

      */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; diff --git a/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java b/src/main/java/org/apache/commons/configuration3/plist/PropertyListConfiguration.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java rename to src/main/java/org/apache/commons/configuration3/plist/PropertyListConfiguration.java index fa038a9a11..431833b887 100644 --- a/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/plist/PropertyListConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2.plist; +package org.apache.commons.configuration3.plist; import java.io.PrintWriter; import java.io.Reader; @@ -30,16 +30,16 @@ import java.util.TimeZone; import org.apache.commons.codec.binary.Hex; -import org.apache.commons.configuration2.BaseHierarchicalConfiguration; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.FileBasedConfiguration; -import org.apache.commons.configuration2.HierarchicalConfiguration; -import org.apache.commons.configuration2.ImmutableConfiguration; -import org.apache.commons.configuration2.MapConfiguration; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.tree.ImmutableNode; -import org.apache.commons.configuration2.tree.InMemoryNodeModel; -import org.apache.commons.configuration2.tree.NodeHandler; +import org.apache.commons.configuration3.BaseHierarchicalConfiguration; +import org.apache.commons.configuration3.Configuration; +import org.apache.commons.configuration3.FileBasedConfiguration; +import org.apache.commons.configuration3.HierarchicalConfiguration; +import org.apache.commons.configuration3.ImmutableConfiguration; +import org.apache.commons.configuration3.MapConfiguration; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.tree.ImmutableNode; +import org.apache.commons.configuration3.tree.InMemoryNodeModel; +import org.apache.commons.configuration3.tree.NodeHandler; import org.apache.commons.lang3.StringUtils; /** diff --git a/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java b/src/main/java/org/apache/commons/configuration3/plist/XMLPropertyListConfiguration.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java rename to src/main/java/org/apache/commons/configuration3/plist/XMLPropertyListConfiguration.java index 462100fbb4..085a8da9d5 100644 --- a/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/plist/XMLPropertyListConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2.plist; +package org.apache.commons.configuration3.plist; import java.io.PrintWriter; import java.io.Reader; @@ -43,17 +43,17 @@ import javax.xml.parsers.SAXParserFactory; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.configuration2.BaseHierarchicalConfiguration; -import org.apache.commons.configuration2.FileBasedConfiguration; -import org.apache.commons.configuration2.HierarchicalConfiguration; -import org.apache.commons.configuration2.ImmutableConfiguration; -import org.apache.commons.configuration2.MapConfiguration; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration2.io.FileLocator; -import org.apache.commons.configuration2.io.FileLocatorAware; -import org.apache.commons.configuration2.tree.ImmutableNode; -import org.apache.commons.configuration2.tree.InMemoryNodeModel; +import org.apache.commons.configuration3.BaseHierarchicalConfiguration; +import org.apache.commons.configuration3.FileBasedConfiguration; +import org.apache.commons.configuration3.HierarchicalConfiguration; +import org.apache.commons.configuration3.ImmutableConfiguration; +import org.apache.commons.configuration3.MapConfiguration; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.io.FileLocator; +import org.apache.commons.configuration3.io.FileLocatorAware; +import org.apache.commons.configuration3.tree.ImmutableNode; +import org.apache.commons.configuration3.tree.InMemoryNodeModel; import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.StringEscapeUtils; import org.xml.sax.Attributes; diff --git a/src/main/java/org/apache/commons/configuration2/plist/package-info.java b/src/main/java/org/apache/commons/configuration3/plist/package-info.java similarity index 94% rename from src/main/java/org/apache/commons/configuration2/plist/package-info.java rename to src/main/java/org/apache/commons/configuration3/plist/package-info.java index 54d8e1fd76..baba238072 100644 --- a/src/main/java/org/apache/commons/configuration2/plist/package-info.java +++ b/src/main/java/org/apache/commons/configuration3/plist/package-info.java @@ -20,4 +20,4 @@ * Configuration classes supporting NeXT / OpenStep /GNUStep style configuration. *

      */ -package org.apache.commons.configuration2.plist; +package org.apache.commons.configuration3.plist; diff --git a/src/main/java/org/apache/commons/configuration2/reloading/CombinedReloadingController.java b/src/main/java/org/apache/commons/configuration3/reloading/CombinedReloadingController.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/reloading/CombinedReloadingController.java rename to src/main/java/org/apache/commons/configuration3/reloading/CombinedReloadingController.java index b26bff46f1..51e046262d 100644 --- a/src/main/java/org/apache/commons/configuration2/reloading/CombinedReloadingController.java +++ b/src/main/java/org/apache/commons/configuration3/reloading/CombinedReloadingController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.reloading; +package org.apache.commons.configuration3.reloading; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java b/src/main/java/org/apache/commons/configuration3/reloading/FileHandlerReloadingDetector.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java rename to src/main/java/org/apache/commons/configuration3/reloading/FileHandlerReloadingDetector.java index 08d9509702..f8bc747258 100644 --- a/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java +++ b/src/main/java/org/apache/commons/configuration3/reloading/FileHandlerReloadingDetector.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.reloading; +package org.apache.commons.configuration3.reloading; import java.io.File; import java.net.MalformedURLException; import java.net.URL; -import org.apache.commons.configuration2.io.FileHandler; -import org.apache.commons.configuration2.io.FileLocatorUtils; +import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration3.io.FileLocatorUtils; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingDetector.java b/src/main/java/org/apache/commons/configuration3/reloading/ManagedReloadingDetector.java similarity index 94% rename from src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingDetector.java rename to src/main/java/org/apache/commons/configuration3/reloading/ManagedReloadingDetector.java index 00a052ab70..f1a1336fe8 100644 --- a/src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingDetector.java +++ b/src/main/java/org/apache/commons/configuration3/reloading/ManagedReloadingDetector.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2.reloading; +package org.apache.commons.configuration3.reloading; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -53,7 +53,7 @@ public boolean isReloadingRequired() { * Tells this strategy that the monitored configuration file should be refreshed. This method will typically be called * from outside (through an exposed MBean) on behalf of an administrator. * - * @see org.apache.commons.configuration2.reloading.ManagedReloadingDetectorMBean#refresh() + * @see org.apache.commons.configuration3.reloading.ManagedReloadingDetectorMBean#refresh() */ @Override public void refresh() { diff --git a/src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingDetectorMBean.java b/src/main/java/org/apache/commons/configuration3/reloading/ManagedReloadingDetectorMBean.java similarity index 95% rename from src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingDetectorMBean.java rename to src/main/java/org/apache/commons/configuration3/reloading/ManagedReloadingDetectorMBean.java index e9f4f47db2..14d19c96c6 100644 --- a/src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingDetectorMBean.java +++ b/src/main/java/org/apache/commons/configuration3/reloading/ManagedReloadingDetectorMBean.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2.reloading; +package org.apache.commons.configuration3.reloading; /** * MBean definition for managing configuration reload. diff --git a/src/main/java/org/apache/commons/configuration2/reloading/PeriodicReloadingTrigger.java b/src/main/java/org/apache/commons/configuration3/reloading/PeriodicReloadingTrigger.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/reloading/PeriodicReloadingTrigger.java rename to src/main/java/org/apache/commons/configuration3/reloading/PeriodicReloadingTrigger.java index 020792a79c..0ef10a610d 100644 --- a/src/main/java/org/apache/commons/configuration2/reloading/PeriodicReloadingTrigger.java +++ b/src/main/java/org/apache/commons/configuration3/reloading/PeriodicReloadingTrigger.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.reloading; +package org.apache.commons.configuration3.reloading; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; diff --git a/src/main/java/org/apache/commons/configuration2/reloading/ReloadingController.java b/src/main/java/org/apache/commons/configuration3/reloading/ReloadingController.java similarity index 95% rename from src/main/java/org/apache/commons/configuration2/reloading/ReloadingController.java rename to src/main/java/org/apache/commons/configuration3/reloading/ReloadingController.java index 3704b04d13..b0c59d2f94 100644 --- a/src/main/java/org/apache/commons/configuration2/reloading/ReloadingController.java +++ b/src/main/java/org/apache/commons/configuration3/reloading/ReloadingController.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.reloading; +package org.apache.commons.configuration3.reloading; -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.EventSource; -import org.apache.commons.configuration2.event.EventType; +import org.apache.commons.configuration3.event.Event; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.event.EventListenerList; +import org.apache.commons.configuration3.event.EventSource; +import org.apache.commons.configuration3.event.EventType; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/reloading/ReloadingControllerSupport.java b/src/main/java/org/apache/commons/configuration3/reloading/ReloadingControllerSupport.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/reloading/ReloadingControllerSupport.java rename to src/main/java/org/apache/commons/configuration3/reloading/ReloadingControllerSupport.java index 710f2ac2d9..3a9f42c2d4 100644 --- a/src/main/java/org/apache/commons/configuration2/reloading/ReloadingControllerSupport.java +++ b/src/main/java/org/apache/commons/configuration3/reloading/ReloadingControllerSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.reloading; +package org.apache.commons.configuration3.reloading; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/reloading/ReloadingDetector.java b/src/main/java/org/apache/commons/configuration3/reloading/ReloadingDetector.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/reloading/ReloadingDetector.java rename to src/main/java/org/apache/commons/configuration3/reloading/ReloadingDetector.java index 5b5753f102..4d7a5caa7c 100644 --- a/src/main/java/org/apache/commons/configuration2/reloading/ReloadingDetector.java +++ b/src/main/java/org/apache/commons/configuration3/reloading/ReloadingDetector.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.reloading; +package org.apache.commons.configuration3.reloading; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/reloading/ReloadingEvent.java b/src/main/java/org/apache/commons/configuration3/reloading/ReloadingEvent.java similarity index 94% rename from src/main/java/org/apache/commons/configuration2/reloading/ReloadingEvent.java rename to src/main/java/org/apache/commons/configuration3/reloading/ReloadingEvent.java index 9eac131a9e..823d690ae0 100644 --- a/src/main/java/org/apache/commons/configuration2/reloading/ReloadingEvent.java +++ b/src/main/java/org/apache/commons/configuration3/reloading/ReloadingEvent.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.reloading; +package org.apache.commons.configuration3.reloading; -import org.apache.commons.configuration2.event.Event; -import org.apache.commons.configuration2.event.EventType; +import org.apache.commons.configuration3.event.Event; +import org.apache.commons.configuration3.event.EventType; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/reloading/VFSFileHandlerReloadingDetector.java b/src/main/java/org/apache/commons/configuration3/reloading/VFSFileHandlerReloadingDetector.java similarity index 95% rename from src/main/java/org/apache/commons/configuration2/reloading/VFSFileHandlerReloadingDetector.java rename to src/main/java/org/apache/commons/configuration3/reloading/VFSFileHandlerReloadingDetector.java index e5969b9d68..18e9e3ec4c 100644 --- a/src/main/java/org/apache/commons/configuration2/reloading/VFSFileHandlerReloadingDetector.java +++ b/src/main/java/org/apache/commons/configuration3/reloading/VFSFileHandlerReloadingDetector.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.configuration2.reloading; +package org.apache.commons.configuration3.reloading; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration2.io.FileHandler; -import org.apache.commons.configuration2.io.FileSystem; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration3.io.FileSystem; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.vfs2.FileObject; diff --git a/src/main/java/org/apache/commons/configuration2/reloading/package-info.java b/src/main/java/org/apache/commons/configuration3/reloading/package-info.java similarity index 95% rename from src/main/java/org/apache/commons/configuration2/reloading/package-info.java rename to src/main/java/org/apache/commons/configuration3/reloading/package-info.java index 8a0ef453e2..dc1c8e0e43 100644 --- a/src/main/java/org/apache/commons/configuration2/reloading/package-info.java +++ b/src/main/java/org/apache/commons/configuration3/reloading/package-info.java @@ -25,4 +25,4 @@ * in background. *

      */ -package org.apache.commons.configuration2.reloading; +package org.apache.commons.configuration3.reloading; diff --git a/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java b/src/main/java/org/apache/commons/configuration3/resolver/CatalogResolver.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java rename to src/main/java/org/apache/commons/configuration3/resolver/CatalogResolver.java index d08cc68ea0..ed0d730cec 100644 --- a/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java +++ b/src/main/java/org/apache/commons/configuration3/resolver/CatalogResolver.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.resolver; +package org.apache.commons.configuration3.resolver; import java.io.IOException; import java.io.InputStream; @@ -23,11 +23,11 @@ import java.net.URLConnection; import java.util.Vector; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration2.io.ConfigurationLogger; -import org.apache.commons.configuration2.io.FileLocatorUtils; -import org.apache.commons.configuration2.io.FileSystem; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration3.io.ConfigurationLogger; +import org.apache.commons.configuration3.io.FileLocatorUtils; +import org.apache.commons.configuration3.io.FileSystem; import org.apache.xml.resolver.CatalogException; import org.apache.xml.resolver.readers.CatalogReader; import org.xml.sax.EntityResolver; diff --git a/src/main/java/org/apache/commons/configuration2/resolver/DefaultEntityResolver.java b/src/main/java/org/apache/commons/configuration3/resolver/DefaultEntityResolver.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/resolver/DefaultEntityResolver.java rename to src/main/java/org/apache/commons/configuration3/resolver/DefaultEntityResolver.java index 3a560fe958..1fb7d7c19e 100644 --- a/src/main/java/org/apache/commons/configuration2/resolver/DefaultEntityResolver.java +++ b/src/main/java/org/apache/commons/configuration3/resolver/DefaultEntityResolver.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.resolver; +package org.apache.commons.configuration3.resolver; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/apache/commons/configuration2/resolver/EntityRegistry.java b/src/main/java/org/apache/commons/configuration3/resolver/EntityRegistry.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/resolver/EntityRegistry.java rename to src/main/java/org/apache/commons/configuration3/resolver/EntityRegistry.java index f744acf497..23bff434a7 100644 --- a/src/main/java/org/apache/commons/configuration2/resolver/EntityRegistry.java +++ b/src/main/java/org/apache/commons/configuration3/resolver/EntityRegistry.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.resolver; +package org.apache.commons.configuration3.resolver; import java.net.URL; import java.util.Map; diff --git a/src/main/java/org/apache/commons/configuration2/resolver/EntityResolverSupport.java b/src/main/java/org/apache/commons/configuration3/resolver/EntityResolverSupport.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/resolver/EntityResolverSupport.java rename to src/main/java/org/apache/commons/configuration3/resolver/EntityResolverSupport.java index 5d12b8811e..ff552f231e 100644 --- a/src/main/java/org/apache/commons/configuration2/resolver/EntityResolverSupport.java +++ b/src/main/java/org/apache/commons/configuration3/resolver/EntityResolverSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.resolver; +package org.apache.commons.configuration3.resolver; import org.xml.sax.EntityResolver; diff --git a/src/main/java/org/apache/commons/configuration2/resolver/package-info.java b/src/main/java/org/apache/commons/configuration3/resolver/package-info.java similarity index 94% rename from src/main/java/org/apache/commons/configuration2/resolver/package-info.java rename to src/main/java/org/apache/commons/configuration3/resolver/package-info.java index c0ed98c070..7e09649746 100644 --- a/src/main/java/org/apache/commons/configuration2/resolver/package-info.java +++ b/src/main/java/org/apache/commons/configuration3/resolver/package-info.java @@ -20,4 +20,4 @@ * A package containing EntityResolvers. *

      */ -package org.apache.commons.configuration2.resolver; +package org.apache.commons.configuration3.resolver; diff --git a/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertiesFactoryBean.java b/src/main/java/org/apache/commons/configuration3/spring/ConfigurationPropertiesFactoryBean.java similarity index 93% rename from src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertiesFactoryBean.java rename to src/main/java/org/apache/commons/configuration3/spring/ConfigurationPropertiesFactoryBean.java index d8e523cfac..76238ff8f6 100644 --- a/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertiesFactoryBean.java +++ b/src/main/java/org/apache/commons/configuration3/spring/ConfigurationPropertiesFactoryBean.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.commons.configuration2.spring; +package org.apache.commons.configuration3.spring; import java.util.Properties; import java.util.stream.Stream; -import org.apache.commons.configuration2.CompositeConfiguration; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ConfigurationConverter; -import org.apache.commons.configuration2.builder.fluent.Configurations; +import org.apache.commons.configuration3.CompositeConfiguration; +import org.apache.commons.configuration3.Configuration; +import org.apache.commons.configuration3.ConfigurationConverter; +import org.apache.commons.configuration3.builder.fluent.Configurations; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; @@ -55,7 +55,7 @@ public class ConfigurationPropertiesFactoryBean implements InitializingBean, Fac /** Spring resources for loading configurations **/ private Resource[] locations; - /** @see org.apache.commons.configuration2.AbstractConfiguration#throwExceptionOnMissing **/ + /** @see org.apache.commons.configuration3.AbstractConfiguration#throwExceptionOnMissing **/ private boolean throwExceptionOnMissing = true; public ConfigurationPropertiesFactoryBean() { @@ -150,7 +150,7 @@ public boolean isThrowExceptionOnMissing() { /** * Sets the underlying Commons CompositeConfiguration throwExceptionOnMissing flag. * - * @see org.apache.commons.configuration2.AbstractConfiguration#setThrowExceptionOnMissing(boolean) + * @see org.apache.commons.configuration3.AbstractConfiguration#setThrowExceptionOnMissing(boolean) * @param throwExceptionOnMissing The new value for the property */ public void setThrowExceptionOnMissing(final boolean throwExceptionOnMissing) { diff --git a/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertySource.java b/src/main/java/org/apache/commons/configuration3/spring/ConfigurationPropertySource.java similarity index 94% rename from src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertySource.java rename to src/main/java/org/apache/commons/configuration3/spring/ConfigurationPropertySource.java index f19ef8d945..733495db5f 100644 --- a/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertySource.java +++ b/src/main/java/org/apache/commons/configuration3/spring/ConfigurationPropertySource.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.configuration2.spring; +package org.apache.commons.configuration3.spring; import java.util.ArrayList; import java.util.List; -import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration3.Configuration; import org.apache.commons.lang3.ArrayUtils; import org.springframework.core.env.EnumerablePropertySource; diff --git a/src/main/java/org/apache/commons/configuration2/spring/package-info.java b/src/main/java/org/apache/commons/configuration3/spring/package-info.java similarity index 94% rename from src/main/java/org/apache/commons/configuration2/spring/package-info.java rename to src/main/java/org/apache/commons/configuration3/spring/package-info.java index 4150a90e19..bcb94e8626 100644 --- a/src/main/java/org/apache/commons/configuration2/spring/package-info.java +++ b/src/main/java/org/apache/commons/configuration3/spring/package-info.java @@ -20,4 +20,4 @@ * A package containing integrations for the Spring Framework. *

      */ -package org.apache.commons.configuration2.spring; +package org.apache.commons.configuration3.spring; diff --git a/src/main/java/org/apache/commons/configuration2/sync/LockMode.java b/src/main/java/org/apache/commons/configuration3/sync/LockMode.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/sync/LockMode.java rename to src/main/java/org/apache/commons/configuration3/sync/LockMode.java index 189c7853d7..c75f477e3d 100644 --- a/src/main/java/org/apache/commons/configuration2/sync/LockMode.java +++ b/src/main/java/org/apache/commons/configuration3/sync/LockMode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.sync; +package org.apache.commons.configuration3.sync; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/sync/NoOpSynchronizer.java b/src/main/java/org/apache/commons/configuration3/sync/NoOpSynchronizer.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/sync/NoOpSynchronizer.java rename to src/main/java/org/apache/commons/configuration3/sync/NoOpSynchronizer.java index e80c617f7f..8039907264 100644 --- a/src/main/java/org/apache/commons/configuration2/sync/NoOpSynchronizer.java +++ b/src/main/java/org/apache/commons/configuration3/sync/NoOpSynchronizer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.sync; +package org.apache.commons.configuration3.sync; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/sync/ReadWriteSynchronizer.java b/src/main/java/org/apache/commons/configuration3/sync/ReadWriteSynchronizer.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/sync/ReadWriteSynchronizer.java rename to src/main/java/org/apache/commons/configuration3/sync/ReadWriteSynchronizer.java index be6e0439c0..bb9772ed7b 100644 --- a/src/main/java/org/apache/commons/configuration2/sync/ReadWriteSynchronizer.java +++ b/src/main/java/org/apache/commons/configuration3/sync/ReadWriteSynchronizer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.sync; +package org.apache.commons.configuration3.sync; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; diff --git a/src/main/java/org/apache/commons/configuration2/sync/Synchronizer.java b/src/main/java/org/apache/commons/configuration3/sync/Synchronizer.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/sync/Synchronizer.java rename to src/main/java/org/apache/commons/configuration3/sync/Synchronizer.java index 2ee9161171..deb44c43c1 100644 --- a/src/main/java/org/apache/commons/configuration2/sync/Synchronizer.java +++ b/src/main/java/org/apache/commons/configuration3/sync/Synchronizer.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.sync; +package org.apache.commons.configuration3.sync; /** *

      * An interface controlling synchronization of configuration instances. *

      *

      - * Each {@code Configuration} object derived from {@link org.apache.commons.configuration2.AbstractConfiguration + * Each {@code Configuration} object derived from {@link org.apache.commons.configuration3.AbstractConfiguration * AbstractConfiguration} has an associated {@code Synchronizer} object. Before an operation on the configuration is * performed (e.g. a property read or an update), the {@code Synchronizer} is invoked. Depending on the concrete * implementation of the {@code Synchronizer} used, the configuration can be made thread-safe. diff --git a/src/main/java/org/apache/commons/configuration2/sync/SynchronizerSupport.java b/src/main/java/org/apache/commons/configuration3/sync/SynchronizerSupport.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/sync/SynchronizerSupport.java rename to src/main/java/org/apache/commons/configuration3/sync/SynchronizerSupport.java index 450847dd59..924df31533 100644 --- a/src/main/java/org/apache/commons/configuration2/sync/SynchronizerSupport.java +++ b/src/main/java/org/apache/commons/configuration3/sync/SynchronizerSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.sync; +package org.apache.commons.configuration3.sync; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/sync/package-info.java b/src/main/java/org/apache/commons/configuration3/sync/package-info.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/sync/package-info.java rename to src/main/java/org/apache/commons/configuration3/sync/package-info.java index 6be7eeca11..8804a57768 100644 --- a/src/main/java/org/apache/commons/configuration2/sync/package-info.java +++ b/src/main/java/org/apache/commons/configuration3/sync/package-info.java @@ -28,4 +28,4 @@ * implementation has to be set. *

      */ -package org.apache.commons.configuration2.sync; +package org.apache.commons.configuration3.sync; diff --git a/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java b/src/main/java/org/apache/commons/configuration3/tree/AbstractImmutableNodeHandler.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java rename to src/main/java/org/apache/commons/configuration3/tree/AbstractImmutableNodeHandler.java index 40ec23c3c1..ad5cfa4a66 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java +++ b/src/main/java/org/apache/commons/configuration3/tree/AbstractImmutableNodeHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import java.util.Collections; import java.util.List; diff --git a/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitor.java b/src/main/java/org/apache/commons/configuration3/tree/ConfigurationNodeVisitor.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitor.java rename to src/main/java/org/apache/commons/configuration3/tree/ConfigurationNodeVisitor.java index 32d0008e4c..1769a3edda 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitor.java +++ b/src/main/java/org/apache/commons/configuration3/tree/ConfigurationNodeVisitor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitorAdapter.java b/src/main/java/org/apache/commons/configuration3/tree/ConfigurationNodeVisitorAdapter.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitorAdapter.java rename to src/main/java/org/apache/commons/configuration3/tree/ConfigurationNodeVisitorAdapter.java index 6883cf6dca..2fd998e0f3 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitorAdapter.java +++ b/src/main/java/org/apache/commons/configuration3/tree/ConfigurationNodeVisitorAdapter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java b/src/main/java/org/apache/commons/configuration3/tree/DefaultConfigurationKey.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java rename to src/main/java/org/apache/commons/configuration3/tree/DefaultConfigurationKey.java index 52aad028e2..42538638f9 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java +++ b/src/main/java/org/apache/commons/configuration3/tree/DefaultConfigurationKey.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java b/src/main/java/org/apache/commons/configuration3/tree/DefaultExpressionEngine.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java rename to src/main/java/org/apache/commons/configuration3/tree/DefaultExpressionEngine.java index 1cde082ba2..dacd6b770c 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java +++ b/src/main/java/org/apache/commons/configuration3/tree/DefaultExpressionEngine.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import java.util.Collection; import java.util.LinkedList; diff --git a/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngineSymbols.java b/src/main/java/org/apache/commons/configuration3/tree/DefaultExpressionEngineSymbols.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngineSymbols.java rename to src/main/java/org/apache/commons/configuration3/tree/DefaultExpressionEngineSymbols.java index f4fc3eff0c..0afb2ee307 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngineSymbols.java +++ b/src/main/java/org/apache/commons/configuration3/tree/DefaultExpressionEngineSymbols.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/src/main/java/org/apache/commons/configuration2/tree/ExpressionEngine.java b/src/main/java/org/apache/commons/configuration3/tree/ExpressionEngine.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/tree/ExpressionEngine.java rename to src/main/java/org/apache/commons/configuration3/tree/ExpressionEngine.java index fc4087fe63..b5914be985 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/ExpressionEngine.java +++ b/src/main/java/org/apache/commons/configuration3/tree/ExpressionEngine.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import java.util.List; @@ -70,7 +70,7 @@ public interface ExpressionEngine { /** * Returns the key for the specified node in the expression language supported by an implementation. This method is * called whenever a property key for a node has to be constructed, e.g. by the - * {@link org.apache.commons.configuration2.Configuration#getKeys() getKeys()} method. + * {@link org.apache.commons.configuration3.Configuration#getKeys() getKeys()} method. * * @param the type of the node to be processed * @param node the node, for which the key must be constructed diff --git a/src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java b/src/main/java/org/apache/commons/configuration3/tree/ImmutableNode.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java rename to src/main/java/org/apache/commons/configuration3/tree/ImmutableNode.java index 4981427959..0a6f8f1f9f 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java +++ b/src/main/java/org/apache/commons/configuration3/tree/ImmutableNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java b/src/main/java/org/apache/commons/configuration3/tree/InMemoryNodeModel.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java rename to src/main/java/org/apache/commons/configuration3/tree/InMemoryNodeModel.java index 4e0c4126f7..871dedeaf1 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java +++ b/src/main/java/org/apache/commons/configuration3/tree/InMemoryNodeModel.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import java.util.ArrayList; import java.util.Collection; @@ -26,7 +26,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicReference; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; import org.apache.commons.lang3.mutable.Mutable; import org.apache.commons.lang3.mutable.MutableObject; diff --git a/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModelSupport.java b/src/main/java/org/apache/commons/configuration3/tree/InMemoryNodeModelSupport.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModelSupport.java rename to src/main/java/org/apache/commons/configuration3/tree/InMemoryNodeModelSupport.java index 15f8e88dc0..d77557ebce 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModelSupport.java +++ b/src/main/java/org/apache/commons/configuration3/tree/InMemoryNodeModelSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.java b/src/main/java/org/apache/commons/configuration3/tree/MergeCombiner.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.java rename to src/main/java/org/apache/commons/configuration3/tree/MergeCombiner.java index f55069a944..9ba0b488ee 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.java +++ b/src/main/java/org/apache/commons/configuration3/tree/MergeCombiner.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java b/src/main/java/org/apache/commons/configuration3/tree/ModelTransaction.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java rename to src/main/java/org/apache/commons/configuration3/tree/ModelTransaction.java index 4c6a14a826..e5ad9043f0 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java +++ b/src/main/java/org/apache/commons/configuration3/tree/ModelTransaction.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/configuration2/tree/NodeAddData.java b/src/main/java/org/apache/commons/configuration3/tree/NodeAddData.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/tree/NodeAddData.java rename to src/main/java/org/apache/commons/configuration3/tree/NodeAddData.java index 27936a4768..9c2ca720db 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/NodeAddData.java +++ b/src/main/java/org/apache/commons/configuration3/tree/NodeAddData.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/configuration2/tree/NodeCombiner.java b/src/main/java/org/apache/commons/configuration3/tree/NodeCombiner.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/tree/NodeCombiner.java rename to src/main/java/org/apache/commons/configuration3/tree/NodeCombiner.java index a051b4ded1..5be809c8fd 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/NodeCombiner.java +++ b/src/main/java/org/apache/commons/configuration3/tree/NodeCombiner.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import java.util.Collections; import java.util.HashSet; diff --git a/src/main/java/org/apache/commons/configuration2/tree/NodeHandler.java b/src/main/java/org/apache/commons/configuration3/tree/NodeHandler.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/tree/NodeHandler.java rename to src/main/java/org/apache/commons/configuration3/tree/NodeHandler.java index 7398d0c5ba..e1de6b20b7 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/NodeHandler.java +++ b/src/main/java/org/apache/commons/configuration3/tree/NodeHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import java.util.List; import java.util.Set; diff --git a/src/main/java/org/apache/commons/configuration2/tree/NodeHandlerDecorator.java b/src/main/java/org/apache/commons/configuration3/tree/NodeHandlerDecorator.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/tree/NodeHandlerDecorator.java rename to src/main/java/org/apache/commons/configuration3/tree/NodeHandlerDecorator.java index 6ea38401f4..dbadb8526d 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/NodeHandlerDecorator.java +++ b/src/main/java/org/apache/commons/configuration3/tree/NodeHandlerDecorator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import java.util.List; import java.util.Set; diff --git a/src/main/java/org/apache/commons/configuration2/tree/NodeKeyResolver.java b/src/main/java/org/apache/commons/configuration3/tree/NodeKeyResolver.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/tree/NodeKeyResolver.java rename to src/main/java/org/apache/commons/configuration3/tree/NodeKeyResolver.java index acab18954d..51a71646cf 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/NodeKeyResolver.java +++ b/src/main/java/org/apache/commons/configuration3/tree/NodeKeyResolver.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/apache/commons/configuration2/tree/NodeMatcher.java b/src/main/java/org/apache/commons/configuration3/tree/NodeMatcher.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/tree/NodeMatcher.java rename to src/main/java/org/apache/commons/configuration3/tree/NodeMatcher.java index 22283a2e62..6d555ef843 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/NodeMatcher.java +++ b/src/main/java/org/apache/commons/configuration3/tree/NodeMatcher.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/tree/NodeModel.java b/src/main/java/org/apache/commons/configuration3/tree/NodeModel.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/tree/NodeModel.java rename to src/main/java/org/apache/commons/configuration3/tree/NodeModel.java index 6dce72235f..63af9bf63b 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/NodeModel.java +++ b/src/main/java/org/apache/commons/configuration3/tree/NodeModel.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/configuration2/tree/NodeModelSupport.java b/src/main/java/org/apache/commons/configuration3/tree/NodeModelSupport.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/tree/NodeModelSupport.java rename to src/main/java/org/apache/commons/configuration3/tree/NodeModelSupport.java index 603340beac..8820248055 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/NodeModelSupport.java +++ b/src/main/java/org/apache/commons/configuration3/tree/NodeModelSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/tree/NodeNameMatchers.java b/src/main/java/org/apache/commons/configuration3/tree/NodeNameMatchers.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/tree/NodeNameMatchers.java rename to src/main/java/org/apache/commons/configuration3/tree/NodeNameMatchers.java index 28a70e9330..af983dc4a4 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/NodeNameMatchers.java +++ b/src/main/java/org/apache/commons/configuration3/tree/NodeNameMatchers.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/org/apache/commons/configuration2/tree/NodeSelector.java b/src/main/java/org/apache/commons/configuration3/tree/NodeSelector.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/tree/NodeSelector.java rename to src/main/java/org/apache/commons/configuration3/tree/NodeSelector.java index c46832c376..8616770795 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/NodeSelector.java +++ b/src/main/java/org/apache/commons/configuration3/tree/NodeSelector.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java b/src/main/java/org/apache/commons/configuration3/tree/NodeTracker.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java rename to src/main/java/org/apache/commons/configuration3/tree/NodeTracker.java index 5ae348ddeb..c7b9377fca 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java +++ b/src/main/java/org/apache/commons/configuration3/tree/NodeTracker.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import java.util.Collection; import java.util.Collections; @@ -23,7 +23,7 @@ import java.util.Map; import java.util.stream.Collectors; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/tree/NodeTreeWalker.java b/src/main/java/org/apache/commons/configuration3/tree/NodeTreeWalker.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/tree/NodeTreeWalker.java rename to src/main/java/org/apache/commons/configuration3/tree/NodeTreeWalker.java index 5d091850f7..c3ef83e0b1 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/NodeTreeWalker.java +++ b/src/main/java/org/apache/commons/configuration3/tree/NodeTreeWalker.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/org/apache/commons/configuration2/tree/NodeUpdateData.java b/src/main/java/org/apache/commons/configuration3/tree/NodeUpdateData.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/tree/NodeUpdateData.java rename to src/main/java/org/apache/commons/configuration3/tree/NodeUpdateData.java index 359b3abc25..ff046d0af5 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/NodeUpdateData.java +++ b/src/main/java/org/apache/commons/configuration3/tree/NodeUpdateData.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/configuration2/tree/OverrideCombiner.java b/src/main/java/org/apache/commons/configuration3/tree/OverrideCombiner.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/tree/OverrideCombiner.java rename to src/main/java/org/apache/commons/configuration3/tree/OverrideCombiner.java index 84c1ce3c15..a0cecdcc26 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/OverrideCombiner.java +++ b/src/main/java/org/apache/commons/configuration3/tree/OverrideCombiner.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/tree/QueryResult.java b/src/main/java/org/apache/commons/configuration3/tree/QueryResult.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/tree/QueryResult.java rename to src/main/java/org/apache/commons/configuration3/tree/QueryResult.java index a25dc669a2..6943b32784 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/QueryResult.java +++ b/src/main/java/org/apache/commons/configuration3/tree/QueryResult.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/src/main/java/org/apache/commons/configuration2/tree/ReferenceNodeHandler.java b/src/main/java/org/apache/commons/configuration3/tree/ReferenceNodeHandler.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/tree/ReferenceNodeHandler.java rename to src/main/java/org/apache/commons/configuration3/tree/ReferenceNodeHandler.java index a4621eaa18..c8193ed584 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/ReferenceNodeHandler.java +++ b/src/main/java/org/apache/commons/configuration3/tree/ReferenceNodeHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import java.util.List; diff --git a/src/main/java/org/apache/commons/configuration2/tree/ReferenceTracker.java b/src/main/java/org/apache/commons/configuration3/tree/ReferenceTracker.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/tree/ReferenceTracker.java rename to src/main/java/org/apache/commons/configuration3/tree/ReferenceTracker.java index b3f8cceb54..90ed3261d0 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/ReferenceTracker.java +++ b/src/main/java/org/apache/commons/configuration3/tree/ReferenceTracker.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import java.util.Collection; import java.util.Collections; diff --git a/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeHandler.java b/src/main/java/org/apache/commons/configuration3/tree/TrackedNodeHandler.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/tree/TrackedNodeHandler.java rename to src/main/java/org/apache/commons/configuration3/tree/TrackedNodeHandler.java index c9843f6674..8e4872b969 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeHandler.java +++ b/src/main/java/org/apache/commons/configuration3/tree/TrackedNodeHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeModel.java b/src/main/java/org/apache/commons/configuration3/tree/TrackedNodeModel.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/tree/TrackedNodeModel.java rename to src/main/java/org/apache/commons/configuration3/tree/TrackedNodeModel.java index 38a911dab6..54bb340189 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeModel.java +++ b/src/main/java/org/apache/commons/configuration3/tree/TrackedNodeModel.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import java.util.Collection; import java.util.List; diff --git a/src/main/java/org/apache/commons/configuration2/tree/TreeData.java b/src/main/java/org/apache/commons/configuration3/tree/TreeData.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/tree/TreeData.java rename to src/main/java/org/apache/commons/configuration3/tree/TreeData.java index 34801678b0..e652106df3 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/TreeData.java +++ b/src/main/java/org/apache/commons/configuration3/tree/TreeData.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/org/apache/commons/configuration2/tree/TreeUtils.java b/src/main/java/org/apache/commons/configuration3/tree/TreeUtils.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/tree/TreeUtils.java rename to src/main/java/org/apache/commons/configuration3/tree/TreeUtils.java index 25ad7bd363..455396c473 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/TreeUtils.java +++ b/src/main/java/org/apache/commons/configuration3/tree/TreeUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import java.io.PrintStream; diff --git a/src/main/java/org/apache/commons/configuration2/tree/UnionCombiner.java b/src/main/java/org/apache/commons/configuration3/tree/UnionCombiner.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/tree/UnionCombiner.java rename to src/main/java/org/apache/commons/configuration3/tree/UnionCombiner.java index e427aac5f4..e747644ffe 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/UnionCombiner.java +++ b/src/main/java/org/apache/commons/configuration3/tree/UnionCombiner.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/org/apache/commons/configuration2/tree/package-info.java b/src/main/java/org/apache/commons/configuration3/tree/package-info.java similarity index 94% rename from src/main/java/org/apache/commons/configuration2/tree/package-info.java rename to src/main/java/org/apache/commons/configuration3/tree/package-info.java index 8d70b589e5..cd2e6fcc70 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/package-info.java +++ b/src/main/java/org/apache/commons/configuration3/tree/package-info.java @@ -20,4 +20,4 @@ * A package with helper and utility classes used by hierarchical configurations. *

      */ -package org.apache.commons.configuration2.tree; +package org.apache.commons.configuration3.tree; diff --git a/src/main/java/org/apache/commons/configuration2/tree/xpath/AbstractConfigurationNodeIterator.java b/src/main/java/org/apache/commons/configuration3/tree/xpath/AbstractConfigurationNodeIterator.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/tree/xpath/AbstractConfigurationNodeIterator.java rename to src/main/java/org/apache/commons/configuration3/tree/xpath/AbstractConfigurationNodeIterator.java index 38d0ba3139..4ea3f18369 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/xpath/AbstractConfigurationNodeIterator.java +++ b/src/main/java/org/apache/commons/configuration3/tree/xpath/AbstractConfigurationNodeIterator.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree.xpath; +package org.apache.commons.configuration3.tree.xpath; -import org.apache.commons.configuration2.tree.NodeHandler; +import org.apache.commons.configuration3.tree.NodeHandler; import org.apache.commons.jxpath.ri.QName; import org.apache.commons.jxpath.ri.model.NodeIterator; import org.apache.commons.jxpath.ri.model.NodePointer; diff --git a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationAttributePointer.java b/src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationAttributePointer.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationAttributePointer.java rename to src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationAttributePointer.java index 6d1e172f13..5b60e7e62e 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationAttributePointer.java +++ b/src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationAttributePointer.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree.xpath; +package org.apache.commons.configuration3.tree.xpath; -import org.apache.commons.configuration2.tree.NodeHandler; -import org.apache.commons.configuration2.tree.QueryResult; +import org.apache.commons.configuration3.tree.NodeHandler; +import org.apache.commons.configuration3.tree.QueryResult; import org.apache.commons.jxpath.ri.Compiler; import org.apache.commons.jxpath.ri.QName; import org.apache.commons.jxpath.ri.compiler.NodeTest; diff --git a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java b/src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationNodeIteratorAttribute.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java rename to src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationNodeIteratorAttribute.java index dde987a590..b19d5706c5 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java +++ b/src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationNodeIteratorAttribute.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree.xpath; +package org.apache.commons.configuration3.tree.xpath; import java.util.ArrayList; import java.util.LinkedHashSet; diff --git a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java b/src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationNodeIteratorChildren.java similarity index 99% rename from src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java rename to src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationNodeIteratorChildren.java index 32e46be011..9d5f8d2b42 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java +++ b/src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationNodeIteratorChildren.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree.xpath; +package org.apache.commons.configuration3.tree.xpath; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointer.java b/src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationNodePointer.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointer.java rename to src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationNodePointer.java index 6f24428f4c..428b3e7fd7 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointer.java +++ b/src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationNodePointer.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree.xpath; +package org.apache.commons.configuration3.tree.xpath; import java.util.Locale; -import org.apache.commons.configuration2.tree.NodeHandler; +import org.apache.commons.configuration3.tree.NodeHandler; import org.apache.commons.jxpath.ri.Compiler; import org.apache.commons.jxpath.ri.QName; import org.apache.commons.jxpath.ri.compiler.NodeTest; diff --git a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java b/src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationNodePointerFactory.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java rename to src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationNodePointerFactory.java index 54d1b16143..ba53753e15 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java +++ b/src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationNodePointerFactory.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree.xpath; +package org.apache.commons.configuration3.tree.xpath; import java.util.Locale; -import org.apache.commons.configuration2.tree.NodeHandler; +import org.apache.commons.configuration3.tree.NodeHandler; import org.apache.commons.jxpath.ri.QName; import org.apache.commons.jxpath.ri.model.NodePointer; import org.apache.commons.jxpath.ri.model.NodePointerFactory; diff --git a/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathContextFactory.java b/src/main/java/org/apache/commons/configuration3/tree/xpath/XPathContextFactory.java similarity index 93% rename from src/main/java/org/apache/commons/configuration2/tree/xpath/XPathContextFactory.java rename to src/main/java/org/apache/commons/configuration3/tree/xpath/XPathContextFactory.java index 29f36a516d..29e407081a 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathContextFactory.java +++ b/src/main/java/org/apache/commons/configuration3/tree/xpath/XPathContextFactory.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree.xpath; +package org.apache.commons.configuration3.tree.xpath; -import org.apache.commons.configuration2.tree.NodeHandler; +import org.apache.commons.configuration3.tree.NodeHandler; import org.apache.commons.jxpath.JXPathContext; /** diff --git a/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java b/src/main/java/org/apache/commons/configuration3/tree/xpath/XPathExpressionEngine.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java rename to src/main/java/org/apache/commons/configuration3/tree/xpath/XPathExpressionEngine.java index a6dfb130f6..1bf18a2bab 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java +++ b/src/main/java/org/apache/commons/configuration3/tree/xpath/XPathExpressionEngine.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.tree.xpath; +package org.apache.commons.configuration3.tree.xpath; import java.util.Collections; import java.util.LinkedList; @@ -22,10 +22,10 @@ import java.util.StringTokenizer; import java.util.stream.Collectors; -import org.apache.commons.configuration2.tree.ExpressionEngine; -import org.apache.commons.configuration2.tree.NodeAddData; -import org.apache.commons.configuration2.tree.NodeHandler; -import org.apache.commons.configuration2.tree.QueryResult; +import org.apache.commons.configuration3.tree.ExpressionEngine; +import org.apache.commons.configuration3.tree.NodeAddData; +import org.apache.commons.configuration3.tree.NodeHandler; +import org.apache.commons.configuration3.tree.QueryResult; import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl; import org.apache.commons.lang3.StringUtils; @@ -182,7 +182,7 @@ public List> query(final T root, final String key, final Node /** * {@inheritDoc} This implementation creates an XPATH expression that selects the given node (under the assumption that * the passed in parent key is valid). As the {@code nodeKey()} implementation of - * {@link org.apache.commons.configuration2.tree.DefaultExpressionEngine DefaultExpressionEngine} this method does not + * {@link org.apache.commons.configuration3.tree.DefaultExpressionEngine DefaultExpressionEngine} this method does not * return indices for nodes. So all child nodes of a given parent with the same name have the same key. */ @Override diff --git a/src/main/java/org/apache/commons/configuration2/tree/xpath/package-info.java b/src/main/java/org/apache/commons/configuration3/tree/xpath/package-info.java similarity index 94% rename from src/main/java/org/apache/commons/configuration2/tree/xpath/package-info.java rename to src/main/java/org/apache/commons/configuration3/tree/xpath/package-info.java index 5b94d345b5..295b089249 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/xpath/package-info.java +++ b/src/main/java/org/apache/commons/configuration3/tree/xpath/package-info.java @@ -21,4 +21,4 @@ * properties. *

      */ -package org.apache.commons.configuration2.tree.xpath; +package org.apache.commons.configuration3.tree.xpath; diff --git a/src/main/java/org/apache/commons/configuration2/web/AppletConfiguration.java b/src/main/java/org/apache/commons/configuration3/web/AppletConfiguration.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/web/AppletConfiguration.java rename to src/main/java/org/apache/commons/configuration3/web/AppletConfiguration.java index 511bb6467b..a71029beac 100644 --- a/src/main/java/org/apache/commons/configuration2/web/AppletConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/web/AppletConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2.web; +package org.apache.commons.configuration3.web; import java.applet.Applet; import java.util.Arrays; diff --git a/src/main/java/org/apache/commons/configuration2/web/BaseWebConfiguration.java b/src/main/java/org/apache/commons/configuration3/web/BaseWebConfiguration.java similarity index 96% rename from src/main/java/org/apache/commons/configuration2/web/BaseWebConfiguration.java rename to src/main/java/org/apache/commons/configuration3/web/BaseWebConfiguration.java index 9834e90554..f066ea9e76 100644 --- a/src/main/java/org/apache/commons/configuration2/web/BaseWebConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/web/BaseWebConfiguration.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.web; +package org.apache.commons.configuration3.web; import java.util.Collection; -import org.apache.commons.configuration2.AbstractConfiguration; +import org.apache.commons.configuration3.AbstractConfiguration; /** *

      diff --git a/src/main/java/org/apache/commons/configuration2/web/ServletConfiguration.java b/src/main/java/org/apache/commons/configuration3/web/ServletConfiguration.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/web/ServletConfiguration.java rename to src/main/java/org/apache/commons/configuration3/web/ServletConfiguration.java index 188054b205..b20b69e18e 100644 --- a/src/main/java/org/apache/commons/configuration2/web/ServletConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/web/ServletConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2.web; +package org.apache.commons.configuration3.web; import java.util.Collections; import java.util.Enumeration; diff --git a/src/main/java/org/apache/commons/configuration2/web/ServletContextConfiguration.java b/src/main/java/org/apache/commons/configuration3/web/ServletContextConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/web/ServletContextConfiguration.java rename to src/main/java/org/apache/commons/configuration3/web/ServletContextConfiguration.java index 16fff0d90e..4fb2ae5ac0 100644 --- a/src/main/java/org/apache/commons/configuration2/web/ServletContextConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/web/ServletContextConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2.web; +package org.apache.commons.configuration3.web; import java.util.Collections; import java.util.Enumeration; diff --git a/src/main/java/org/apache/commons/configuration2/web/ServletFilterConfiguration.java b/src/main/java/org/apache/commons/configuration3/web/ServletFilterConfiguration.java similarity index 97% rename from src/main/java/org/apache/commons/configuration2/web/ServletFilterConfiguration.java rename to src/main/java/org/apache/commons/configuration3/web/ServletFilterConfiguration.java index 06d4499f34..e37517263f 100644 --- a/src/main/java/org/apache/commons/configuration2/web/ServletFilterConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/web/ServletFilterConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2.web; +package org.apache.commons.configuration3.web; import java.util.Collections; import java.util.Enumeration; diff --git a/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java b/src/main/java/org/apache/commons/configuration3/web/ServletRequestConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java rename to src/main/java/org/apache/commons/configuration3/web/ServletRequestConfiguration.java index 3efcf18620..108443fa5d 100644 --- a/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java +++ b/src/main/java/org/apache/commons/configuration3/web/ServletRequestConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2.web; +package org.apache.commons.configuration3.web; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/configuration2/web/package-info.java b/src/main/java/org/apache/commons/configuration3/web/package-info.java similarity index 95% rename from src/main/java/org/apache/commons/configuration2/web/package-info.java rename to src/main/java/org/apache/commons/configuration3/web/package-info.java index 7cbbb7a266..1e2a25d0cd 100644 --- a/src/main/java/org/apache/commons/configuration2/web/package-info.java +++ b/src/main/java/org/apache/commons/configuration3/web/package-info.java @@ -21,4 +21,4 @@ * environments. *

      */ -package org.apache.commons.configuration2.web; +package org.apache.commons.configuration3.web; diff --git a/src/main/javacc/PropertyListParser.jj b/src/main/javacc/PropertyListParser.jj index 317cdf14bb..c3c6de2155 100644 --- a/src/main/javacc/PropertyListParser.jj +++ b/src/main/javacc/PropertyListParser.jj @@ -22,14 +22,14 @@ options { PARSER_BEGIN(PropertyListParser) -package org.apache.commons.configuration2.plist; +package org.apache.commons.configuration3.plist; import java.util.Date; import java.util.List; import java.util.ArrayList; -import org.apache.commons.configuration2.HierarchicalConfiguration; -import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration3.HierarchicalConfiguration; +import org.apache.commons.configuration3.tree.ImmutableNode; import org.apache.commons.codec.binary.Hex; diff --git a/src/site/xdoc/userguide/howto_basicfeatures.xml b/src/site/xdoc/userguide/howto_basicfeatures.xml index ad06d64960..cb2fe79216 100644 --- a/src/site/xdoc/userguide/howto_basicfeatures.xml +++ b/src/site/xdoc/userguide/howto_basicfeatures.xml @@ -280,14 +280,14 @@ java.home = ${env:JAVA_HOME} 2.8.0, this map was constant. However, starting in version 2.8.0, the lookups included in this map can be optionally configured via system property, allowing users greater control over the types of interpolation performed in their applications. The system property in question is named - org.apache.commons.configuration2.interpol.ConfigurationInterpolator.defaultPrefixLookups + org.apache.commons.configuration3.interpol.ConfigurationInterpolator.defaultPrefixLookups and is expected to contain a comma-separated list of names from the DefaultLookups enum. For example, launching an application with the system property given below will only enable the sys and env lookups.

      It is also important to note that starting in version 2.8.0, several previously enabled @@ -331,7 +331,7 @@ org.apache.commons.configuration2.interpol.ConfigurationInterpolator.defaultPref for the variable passed in:

      + config-class="org.apache.commons.configuration3.interpol.ExprLookup"> @@ -451,7 +451,7 @@ user.file = ${expr:System.getProperty("user.home")}/settings.xml + config-class="org.apache.commons.configuration3.interpol.ExprLookup"> diff --git a/src/site/xdoc/userguide/howto_builders.xml b/src/site/xdoc/userguide/howto_builders.xml index 8667be13dd..6e0a87749c 100644 --- a/src/site/xdoc/userguide/howto_builders.xml +++ b/src/site/xdoc/userguide/howto_builders.xml @@ -140,7 +140,7 @@ PropertiesConfiguration config = builder.getConfiguration(); Basically, initialization parameters are defined by POJOs (plain old Java objects) with properties corresponding to the special properties supported by the configuration object to be created. In the package - org.apache.commons.configuration2.builder.fluent a number + org.apache.commons.configuration3.builder.fluent a number of interfaces is contained defining the possible initialization parameters for the standard Configuration implementations shipped with Commons Configuration. These interfaces form a diff --git a/src/site/xdoc/userguide/howto_combinedbuilder.xml b/src/site/xdoc/userguide/howto_combinedbuilder.xml index 5bbedf4b67..f2cf9fe2a1 100644 --- a/src/site/xdoc/userguide/howto_combinedbuilder.xml +++ b/src/site/xdoc/userguide/howto_combinedbuilder.xml @@ -684,7 +684,7 @@ CombinedConfigurationBuilder builder = configs.combinedBuilder("path/to/definiti config-class="com.foo.MyReloadingDetector" strict=true"/> - + ]]>

      @@ -831,8 +831,8 @@ CombinedConfigurationBuilder builder = configs.combinedBuilder("path/to/definiti - - + + @@ -878,7 +878,7 @@ CombinedConfigurationBuilder builder = configs.combinedBuilder("path/to/definiti

      + config-class="org.apache.commons.configuration3.io.VFSFileSystem"/>
      @@ -1010,9 +1010,9 @@ CombinedConfigurationBuilder builder = configs.combinedBuilder("path/to/definiti
      - + + config-class="org.apache.commons.configuration3.convert.DefaultListDelimiterHandler"> @@ -1196,9 +1196,9 @@ trigger.start(); { diff --git a/src/site/xdoc/userguide/howto_filebased.xml b/src/site/xdoc/userguide/howto_filebased.xml index e7ad160bcf..ea60791c9c 100644 --- a/src/site/xdoc/userguide/howto_filebased.xml +++ b/src/site/xdoc/userguide/howto_filebased.xml @@ -452,11 +452,11 @@ handler.save(out);
      - +
      - + diff --git a/src/site/xdoc/userguide/howto_multitenant.xml b/src/site/xdoc/userguide/howto_multitenant.xml index 7a4bf690b8..09c7f80dd4 100644 --- a/src/site/xdoc/userguide/howto_multitenant.xml +++ b/src/site/xdoc/userguide/howto_multitenant.xml @@ -105,11 +105,11 @@
      - + + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/>
      @@ -118,12 +118,12 @@ config-forceCreate="true" schemaValidation="true"> + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/>       @@ -241,9 +241,9 @@ XMLConfiguration config = builder.getConfiguration();

      + class="org.apache.commons.configuration3.builder.FileBasedConfigurationBuilder"> + value="org.apache.commons.configuration3.XMLConfiguration"/> @@ -258,7 +258,7 @@ XMLConfiguration config = builder.getConfiguration(); factory-method="getConfiguration"> diff --git a/src/site/xdoc/userguide/howto_utilities.xml b/src/site/xdoc/userguide/howto_utilities.xml index 1719bf1e33..ecd6083f28 100644 --- a/src/site/xdoc/userguide/howto_utilities.xml +++ b/src/site/xdoc/userguide/howto_utilities.xml @@ -380,7 +380,7 @@ Configuration config = wrapperFactory.createBuilderConfigurationWrapper( - + diff --git a/src/site/xdoc/userguide/upgradeto2_0.xml b/src/site/xdoc/userguide/upgradeto2_0.xml index cac2ebb80f..0d2d74faea 100644 --- a/src/site/xdoc/userguide/upgradeto2_0.xml +++ b/src/site/xdoc/userguide/upgradeto2_0.xml @@ -80,7 +80,7 @@

      The most obvious change you will notice at the very beginning is that - the root package was renamed to org.apache.commons.configuration2 + the root package was renamed to org.apache.commons.configuration3 - the major version is now part of the package name. This certainly makes migration harder, but it is the only possibility to avoid jar hell. Imagine for a moment that we had kept the old package name. This diff --git a/src/site/xdoc/userguide/upgradeto2_x.xml b/src/site/xdoc/userguide/upgradeto2_x.xml index 8f3a9154b1..d6494559d1 100644 --- a/src/site/xdoc/userguide/upgradeto2_x.xml +++ b/src/site/xdoc/userguide/upgradeto2_x.xml @@ -47,7 +47,7 @@ programmatically or through a system property. If the behavior of previous versions must be maintained exactly without changes to the code, then the following system property can be used: -org.apache.commons.configuration2.interpol.ConfigurationInterpolator.defaultPrefixLookups=BASE64_DECODER,BASE64_ENCODER,CONST,DATE,DNS,ENVIRONMENT,FILE,JAVA,LOCAL_HOST,PROPERTIES,RESOURCE_BUNDLE,SCRIPT,SYSTEM_PROPERTIES,URL,URL_DECODER,URL_ENCODER,XML + org.apache.commons.configuration3.interpol.ConfigurationInterpolator.defaultPrefixLookups=BASE64_DECODER,BASE64_ENCODER,CONST,DATE,DNS,ENVIRONMENT,FILE,JAVA,LOCAL_HOST,PROPERTIES,RESOURCE_BUNDLE,SCRIPT,SYSTEM_PROPERTIES,URL,URL_DECODER,URL_ENCODER,XML If the disabled lookups listed above are not used by the target application, then no changes are required.

      diff --git a/src/test/java/org/apache/commons/configuration2/BaseNonStringProperties.java b/src/test/java/org/apache/commons/configuration3/BaseNonStringProperties.java similarity index 99% rename from src/test/java/org/apache/commons/configuration2/BaseNonStringProperties.java rename to src/test/java/org/apache/commons/configuration3/BaseNonStringProperties.java index f43a733592..662f9f1594 100644 --- a/src/test/java/org/apache/commons/configuration2/BaseNonStringProperties.java +++ b/src/test/java/org/apache/commons/configuration3/BaseNonStringProperties.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/org/apache/commons/configuration2/ConfigurationAssert.java b/src/test/java/org/apache/commons/configuration3/ConfigurationAssert.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/ConfigurationAssert.java rename to src/test/java/org/apache/commons/configuration3/ConfigurationAssert.java index 0f3caaa9ff..fcbc491100 100644 --- a/src/test/java/org/apache/commons/configuration2/ConfigurationAssert.java +++ b/src/test/java/org/apache/commons/configuration3/ConfigurationAssert.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -30,7 +30,7 @@ import java.util.List; import java.util.Set; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; /** * Assertions on configurations for the unit tests. This class also provides access to test files. diff --git a/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java b/src/test/java/org/apache/commons/configuration3/DatabaseConfigurationTestHelper.java similarity index 95% rename from src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java rename to src/test/java/org/apache/commons/configuration3/DatabaseConfigurationTestHelper.java index 7ae9f866f3..4da8457ae1 100644 --- a/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java +++ b/src/test/java/org/apache/commons/configuration3/DatabaseConfigurationTestHelper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.io.File; import java.io.FileInputStream; @@ -22,12 +22,12 @@ import javax.sql.DataSource; -import org.apache.commons.configuration2.builder.BasicConfigurationBuilder; -import org.apache.commons.configuration2.builder.fluent.DatabaseBuilderParameters; -import org.apache.commons.configuration2.builder.fluent.Parameters; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration2.test.HsqlDB; +import org.apache.commons.configuration3.builder.BasicConfigurationBuilder; +import org.apache.commons.configuration3.builder.fluent.DatabaseBuilderParameters; +import org.apache.commons.configuration3.builder.fluent.Parameters; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.test.HsqlDB; import org.apache.commons.dbcp2.BasicDataSource; import org.dbunit.database.DatabaseConnection; import org.dbunit.database.IDatabaseConnection; diff --git a/src/test/java/org/apache/commons/configuration2/EnumFixture.java b/src/test/java/org/apache/commons/configuration3/EnumFixture.java similarity index 95% rename from src/test/java/org/apache/commons/configuration2/EnumFixture.java rename to src/test/java/org/apache/commons/configuration3/EnumFixture.java index 8d0688a136..11b029ed08 100644 --- a/src/test/java/org/apache/commons/configuration2/EnumFixture.java +++ b/src/test/java/org/apache/commons/configuration3/EnumFixture.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; public enum EnumFixture { diff --git a/src/test/java/org/apache/commons/configuration2/FileURLStreamHandler.java b/src/test/java/org/apache/commons/configuration3/FileURLStreamHandler.java similarity index 97% rename from src/test/java/org/apache/commons/configuration2/FileURLStreamHandler.java rename to src/test/java/org/apache/commons/configuration3/FileURLStreamHandler.java index 2c3fee5459..878c5af27d 100644 --- a/src/test/java/org/apache/commons/configuration2/FileURLStreamHandler.java +++ b/src/test/java/org/apache/commons/configuration3/FileURLStreamHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.io.File; import java.io.FileInputStream; diff --git a/src/test/java/org/apache/commons/configuration2/InterpolationTestHelper.java b/src/test/java/org/apache/commons/configuration3/InterpolationTestHelper.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/InterpolationTestHelper.java rename to src/test/java/org/apache/commons/configuration3/InterpolationTestHelper.java index e350f59631..dc0f2d7d0e 100644 --- a/src/test/java/org/apache/commons/configuration2/InterpolationTestHelper.java +++ b/src/test/java/org/apache/commons/configuration3/InterpolationTestHelper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; /** * A helper class that defines a bunch of tests related to variable interpolation. It can be used for running these diff --git a/src/test/java/org/apache/commons/configuration2/Logging.java b/src/test/java/org/apache/commons/configuration3/Logging.java similarity index 99% rename from src/test/java/org/apache/commons/configuration2/Logging.java rename to src/test/java/org/apache/commons/configuration3/Logging.java index 7dd600bd8d..164c256c05 100644 --- a/src/test/java/org/apache/commons/configuration2/Logging.java +++ b/src/test/java/org/apache/commons/configuration3/Logging.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import org.apache.commons.logging.impl.Log4JLogger; import org.apache.log4j.Appender; diff --git a/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java b/src/test/java/org/apache/commons/configuration3/MockInitialContextFactory.java similarity index 99% rename from src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java rename to src/test/java/org/apache/commons/configuration3/MockInitialContextFactory.java index 622c6afe48..25c5f107c0 100644 --- a/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java +++ b/src/test/java/org/apache/commons/configuration3/MockInitialContextFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import javax.naming.*; import javax.naming.spi.InitialContextFactory; diff --git a/src/test/java/org/apache/commons/configuration2/NonCloneableConfiguration.java b/src/test/java/org/apache/commons/configuration3/NonCloneableConfiguration.java similarity index 97% rename from src/test/java/org/apache/commons/configuration2/NonCloneableConfiguration.java rename to src/test/java/org/apache/commons/configuration3/NonCloneableConfiguration.java index 33e611865b..6b206ac6f1 100644 --- a/src/test/java/org/apache/commons/configuration2/NonCloneableConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/NonCloneableConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.util.Iterator; diff --git a/src/test/java/org/apache/commons/configuration2/NonStringTestHolder.java b/src/test/java/org/apache/commons/configuration3/NonStringTestHolder.java similarity index 99% rename from src/test/java/org/apache/commons/configuration2/NonStringTestHolder.java rename to src/test/java/org/apache/commons/configuration3/NonStringTestHolder.java index 2755c5d14b..5ccd668def 100644 --- a/src/test/java/org/apache/commons/configuration2/NonStringTestHolder.java +++ b/src/test/java/org/apache/commons/configuration3/NonStringTestHolder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/src/test/java/org/apache/commons/configuration2/SynchronizerTestImpl.java b/src/test/java/org/apache/commons/configuration3/SynchronizerTestImpl.java similarity index 97% rename from src/test/java/org/apache/commons/configuration2/SynchronizerTestImpl.java rename to src/test/java/org/apache/commons/configuration3/SynchronizerTestImpl.java index 1d6fc51268..387aa73b12 100644 --- a/src/test/java/org/apache/commons/configuration2/SynchronizerTestImpl.java +++ b/src/test/java/org/apache/commons/configuration3/SynchronizerTestImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -22,7 +22,7 @@ import static org.hamcrest.Matchers.startsWith; import static org.junit.jupiter.api.Assertions.assertEquals; -import org.apache.commons.configuration2.sync.Synchronizer; +import org.apache.commons.configuration3.sync.Synchronizer; /** * A test implementation of Synchronizer which allows keeping track about the methods called by the configuration. diff --git a/src/test/java/org/apache/commons/configuration2/TempDirUtils.java b/src/test/java/org/apache/commons/configuration3/TempDirUtils.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/TempDirUtils.java rename to src/test/java/org/apache/commons/configuration3/TempDirUtils.java index 71c2273c2b..ac7742c278 100644 --- a/src/test/java/org/apache/commons/configuration2/TempDirUtils.java +++ b/src/test/java/org/apache/commons/configuration3/TempDirUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import java.io.File; import java.io.IOException; diff --git a/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestAbstractConfiguration.java similarity index 97% rename from src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestAbstractConfiguration.java index b3e3ba24a8..e1b90c3004 100644 --- a/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestAbstractConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; @@ -34,8 +34,8 @@ import java.util.Iterator; import java.util.List; -import org.apache.commons.configuration2.ex.ConversionException; -import org.apache.commons.configuration2.io.ConfigurationLogger; +import org.apache.commons.configuration3.ex.ConversionException; +import org.apache.commons.configuration3.io.ConfigurationLogger; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java b/src/test/java/org/apache/commons/configuration3/TestAbstractConfigurationBasicFeatures.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java rename to src/test/java/org/apache/commons/configuration3/TestAbstractConfigurationBasicFeatures.java index 1af273ed27..0457edcdcb 100644 --- a/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java +++ b/src/test/java/org/apache/commons/configuration3/TestAbstractConfigurationBasicFeatures.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -36,15 +36,15 @@ import java.util.Map; import java.util.NoSuchElementException; -import org.apache.commons.configuration2.convert.ConversionHandler; -import org.apache.commons.configuration2.convert.DefaultConversionHandler; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler; -import org.apache.commons.configuration2.event.ConfigurationEvent; -import org.apache.commons.configuration2.event.EventListener; -import org.apache.commons.configuration2.event.EventType; -import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration2.interpol.Lookup; +import org.apache.commons.configuration3.convert.ConversionHandler; +import org.apache.commons.configuration3.convert.DefaultConversionHandler; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.convert.DisabledListDelimiterHandler; +import org.apache.commons.configuration3.event.ConfigurationEvent; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.event.EventType; +import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration3.interpol.Lookup; import org.apache.commons.lang3.ArrayUtils; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationSynchronization.java b/src/test/java/org/apache/commons/configuration3/TestAbstractConfigurationSynchronization.java similarity index 96% rename from src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationSynchronization.java rename to src/test/java/org/apache/commons/configuration3/TestAbstractConfigurationSynchronization.java index 223044303f..f399e66384 100644 --- a/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationSynchronization.java +++ b/src/test/java/org/apache/commons/configuration3/TestAbstractConfigurationSynchronization.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -28,10 +28,10 @@ import java.util.Collections; -import org.apache.commons.configuration2.SynchronizerTestImpl.Methods; -import org.apache.commons.configuration2.io.FileHandler; -import org.apache.commons.configuration2.sync.LockMode; -import org.apache.commons.configuration2.sync.NoOpSynchronizer; +import org.apache.commons.configuration3.SynchronizerTestImpl.Methods; +import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration3.sync.LockMode; +import org.apache.commons.configuration3.sync.NoOpSynchronizer; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestAbstractHierarchicalConfiguration.java similarity index 97% rename from src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestAbstractHierarchicalConfiguration.java index 247a74bc77..bb257d329b 100644 --- a/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestAbstractHierarchicalConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -37,19 +37,19 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration2.event.ConfigurationEvent; -import org.apache.commons.configuration2.event.EventListener; -import org.apache.commons.configuration2.event.EventListenerTestImpl; -import org.apache.commons.configuration2.tree.DefaultConfigurationKey; -import org.apache.commons.configuration2.tree.DefaultExpressionEngine; -import org.apache.commons.configuration2.tree.DefaultExpressionEngineSymbols; -import org.apache.commons.configuration2.tree.ExpressionEngine; -import org.apache.commons.configuration2.tree.ImmutableNode; -import org.apache.commons.configuration2.tree.InMemoryNodeModel; -import org.apache.commons.configuration2.tree.NodeHandler; -import org.apache.commons.configuration2.tree.NodeModel; -import org.apache.commons.configuration2.tree.NodeStructureHelper; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.event.ConfigurationEvent; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.event.EventListenerTestImpl; +import org.apache.commons.configuration3.tree.DefaultConfigurationKey; +import org.apache.commons.configuration3.tree.DefaultExpressionEngine; +import org.apache.commons.configuration3.tree.DefaultExpressionEngineSymbols; +import org.apache.commons.configuration3.tree.ExpressionEngine; +import org.apache.commons.configuration3.tree.ImmutableNode; +import org.apache.commons.configuration3.tree.InMemoryNodeModel; +import org.apache.commons.configuration3.tree.NodeHandler; +import org.apache.commons.configuration3.tree.NodeModel; +import org.apache.commons.configuration3.tree.NodeStructureHelper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestBaseConfiguration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestBaseConfiguration.java index c974e8ab65..c46339fe57 100644 --- a/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestBaseConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -40,13 +40,13 @@ import java.util.Properties; import java.util.StringTokenizer; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration2.event.ConfigurationEvent; -import org.apache.commons.configuration2.event.EventListener; -import org.apache.commons.configuration2.event.EventListenerTestImpl; -import org.apache.commons.configuration2.ex.ConversionException; -import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration2.interpol.Lookup; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.event.ConfigurationEvent; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.event.EventListenerTestImpl; +import org.apache.commons.configuration3.ex.ConversionException; +import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration3.interpol.Lookup; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java b/src/test/java/org/apache/commons/configuration3/TestBaseConfigurationXMLReader.java similarity index 99% rename from src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java rename to src/test/java/org/apache/commons/configuration3/TestBaseConfigurationXMLReader.java index 245e9a0196..7e7967a2ac 100644 --- a/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java +++ b/src/test/java/org/apache/commons/configuration3/TestBaseConfigurationXMLReader.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/src/test/java/org/apache/commons/configuration2/TestBaseHierarchicalConfigurationSynchronization.java b/src/test/java/org/apache/commons/configuration3/TestBaseHierarchicalConfigurationSynchronization.java similarity index 95% rename from src/test/java/org/apache/commons/configuration2/TestBaseHierarchicalConfigurationSynchronization.java rename to src/test/java/org/apache/commons/configuration3/TestBaseHierarchicalConfigurationSynchronization.java index 7355dea676..f45da82b0e 100644 --- a/src/test/java/org/apache/commons/configuration2/TestBaseHierarchicalConfigurationSynchronization.java +++ b/src/test/java/org/apache/commons/configuration3/TestBaseHierarchicalConfigurationSynchronization.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -31,14 +31,14 @@ import java.util.List; import java.util.concurrent.CountDownLatch; -import org.apache.commons.configuration2.SynchronizerTestImpl.Methods; -import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder; -import org.apache.commons.configuration2.builder.fluent.Parameters; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.io.FileHandler; -import org.apache.commons.configuration2.tree.ImmutableNode; -import org.apache.commons.configuration2.tree.InMemoryNodeModel; -import org.apache.commons.configuration2.tree.NodeStructureHelper; +import org.apache.commons.configuration3.SynchronizerTestImpl.Methods; +import org.apache.commons.configuration3.builder.FileBasedConfigurationBuilder; +import org.apache.commons.configuration3.builder.fluent.Parameters; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration3.tree.ImmutableNode; +import org.apache.commons.configuration3.tree.InMemoryNodeModel; +import org.apache.commons.configuration3.tree.NodeStructureHelper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestBaseNullConfiguration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestBaseNullConfiguration.java index 3eaa61d02d..3178ce6101 100644 --- a/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestBaseNullConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -30,8 +30,8 @@ import java.util.NoSuchElementException; import java.util.Properties; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration2.ex.ConversionException; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.ex.ConversionException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestCatalogResolver.java b/src/test/java/org/apache/commons/configuration3/TestCatalogResolver.java similarity index 91% rename from src/test/java/org/apache/commons/configuration2/TestCatalogResolver.java rename to src/test/java/org/apache/commons/configuration3/TestCatalogResolver.java index cc5387f591..b2b137a471 100644 --- a/src/test/java/org/apache/commons/configuration2/TestCatalogResolver.java +++ b/src/test/java/org/apache/commons/configuration3/TestCatalogResolver.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertSame; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.io.ConfigurationLogger; -import org.apache.commons.configuration2.io.FileHandler; -import org.apache.commons.configuration2.resolver.CatalogResolver; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.ConfigurationLogger; +import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration3.resolver.CatalogResolver; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestCombinedConfiguration.java similarity index 97% rename from src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestCombinedConfiguration.java index 9c161f3e31..ba51dca5cd 100644 --- a/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestCombinedConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -38,23 +38,23 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.commons.configuration2.SynchronizerTestImpl.Methods; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration2.event.ConfigurationEvent; -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.io.FileHandler; -import org.apache.commons.configuration2.sync.LockMode; -import org.apache.commons.configuration2.sync.ReadWriteSynchronizer; -import org.apache.commons.configuration2.sync.Synchronizer; -import org.apache.commons.configuration2.tree.DefaultExpressionEngine; -import org.apache.commons.configuration2.tree.DefaultExpressionEngineSymbols; -import org.apache.commons.configuration2.tree.ImmutableNode; -import org.apache.commons.configuration2.tree.NodeCombiner; -import org.apache.commons.configuration2.tree.NodeModel; -import org.apache.commons.configuration2.tree.OverrideCombiner; -import org.apache.commons.configuration2.tree.UnionCombiner; +import org.apache.commons.configuration3.SynchronizerTestImpl.Methods; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.event.ConfigurationEvent; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration3.sync.LockMode; +import org.apache.commons.configuration3.sync.ReadWriteSynchronizer; +import org.apache.commons.configuration3.sync.Synchronizer; +import org.apache.commons.configuration3.tree.DefaultExpressionEngine; +import org.apache.commons.configuration3.tree.DefaultExpressionEngineSymbols; +import org.apache.commons.configuration3.tree.ImmutableNode; +import org.apache.commons.configuration3.tree.NodeCombiner; +import org.apache.commons.configuration3.tree.NodeModel; +import org.apache.commons.configuration3.tree.OverrideCombiner; +import org.apache.commons.configuration3.tree.UnionCombiner; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestCompositeConfiguration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestCompositeConfiguration.java index 9d605e5367..e27ea0f133 100644 --- a/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestCompositeConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; @@ -37,14 +37,14 @@ import java.util.List; import java.util.NoSuchElementException; -import org.apache.commons.configuration2.SynchronizerTestImpl.Methods; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration2.convert.LegacyListDelimiterHandler; -import org.apache.commons.configuration2.convert.ListDelimiterHandler; -import org.apache.commons.configuration2.event.ConfigurationEvent; -import org.apache.commons.configuration2.event.EventListenerTestImpl; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration3.SynchronizerTestImpl.Methods; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.convert.LegacyListDelimiterHandler; +import org.apache.commons.configuration3.convert.ListDelimiterHandler; +import org.apache.commons.configuration3.event.ConfigurationEvent; +import org.apache.commons.configuration3.event.EventListenerTestImpl; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.io.FileHandler; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestCompositeConfigurationNonStringProperties.java b/src/test/java/org/apache/commons/configuration3/TestCompositeConfigurationNonStringProperties.java similarity index 94% rename from src/test/java/org/apache/commons/configuration2/TestCompositeConfigurationNonStringProperties.java rename to src/test/java/org/apache/commons/configuration3/TestCompositeConfigurationNonStringProperties.java index 3450491c6c..f84ea7daf5 100644 --- a/src/test/java/org/apache/commons/configuration2/TestCompositeConfigurationNonStringProperties.java +++ b/src/test/java/org/apache/commons/configuration3/TestCompositeConfigurationNonStringProperties.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; -import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration3.io.FileHandler; import org.junit.jupiter.api.BeforeEach; /** diff --git a/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java b/src/test/java/org/apache/commons/configuration3/TestConfigurationConverter.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java rename to src/test/java/org/apache/commons/configuration3/TestConfigurationConverter.java index f2f2fa8205..bdc49a46c6 100644 --- a/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java +++ b/src/test/java/org/apache/commons/configuration3/TestConfigurationConverter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -27,7 +27,7 @@ import java.util.Map; import java.util.Properties; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration2/TestConfigurationLookup.java b/src/test/java/org/apache/commons/configuration3/TestConfigurationLookup.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/TestConfigurationLookup.java rename to src/test/java/org/apache/commons/configuration3/TestConfigurationLookup.java index a49082fb03..479b9e411f 100644 --- a/src/test/java/org/apache/commons/configuration2/TestConfigurationLookup.java +++ b/src/test/java/org/apache/commons/configuration3/TestConfigurationLookup.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertIterableEquals; diff --git a/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java b/src/test/java/org/apache/commons/configuration3/TestConfigurationMap.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java rename to src/test/java/org/apache/commons/configuration3/TestConfigurationMap.java index 21f7bd53fb..fb32458a3c 100644 --- a/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java +++ b/src/test/java/org/apache/commons/configuration3/TestConfigurationMap.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java b/src/test/java/org/apache/commons/configuration3/TestConfigurationSet.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java rename to src/test/java/org/apache/commons/configuration3/TestConfigurationSet.java index 630795011e..3d2ce092e6 100644 --- a/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java +++ b/src/test/java/org/apache/commons/configuration3/TestConfigurationSet.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java b/src/test/java/org/apache/commons/configuration3/TestConfigurationUtils.java similarity index 95% rename from src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java rename to src/test/java/org/apache/commons/configuration3/TestConfigurationUtils.java index 6147ebb246..3185c68bb3 100644 --- a/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java +++ b/src/test/java/org/apache/commons/configuration3/TestConfigurationUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -32,18 +32,18 @@ import java.util.List; import java.util.Map; -import org.apache.commons.configuration2.builder.XMLBuilderParametersImpl; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration2.event.ConfigurationErrorEvent; -import org.apache.commons.configuration2.event.ConfigurationEvent; -import org.apache.commons.configuration2.event.EventListener; -import org.apache.commons.configuration2.event.EventSource; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration2.sync.NoOpSynchronizer; -import org.apache.commons.configuration2.tree.DefaultExpressionEngine; -import org.apache.commons.configuration2.tree.DefaultExpressionEngineSymbols; -import org.apache.commons.configuration2.tree.ExpressionEngine; -import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration3.builder.XMLBuilderParametersImpl; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.event.ConfigurationErrorEvent; +import org.apache.commons.configuration3.event.ConfigurationEvent; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.event.EventSource; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.sync.NoOpSynchronizer; +import org.apache.commons.configuration3.tree.DefaultExpressionEngine; +import org.apache.commons.configuration3.tree.DefaultExpressionEngineSymbols; +import org.apache.commons.configuration3.tree.ExpressionEngine; +import org.apache.commons.configuration3.tree.ImmutableNode; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -90,7 +90,7 @@ private static class NonCloneableSynchronizer extends SynchronizerTestImpl { } /** Constant for the name of a class to be loaded. */ - private static final String CLS_NAME = "org.apache.commons.configuration2.PropertiesConfiguration"; + private static final String CLS_NAME = "org.apache.commons.configuration3.PropertiesConfiguration"; /** Stores the CCL. */ private ClassLoader ccl; diff --git a/src/test/java/org/apache/commons/configuration2/TestDataConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestDataConfiguration.java similarity index 99% rename from src/test/java/org/apache/commons/configuration2/TestDataConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestDataConfiguration.java index c3d3a84f61..fb6cbdc328 100644 --- a/src/test/java/org/apache/commons/configuration2/TestDataConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestDataConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -46,9 +46,9 @@ import java.util.Locale; import java.util.NoSuchElementException; -import org.apache.commons.configuration2.convert.DefaultConversionHandler; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration2.ex.ConversionException; +import org.apache.commons.configuration3.convert.DefaultConversionHandler; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.ex.ConversionException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestDatabaseConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestDatabaseConfiguration.java similarity index 97% rename from src/test/java/org/apache/commons/configuration2/TestDatabaseConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestDatabaseConfiguration.java index 74de7b6f1d..7df76ba6a7 100644 --- a/src/test/java/org/apache/commons/configuration2/TestDatabaseConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestDatabaseConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; @@ -38,13 +38,13 @@ import javax.sql.DataSource; -import org.apache.commons.configuration2.builder.fluent.DatabaseBuilderParameters; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration2.event.ConfigurationErrorEvent; -import org.apache.commons.configuration2.event.ConfigurationEvent; -import org.apache.commons.configuration2.event.ErrorListenerTestImpl; -import org.apache.commons.configuration2.event.EventType; -import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration3.builder.fluent.DatabaseBuilderParameters; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.event.ConfigurationErrorEvent; +import org.apache.commons.configuration3.event.ConfigurationEvent; +import org.apache.commons.configuration3.event.ErrorListenerTestImpl; +import org.apache.commons.configuration3.event.EventType; +import org.apache.commons.configuration3.ex.ConfigurationException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestDefaultImmutableConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestDefaultImmutableConfiguration.java similarity index 99% rename from src/test/java/org/apache/commons/configuration2/TestDefaultImmutableConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestDefaultImmutableConfiguration.java index d16162bc50..7515e6a3e6 100644 --- a/src/test/java/org/apache/commons/configuration2/TestDefaultImmutableConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestDefaultImmutableConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -32,7 +32,7 @@ import java.util.Objects; import java.util.Properties; -import org.apache.commons.configuration2.ex.ConversionException; +import org.apache.commons.configuration3.ex.ConversionException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestDynamicCombinedConfiguration.java similarity index 93% rename from src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestDynamicCombinedConfiguration.java index f4b3666834..bc6d7aa100 100644 --- a/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestDynamicCombinedConfiguration.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; -import static org.apache.commons.configuration2.TempDirUtils.newFile; +import static org.apache.commons.configuration3.TempDirUtils.newFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -30,24 +30,24 @@ import java.nio.file.StandardCopyOption; import java.util.Random; -import org.apache.commons.configuration2.SynchronizerTestImpl.Methods; -import org.apache.commons.configuration2.builder.BuilderConfigurationWrapperFactory; -import org.apache.commons.configuration2.builder.ConfigurationBuilder; -import org.apache.commons.configuration2.builder.CopyObjectDefaultHandler; -import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl; -import org.apache.commons.configuration2.builder.FileBasedBuilderProperties; -import org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder; -import org.apache.commons.configuration2.builder.combined.MultiFileConfigurationBuilder; -import org.apache.commons.configuration2.builder.combined.ReloadingCombinedConfigurationBuilder; -import org.apache.commons.configuration2.builder.fluent.Parameters; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration2.interpol.Lookup; -import org.apache.commons.configuration2.io.FileHandler; -import org.apache.commons.configuration2.sync.LockMode; -import org.apache.commons.configuration2.sync.ReadWriteSynchronizer; -import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine; +import org.apache.commons.configuration3.SynchronizerTestImpl.Methods; +import org.apache.commons.configuration3.builder.BuilderConfigurationWrapperFactory; +import org.apache.commons.configuration3.builder.ConfigurationBuilder; +import org.apache.commons.configuration3.builder.CopyObjectDefaultHandler; +import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; +import org.apache.commons.configuration3.builder.FileBasedBuilderProperties; +import org.apache.commons.configuration3.builder.combined.CombinedConfigurationBuilder; +import org.apache.commons.configuration3.builder.combined.MultiFileConfigurationBuilder; +import org.apache.commons.configuration3.builder.combined.ReloadingCombinedConfigurationBuilder; +import org.apache.commons.configuration3.builder.fluent.Parameters; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration3.interpol.Lookup; +import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration3.sync.LockMode; +import org.apache.commons.configuration3.sync.ReadWriteSynchronizer; +import org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestEnvironmentConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestEnvironmentConfiguration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/TestEnvironmentConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestEnvironmentConfiguration.java index bf1d8bca7d..6a0b858ee6 100644 --- a/src/test/java/org/apache/commons/configuration2/TestEnvironmentConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestEnvironmentConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/org/apache/commons/configuration2/TestEqualBehavior.java b/src/test/java/org/apache/commons/configuration3/TestEqualBehavior.java similarity index 96% rename from src/test/java/org/apache/commons/configuration2/TestEqualBehavior.java rename to src/test/java/org/apache/commons/configuration3/TestEqualBehavior.java index 29c573fbab..98cdd3d0e0 100644 --- a/src/test/java/org/apache/commons/configuration2/TestEqualBehavior.java +++ b/src/test/java/org/apache/commons/configuration3/TestEqualBehavior.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -26,10 +26,10 @@ import java.util.Iterator; import java.util.List; -import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl; -import org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; +import org.apache.commons.configuration3.builder.combined.CombinedConfigurationBuilder; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.FileHandler; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration2/TestEqualsProperty.java b/src/test/java/org/apache/commons/configuration3/TestEqualsProperty.java similarity index 93% rename from src/test/java/org/apache/commons/configuration2/TestEqualsProperty.java rename to src/test/java/org/apache/commons/configuration3/TestEqualsProperty.java index 1d3b5fc039..312883f40e 100644 --- a/src/test/java/org/apache/commons/configuration2/TestEqualsProperty.java +++ b/src/test/java/org/apache/commons/configuration3/TestEqualsProperty.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; -import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration3.io.FileHandler; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestHierarchicalConfiguration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/TestHierarchicalConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestHierarchicalConfiguration.java index 0f07c7a22b..6dfdffc7f7 100644 --- a/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestHierarchicalConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; @@ -26,12 +26,12 @@ import java.util.Collection; import java.util.List; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration2.tree.DefaultConfigurationKey; -import org.apache.commons.configuration2.tree.DefaultExpressionEngine; -import org.apache.commons.configuration2.tree.ImmutableNode; -import org.apache.commons.configuration2.tree.NodeStructureHelper; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.tree.DefaultConfigurationKey; +import org.apache.commons.configuration3.tree.DefaultExpressionEngine; +import org.apache.commons.configuration3.tree.ImmutableNode; +import org.apache.commons.configuration3.tree.NodeStructureHelper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfigurationXMLReader.java b/src/test/java/org/apache/commons/configuration3/TestHierarchicalConfigurationXMLReader.java similarity index 94% rename from src/test/java/org/apache/commons/configuration2/TestHierarchicalConfigurationXMLReader.java rename to src/test/java/org/apache/commons/configuration3/TestHierarchicalConfigurationXMLReader.java index 07c86a94e5..8df13de97a 100644 --- a/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfigurationXMLReader.java +++ b/src/test/java/org/apache/commons/configuration3/TestHierarchicalConfigurationXMLReader.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -24,8 +24,8 @@ import javax.xml.transform.dom.DOMResult; import javax.xml.transform.sax.SAXSource; -import org.apache.commons.configuration2.io.FileHandler; -import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration3.tree.ImmutableNode; import org.apache.commons.jxpath.JXPathContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestHierarchicalXMLConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestHierarchicalXMLConfiguration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/TestHierarchicalXMLConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestHierarchicalXMLConfiguration.java index 3a81a6f78c..a92510bfad 100644 --- a/src/test/java/org/apache/commons/configuration2/TestHierarchicalXMLConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestHierarchicalXMLConfiguration.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; -import static org.apache.commons.configuration2.TempDirUtils.newFile; +import static org.apache.commons.configuration3.TempDirUtils.newFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertInstanceOf; @@ -28,7 +28,7 @@ import java.util.Collection; import java.util.Iterator; -import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration3.io.FileHandler; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestINIConfiguration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestINIConfiguration.java index f9b1976457..c0e007d02f 100644 --- a/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestINIConfiguration.java @@ -15,9 +15,9 @@ * the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; -import static org.apache.commons.configuration2.TempDirUtils.newFile; +import static org.apache.commons.configuration3.TempDirUtils.newFile; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -43,18 +43,18 @@ import java.util.Set; import java.util.stream.Stream; -import org.apache.commons.configuration2.SynchronizerTestImpl.Methods; -import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl; -import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder; -import org.apache.commons.configuration2.builder.fluent.Parameters; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.sync.ReadWriteSynchronizer; -import org.apache.commons.configuration2.tree.DefaultExpressionEngine; -import org.apache.commons.configuration2.tree.DefaultExpressionEngineSymbols; -import org.apache.commons.configuration2.tree.ImmutableNode; -import org.apache.commons.configuration2.tree.NodeHandler; -import org.apache.commons.configuration2.tree.NodeNameMatchers; +import org.apache.commons.configuration3.SynchronizerTestImpl.Methods; +import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; +import org.apache.commons.configuration3.builder.FileBasedConfigurationBuilder; +import org.apache.commons.configuration3.builder.fluent.Parameters; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.sync.ReadWriteSynchronizer; +import org.apache.commons.configuration3.tree.DefaultExpressionEngine; +import org.apache.commons.configuration3.tree.DefaultExpressionEngineSymbols; +import org.apache.commons.configuration3.tree.ImmutableNode; +import org.apache.commons.configuration3.tree.NodeHandler; +import org.apache.commons.configuration3.tree.NodeNameMatchers; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/org/apache/commons/configuration2/TestImmutableConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestImmutableConfiguration.java similarity index 97% rename from src/test/java/org/apache/commons/configuration2/TestImmutableConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestImmutableConfiguration.java index fc527a2607..5bf596ad69 100644 --- a/src/test/java/org/apache/commons/configuration2/TestImmutableConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestImmutableConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; @@ -28,9 +28,9 @@ import java.util.NoSuchElementException; import java.util.Set; -import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl; -import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder; -import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; +import org.apache.commons.configuration3.builder.FileBasedConfigurationBuilder; +import org.apache.commons.configuration3.ex.ConfigurationException; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration2/TestJNDIConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestJNDIConfiguration.java similarity index 97% rename from src/test/java/org/apache/commons/configuration2/TestJNDIConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestJNDIConfiguration.java index 1c0ddf062e..fb6d346bd6 100644 --- a/src/test/java/org/apache/commons/configuration2/TestJNDIConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestJNDIConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -34,10 +34,10 @@ import javax.naming.NameNotFoundException; import javax.naming.NamingException; -import org.apache.commons.configuration2.event.ConfigurationErrorEvent; -import org.apache.commons.configuration2.event.ErrorListenerTestImpl; -import org.apache.commons.configuration2.event.EventListener; -import org.apache.commons.configuration2.event.EventType; +import org.apache.commons.configuration3.event.ConfigurationErrorEvent; +import org.apache.commons.configuration3.event.ErrorListenerTestImpl; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.event.EventType; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestJNDIEnvironmentValues.java b/src/test/java/org/apache/commons/configuration3/TestJNDIEnvironmentValues.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/TestJNDIEnvironmentValues.java rename to src/test/java/org/apache/commons/configuration3/TestJNDIEnvironmentValues.java index 3f0160ddfa..88120108a8 100644 --- a/src/test/java/org/apache/commons/configuration2/TestJNDIEnvironmentValues.java +++ b/src/test/java/org/apache/commons/configuration3/TestJNDIEnvironmentValues.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/src/test/java/org/apache/commons/configuration2/TestJSONConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestJSONConfiguration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/TestJSONConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestJSONConfiguration.java index 7fd70b12e2..b33f46c4b2 100644 --- a/src/test/java/org/apache/commons/configuration2/TestJSONConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestJSONConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration3.ex.ConfigurationException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestMapConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestMapConfiguration.java similarity index 94% rename from src/test/java/org/apache/commons/configuration2/TestMapConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestMapConfiguration.java index c447e6545b..669f4d52ed 100644 --- a/src/test/java/org/apache/commons/configuration2/TestMapConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestMapConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -25,10 +25,10 @@ import java.util.List; import java.util.Map; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler; -import org.apache.commons.configuration2.event.ConfigurationEvent; -import org.apache.commons.configuration2.event.EventListenerTestImpl; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.convert.DisabledListDelimiterHandler; +import org.apache.commons.configuration3.event.ConfigurationEvent; +import org.apache.commons.configuration3.event.EventListenerTestImpl; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration2/TestNonStringProperties.java b/src/test/java/org/apache/commons/configuration3/TestNonStringProperties.java similarity index 93% rename from src/test/java/org/apache/commons/configuration2/TestNonStringProperties.java rename to src/test/java/org/apache/commons/configuration3/TestNonStringProperties.java index 021d4f1ef6..7d9dbf2b6d 100644 --- a/src/test/java/org/apache/commons/configuration2/TestNonStringProperties.java +++ b/src/test/java/org/apache/commons/configuration3/TestNonStringProperties.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; -import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration3.io.FileHandler; import org.junit.jupiter.api.BeforeEach; /** diff --git a/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestNullCompositeConfiguration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestNullCompositeConfiguration.java index 0c5b65bed8..1b8cc8ede0 100644 --- a/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestNullCompositeConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -30,9 +30,9 @@ import java.util.Iterator; import java.util.List; -import org.apache.commons.configuration2.convert.LegacyListDelimiterHandler; -import org.apache.commons.configuration2.convert.ListDelimiterHandler; -import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration3.convert.LegacyListDelimiterHandler; +import org.apache.commons.configuration3.convert.ListDelimiterHandler; +import org.apache.commons.configuration3.io.FileHandler; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestNullJNDIEnvironmentValues.java b/src/test/java/org/apache/commons/configuration3/TestNullJNDIEnvironmentValues.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/TestNullJNDIEnvironmentValues.java rename to src/test/java/org/apache/commons/configuration3/TestNullJNDIEnvironmentValues.java index c45647f063..ba7a01a91e 100644 --- a/src/test/java/org/apache/commons/configuration2/TestNullJNDIEnvironmentValues.java +++ b/src/test/java/org/apache/commons/configuration3/TestNullJNDIEnvironmentValues.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestPatternSubtreeConfiguration.java similarity index 91% rename from src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestPatternSubtreeConfiguration.java index 6217719d3f..9e17e9b91f 100644 --- a/src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestPatternSubtreeConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -23,10 +23,10 @@ import java.io.File; import java.io.StringWriter; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.io.FileHandler; -import org.apache.commons.configuration2.tree.ImmutableNode; -import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration3.tree.ImmutableNode; +import org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfigurationWrapper.java b/src/test/java/org/apache/commons/configuration3/TestPatternSubtreeConfigurationWrapper.java similarity index 96% rename from src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfigurationWrapper.java rename to src/test/java/org/apache/commons/configuration3/TestPatternSubtreeConfigurationWrapper.java index b938939bec..04aa7102c0 100644 --- a/src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfigurationWrapper.java +++ b/src/test/java/org/apache/commons/configuration3/TestPatternSubtreeConfigurationWrapper.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestPropertiesConfiguration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestPropertiesConfiguration.java index da85e4bb36..e6364ef528 100644 --- a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestPropertiesConfiguration.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; -import static org.apache.commons.configuration2.TempDirUtils.newFile; +import static org.apache.commons.configuration3.TempDirUtils.newFile; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; @@ -69,20 +69,20 @@ import java.util.Set; import org.apache.commons.collections.IteratorUtils; -import org.apache.commons.configuration2.SynchronizerTestImpl.Methods; -import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl; -import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder; -import org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder; -import org.apache.commons.configuration2.builder.fluent.Parameters; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler; -import org.apache.commons.configuration2.convert.LegacyListDelimiterHandler; -import org.apache.commons.configuration2.convert.ListDelimiterHandler; -import org.apache.commons.configuration2.event.ConfigurationEvent; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.io.DefaultFileSystem; -import org.apache.commons.configuration2.io.FileHandler; -import org.apache.commons.configuration2.io.FileSystem; +import org.apache.commons.configuration3.SynchronizerTestImpl.Methods; +import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; +import org.apache.commons.configuration3.builder.FileBasedConfigurationBuilder; +import org.apache.commons.configuration3.builder.combined.CombinedConfigurationBuilder; +import org.apache.commons.configuration3.builder.fluent.Parameters; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.convert.DisabledListDelimiterHandler; +import org.apache.commons.configuration3.convert.LegacyListDelimiterHandler; +import org.apache.commons.configuration3.convert.ListDelimiterHandler; +import org.apache.commons.configuration3.event.ConfigurationEvent; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.DefaultFileSystem; +import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration3.io.FileSystem; import org.apache.commons.lang3.mutable.MutableObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java b/src/test/java/org/apache/commons/configuration3/TestPropertiesConfigurationLayout.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java rename to src/test/java/org/apache/commons/configuration3/TestPropertiesConfigurationLayout.java index ee9669d5e5..05ee184bad 100644 --- a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java +++ b/src/test/java/org/apache/commons/configuration3/TestPropertiesConfigurationLayout.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -32,11 +32,11 @@ import java.util.Deque; import java.util.Iterator; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration2.convert.LegacyListDelimiterHandler; -import org.apache.commons.configuration2.event.ConfigurationEvent; -import org.apache.commons.configuration2.event.EventListener; -import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.convert.LegacyListDelimiterHandler; +import org.apache.commons.configuration3.event.ConfigurationEvent; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.ex.ConfigurationException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java b/src/test/java/org/apache/commons/configuration3/TestPropertiesSequence.java similarity index 96% rename from src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java rename to src/test/java/org/apache/commons/configuration3/TestPropertiesSequence.java index db5957d0ea..e05bf7ea36 100644 --- a/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java +++ b/src/test/java/org/apache/commons/configuration3/TestPropertiesSequence.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -23,9 +23,9 @@ import java.util.Iterator; import java.util.List; -import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl; -import org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder; -import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; +import org.apache.commons.configuration3.builder.combined.CombinedConfigurationBuilder; +import org.apache.commons.configuration3.io.FileHandler; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestStrictConfigurationComparator.java b/src/test/java/org/apache/commons/configuration3/TestStrictConfigurationComparator.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/TestStrictConfigurationComparator.java rename to src/test/java/org/apache/commons/configuration3/TestStrictConfigurationComparator.java index aff189050c..42f45edb25 100644 --- a/src/test/java/org/apache/commons/configuration2/TestStrictConfigurationComparator.java +++ b/src/test/java/org/apache/commons/configuration3/TestStrictConfigurationComparator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestSubnodeConfiguration.java similarity index 96% rename from src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestSubnodeConfiguration.java index 8eec56bd08..85ba206dde 100644 --- a/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestSubnodeConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; @@ -35,16 +35,16 @@ import java.util.NoSuchElementException; import java.util.Set; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler; -import org.apache.commons.configuration2.convert.ListDelimiterHandler; -import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration2.tree.ImmutableNode; -import org.apache.commons.configuration2.tree.InMemoryNodeModel; -import org.apache.commons.configuration2.tree.NodeSelector; -import org.apache.commons.configuration2.tree.NodeStructureHelper; -import org.apache.commons.configuration2.tree.TrackedNodeModel; -import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.convert.DisabledListDelimiterHandler; +import org.apache.commons.configuration3.convert.ListDelimiterHandler; +import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration3.tree.ImmutableNode; +import org.apache.commons.configuration3.tree.InMemoryNodeModel; +import org.apache.commons.configuration3.tree.NodeSelector; +import org.apache.commons.configuration3.tree.NodeStructureHelper; +import org.apache.commons.configuration3.tree.TrackedNodeModel; +import org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestSubsetConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestSubsetConfiguration.java similarity index 97% rename from src/test/java/org/apache/commons/configuration2/TestSubsetConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestSubsetConfiguration.java index 4ba245641a..0a44f4f070 100644 --- a/src/test/java/org/apache/commons/configuration2/TestSubsetConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestSubsetConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -33,11 +33,11 @@ import java.util.NoSuchElementException; import java.util.Set; -import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl; -import org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration2.convert.ListDelimiterHandler; -import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; +import org.apache.commons.configuration3.builder.combined.CombinedConfigurationBuilder; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.convert.ListDelimiterHandler; +import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; import org.junit.jupiter.api.Test; /** @@ -343,7 +343,7 @@ protected Iterator getKeysInternal() { Class subsetIteratorClass; try { subsetIteratorClass = Class - .forName("org.apache.commons.configuration2.SubsetConfiguration$SubsetIterator"); + .forName("org.apache.commons.configuration3.SubsetConfiguration$SubsetIterator"); final Constructor ctor = subsetIteratorClass.getDeclaredConstructor(SubsetConfiguration.class, Iterator.class); ctor.setAccessible(true); diff --git a/src/test/java/org/apache/commons/configuration2/TestSystemConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestSystemConfiguration.java similarity index 95% rename from src/test/java/org/apache/commons/configuration2/TestSystemConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestSystemConfiguration.java index 93fb9687a8..0339ecd850 100644 --- a/src/test/java/org/apache/commons/configuration2/TestSystemConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestSystemConfiguration.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; -import static org.apache.commons.configuration2.TempDirUtils.newFile; +import static org.apache.commons.configuration3.TempDirUtils.newFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -27,8 +27,8 @@ import java.util.Properties; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.FileHandler; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/src/test/java/org/apache/commons/configuration2/TestThreesomeConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestThreesomeConfiguration.java similarity index 91% rename from src/test/java/org/apache/commons/configuration2/TestThreesomeConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestThreesomeConfiguration.java index 335354c9b7..6c273446c0 100644 --- a/src/test/java/org/apache/commons/configuration2/TestThreesomeConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestThreesomeConfiguration.java @@ -15,19 +15,19 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import org.apache.commons.configuration2.convert.LegacyListDelimiterHandler; -import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration3.convert.LegacyListDelimiterHandler; +import org.apache.commons.configuration3.io.FileHandler; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; /** - * A base class for testing {@link org.apache.commons.configuration2.BaseHierarchicalConfiguration} extensions. + * A base class for testing {@link org.apache.commons.configuration3.BaseHierarchicalConfiguration} extensions. */ public class TestThreesomeConfiguration { protected Configuration conf; diff --git a/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestXMLConfiguration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestXMLConfiguration.java index 01ba754de7..857e84d74e 100644 --- a/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestXMLConfiguration.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; -import static org.apache.commons.configuration2.TempDirUtils.newFile; +import static org.apache.commons.configuration3.TempDirUtils.newFile; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -46,17 +46,17 @@ import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactoryConfigurationError; -import org.apache.commons.configuration2.SynchronizerTestImpl.Methods; -import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl; -import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.io.FileHandler; -import org.apache.commons.configuration2.resolver.CatalogResolver; -import org.apache.commons.configuration2.tree.ImmutableNode; -import org.apache.commons.configuration2.tree.NodeStructureHelper; -import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine; +import org.apache.commons.configuration3.SynchronizerTestImpl.Methods; +import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; +import org.apache.commons.configuration3.builder.FileBasedConfigurationBuilder; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.convert.DisabledListDelimiterHandler; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration3.resolver.CatalogResolver; +import org.apache.commons.configuration3.tree.ImmutableNode; +import org.apache.commons.configuration3.tree.NodeStructureHelper; +import org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration_605.java b/src/test/java/org/apache/commons/configuration3/TestXMLConfiguration_605.java similarity index 93% rename from src/test/java/org/apache/commons/configuration2/TestXMLConfiguration_605.java rename to src/test/java/org/apache/commons/configuration3/TestXMLConfiguration_605.java index 6c08b39ab3..e0d4c59759 100644 --- a/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration_605.java +++ b/src/test/java/org/apache/commons/configuration3/TestXMLConfiguration_605.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.StringReader; -import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler; -import org.apache.commons.configuration2.convert.LegacyListDelimiterHandler; -import org.apache.commons.configuration2.convert.ListDelimiterHandler; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration3.convert.DisabledListDelimiterHandler; +import org.apache.commons.configuration3.convert.LegacyListDelimiterHandler; +import org.apache.commons.configuration3.convert.ListDelimiterHandler; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.FileHandler; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration2/TestXMLDocumentHelper.java b/src/test/java/org/apache/commons/configuration3/TestXMLDocumentHelper.java similarity index 99% rename from src/test/java/org/apache/commons/configuration2/TestXMLDocumentHelper.java rename to src/test/java/org/apache/commons/configuration3/TestXMLDocumentHelper.java index abd4738c0c..0aa20bc036 100644 --- a/src/test/java/org/apache/commons/configuration2/TestXMLDocumentHelper.java +++ b/src/test/java/org/apache/commons/configuration3/TestXMLDocumentHelper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -44,7 +44,7 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration3.ex.ConfigurationException; import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/src/test/java/org/apache/commons/configuration2/TestXMLListHandling.java b/src/test/java/org/apache/commons/configuration3/TestXMLListHandling.java similarity index 94% rename from src/test/java/org/apache/commons/configuration2/TestXMLListHandling.java rename to src/test/java/org/apache/commons/configuration3/TestXMLListHandling.java index 07492af4ad..69bc2c05d9 100644 --- a/src/test/java/org/apache/commons/configuration2/TestXMLListHandling.java +++ b/src/test/java/org/apache/commons/configuration3/TestXMLListHandling.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; @@ -26,11 +26,11 @@ import java.util.Arrays; import java.util.List; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.convert.DisabledListDelimiterHandler; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.io.FileHandler; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/TestXMLPropertiesConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestXMLPropertiesConfiguration.java similarity index 96% rename from src/test/java/org/apache/commons/configuration2/TestXMLPropertiesConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestXMLPropertiesConfiguration.java index 4cbeed0732..f8ce273c39 100644 --- a/src/test/java/org/apache/commons/configuration2/TestXMLPropertiesConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestXMLPropertiesConfiguration.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; -import static org.apache.commons.configuration2.TempDirUtils.newFile; +import static org.apache.commons.configuration3.TempDirUtils.newFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -32,8 +32,8 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.FileHandler; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import org.w3c.dom.Document; diff --git a/src/test/java/org/apache/commons/configuration2/TestYAMLConfiguration.java b/src/test/java/org/apache/commons/configuration3/TestYAMLConfiguration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/TestYAMLConfiguration.java rename to src/test/java/org/apache/commons/configuration3/TestYAMLConfiguration.java index fca46f2481..f7e4cfa92e 100644 --- a/src/test/java/org/apache/commons/configuration2/TestYAMLConfiguration.java +++ b/src/test/java/org/apache/commons/configuration3/TestYAMLConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2; +package org.apache.commons.configuration3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -33,7 +33,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration3.ex.ConfigurationException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestBean.java b/src/test/java/org/apache/commons/configuration3/beanutils/BeanCreationTestBean.java similarity index 96% rename from src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestBean.java rename to src/test/java/org/apache/commons/configuration3/beanutils/BeanCreationTestBean.java index 5e0690e9b3..6f14b4fb8b 100644 --- a/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestBean.java +++ b/src/test/java/org/apache/commons/configuration3/beanutils/BeanCreationTestBean.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.beanutils; +package org.apache.commons.configuration3.beanutils; /** * A simple bean class used for testing bean creation operations. diff --git a/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestBeanWithListChild.java b/src/test/java/org/apache/commons/configuration3/beanutils/BeanCreationTestBeanWithListChild.java similarity index 97% rename from src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestBeanWithListChild.java rename to src/test/java/org/apache/commons/configuration3/beanutils/BeanCreationTestBeanWithListChild.java index 2cdb350f15..53dec639b4 100644 --- a/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestBeanWithListChild.java +++ b/src/test/java/org/apache/commons/configuration3/beanutils/BeanCreationTestBeanWithListChild.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.beanutils; +package org.apache.commons.configuration3.beanutils; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestCtorBean.java b/src/test/java/org/apache/commons/configuration3/beanutils/BeanCreationTestCtorBean.java similarity index 96% rename from src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestCtorBean.java rename to src/test/java/org/apache/commons/configuration3/beanutils/BeanCreationTestCtorBean.java index ed0c6b415d..658388a1b1 100644 --- a/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestCtorBean.java +++ b/src/test/java/org/apache/commons/configuration3/beanutils/BeanCreationTestCtorBean.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.beanutils; +package org.apache.commons.configuration3.beanutils; /** * Another test bean class for bean creation operations which defines some constructors. diff --git a/src/test/java/org/apache/commons/configuration2/beanutils/BeanDeclarationTestImpl.java b/src/test/java/org/apache/commons/configuration3/beanutils/BeanDeclarationTestImpl.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/beanutils/BeanDeclarationTestImpl.java rename to src/test/java/org/apache/commons/configuration3/beanutils/BeanDeclarationTestImpl.java index 4f2a781054..8bb4a7d3b3 100644 --- a/src/test/java/org/apache/commons/configuration2/beanutils/BeanDeclarationTestImpl.java +++ b/src/test/java/org/apache/commons/configuration3/beanutils/BeanDeclarationTestImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.beanutils; +package org.apache.commons.configuration3.beanutils; import java.util.Collection; import java.util.Map; diff --git a/src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java b/src/test/java/org/apache/commons/configuration3/beanutils/TestBeanHelper.java similarity index 99% rename from src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java rename to src/test/java/org/apache/commons/configuration3/beanutils/TestBeanHelper.java index 6f09b11e4e..df8bf8d0ff 100644 --- a/src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java +++ b/src/test/java/org/apache/commons/configuration3/beanutils/TestBeanHelper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.beanutils; +package org.apache.commons.configuration3.beanutils; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -32,8 +32,8 @@ import org.apache.commons.beanutils.DynaBean; import org.apache.commons.beanutils.LazyDynaBean; -import org.apache.commons.configuration2.PropertiesConfiguration; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.PropertiesConfiguration; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/beanutils/TestCombinedBeanDeclaration.java b/src/test/java/org/apache/commons/configuration3/beanutils/TestCombinedBeanDeclaration.java similarity index 99% rename from src/test/java/org/apache/commons/configuration2/beanutils/TestCombinedBeanDeclaration.java rename to src/test/java/org/apache/commons/configuration3/beanutils/TestCombinedBeanDeclaration.java index c22bcd97c4..8d42b177c0 100644 --- a/src/test/java/org/apache/commons/configuration2/beanutils/TestCombinedBeanDeclaration.java +++ b/src/test/java/org/apache/commons/configuration3/beanutils/TestCombinedBeanDeclaration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.beanutils; +package org.apache.commons.configuration3.beanutils; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java b/src/test/java/org/apache/commons/configuration3/beanutils/TestConfigurationDynaBean.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java rename to src/test/java/org/apache/commons/configuration3/beanutils/TestConfigurationDynaBean.java index ff8bb9da57..af3c6f8478 100644 --- a/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java +++ b/src/test/java/org/apache/commons/configuration3/beanutils/TestConfigurationDynaBean.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration2.beanutils; +package org.apache.commons.configuration3.beanutils; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -30,9 +30,9 @@ import java.util.List; import org.apache.commons.beanutils.DynaProperty; -import org.apache.commons.configuration2.BaseConfiguration; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.MapConfiguration; +import org.apache.commons.configuration3.BaseConfiguration; +import org.apache.commons.configuration3.Configuration; +import org.apache.commons.configuration3.MapConfiguration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBeanXMLConfig.java b/src/test/java/org/apache/commons/configuration3/beanutils/TestConfigurationDynaBeanXMLConfig.java similarity index 89% rename from src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBeanXMLConfig.java rename to src/test/java/org/apache/commons/configuration3/beanutils/TestConfigurationDynaBeanXMLConfig.java index fd1ce84623..64750772ac 100644 --- a/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBeanXMLConfig.java +++ b/src/test/java/org/apache/commons/configuration3/beanutils/TestConfigurationDynaBeanXMLConfig.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.beanutils; +package org.apache.commons.configuration3.beanutils; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.XMLConfiguration; +import org.apache.commons.configuration3.Configuration; +import org.apache.commons.configuration3.XMLConfiguration; /** * An additional test class for ConfigurationDynaBean. This test class performs the same tests as the default test diff --git a/src/test/java/org/apache/commons/configuration2/beanutils/TestConstructorArg.java b/src/test/java/org/apache/commons/configuration3/beanutils/TestConstructorArg.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/beanutils/TestConstructorArg.java rename to src/test/java/org/apache/commons/configuration3/beanutils/TestConstructorArg.java index bf36c2f981..f98f598f4e 100644 --- a/src/test/java/org/apache/commons/configuration2/beanutils/TestConstructorArg.java +++ b/src/test/java/org/apache/commons/configuration3/beanutils/TestConstructorArg.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.beanutils; +package org.apache.commons.configuration3.beanutils; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java b/src/test/java/org/apache/commons/configuration3/beanutils/TestDefaultBeanFactory.java similarity index 97% rename from src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java rename to src/test/java/org/apache/commons/configuration3/beanutils/TestDefaultBeanFactory.java index 4709142741..391e9e836b 100644 --- a/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java +++ b/src/test/java/org/apache/commons/configuration3/beanutils/TestDefaultBeanFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.beanutils; +package org.apache.commons.configuration3.beanutils; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -34,10 +34,10 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.configuration2.PropertiesConfiguration; -import org.apache.commons.configuration2.convert.ConversionHandler; -import org.apache.commons.configuration2.convert.DefaultConversionHandler; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.PropertiesConfiguration; +import org.apache.commons.configuration3.convert.ConversionHandler; +import org.apache.commons.configuration3.convert.DefaultConversionHandler; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/beanutils/TestXMLBeanDeclaration.java b/src/test/java/org/apache/commons/configuration3/beanutils/TestXMLBeanDeclaration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration2/beanutils/TestXMLBeanDeclaration.java rename to src/test/java/org/apache/commons/configuration3/beanutils/TestXMLBeanDeclaration.java index 883b0e15e7..b7d6553a7d 100644 --- a/src/test/java/org/apache/commons/configuration2/beanutils/TestXMLBeanDeclaration.java +++ b/src/test/java/org/apache/commons/configuration3/beanutils/TestXMLBeanDeclaration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.beanutils; +package org.apache.commons.configuration3.beanutils; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -29,9 +29,9 @@ import java.util.Iterator; import java.util.Map; -import org.apache.commons.configuration2.BaseHierarchicalConfiguration; -import org.apache.commons.configuration2.HierarchicalConfiguration; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.BaseHierarchicalConfiguration; +import org.apache.commons.configuration3.HierarchicalConfiguration; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration2/builder/BuilderEventListenerImpl.java b/src/test/java/org/apache/commons/configuration3/builder/BuilderEventListenerImpl.java similarity index 94% rename from src/test/java/org/apache/commons/configuration2/builder/BuilderEventListenerImpl.java rename to src/test/java/org/apache/commons/configuration3/builder/BuilderEventListenerImpl.java index 990708128b..256a70ec84 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/BuilderEventListenerImpl.java +++ b/src/test/java/org/apache/commons/configuration3/builder/BuilderEventListenerImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -24,8 +24,8 @@ import java.util.LinkedList; import java.util.List; -import org.apache.commons.configuration2.event.EventListener; -import org.apache.commons.configuration2.event.EventType; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.event.EventType; /** * A test implementation of an event listener for configuration builders. This class is used by some unit tests. It diff --git a/src/test/java/org/apache/commons/configuration2/builder/ParametersBeanTestImpl.java b/src/test/java/org/apache/commons/configuration3/builder/ParametersBeanTestImpl.java similarity index 97% rename from src/test/java/org/apache/commons/configuration2/builder/ParametersBeanTestImpl.java rename to src/test/java/org/apache/commons/configuration3/builder/ParametersBeanTestImpl.java index 5375603e25..7e4e5cbe8b 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/ParametersBeanTestImpl.java +++ b/src/test/java/org/apache/commons/configuration3/builder/ParametersBeanTestImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; /** * A test bean used to check whether all properties can be found. diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestAutoSaveListener.java b/src/test/java/org/apache/commons/configuration3/builder/TestAutoSaveListener.java similarity index 95% rename from src/test/java/org/apache/commons/configuration2/builder/TestAutoSaveListener.java rename to src/test/java/org/apache/commons/configuration3/builder/TestAutoSaveListener.java index 46c02fc21b..b108072056 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/TestAutoSaveListener.java +++ b/src/test/java/org/apache/commons/configuration3/builder/TestAutoSaveListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; @@ -22,9 +22,9 @@ import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions; -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.configuration3.event.ConfigurationEvent; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.FileHandler; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.java b/src/test/java/org/apache/commons/configuration3/builder/TestBasicBuilderParameters.java similarity index 96% rename from src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.java rename to src/test/java/org/apache/commons/configuration3/builder/TestBasicBuilderParameters.java index a4419ca8dd..9271109610 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.java +++ b/src/test/java/org/apache/commons/configuration3/builder/TestBasicBuilderParameters.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -34,18 +34,18 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.configuration2.ConfigurationDecoder; -import org.apache.commons.configuration2.beanutils.BeanHelper; -import org.apache.commons.configuration2.convert.ConversionHandler; -import org.apache.commons.configuration2.convert.DefaultConversionHandler; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration2.convert.ListDelimiterHandler; -import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration2.interpol.InterpolatorSpecification; -import org.apache.commons.configuration2.interpol.Lookup; -import org.apache.commons.configuration2.io.ConfigurationLogger; -import org.apache.commons.configuration2.sync.ReadWriteSynchronizer; -import org.apache.commons.configuration2.sync.Synchronizer; +import org.apache.commons.configuration3.ConfigurationDecoder; +import org.apache.commons.configuration3.beanutils.BeanHelper; +import org.apache.commons.configuration3.convert.ConversionHandler; +import org.apache.commons.configuration3.convert.DefaultConversionHandler; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.convert.ListDelimiterHandler; +import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration3.interpol.InterpolatorSpecification; +import org.apache.commons.configuration3.interpol.Lookup; +import org.apache.commons.configuration3.io.ConfigurationLogger; +import org.apache.commons.configuration3.sync.ReadWriteSynchronizer; +import org.apache.commons.configuration3.sync.Synchronizer; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilder.java b/src/test/java/org/apache/commons/configuration3/builder/TestBasicConfigurationBuilder.java similarity index 93% rename from src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilder.java rename to src/test/java/org/apache/commons/configuration3/builder/TestBasicConfigurationBuilder.java index 9885485e37..0eb565560a 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilder.java +++ b/src/test/java/org/apache/commons/configuration3/builder/TestBasicConfigurationBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -35,30 +35,30 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.commons.configuration2.BaseConfiguration; -import org.apache.commons.configuration2.BaseHierarchicalConfiguration; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.Initializable; -import org.apache.commons.configuration2.PropertiesConfiguration; -import org.apache.commons.configuration2.XMLConfiguration; -import org.apache.commons.configuration2.beanutils.BeanCreationContext; -import org.apache.commons.configuration2.beanutils.BeanDeclaration; -import org.apache.commons.configuration2.beanutils.BeanFactory; -import org.apache.commons.configuration2.beanutils.BeanHelper; -import org.apache.commons.configuration2.beanutils.DefaultBeanFactory; -import org.apache.commons.configuration2.beanutils.XMLBeanDeclaration; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration2.convert.ListDelimiterHandler; -import org.apache.commons.configuration2.event.ConfigurationErrorEvent; -import org.apache.commons.configuration2.event.ConfigurationEvent; -import org.apache.commons.configuration2.event.ErrorListenerTestImpl; -import org.apache.commons.configuration2.event.EventListener; -import org.apache.commons.configuration2.event.EventListenerRegistrationData; -import org.apache.commons.configuration2.event.EventListenerTestImpl; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration2.reloading.ReloadingController; -import org.apache.commons.configuration2.reloading.ReloadingDetector; +import org.apache.commons.configuration3.BaseConfiguration; +import org.apache.commons.configuration3.BaseHierarchicalConfiguration; +import org.apache.commons.configuration3.Configuration; +import org.apache.commons.configuration3.Initializable; +import org.apache.commons.configuration3.PropertiesConfiguration; +import org.apache.commons.configuration3.XMLConfiguration; +import org.apache.commons.configuration3.beanutils.BeanCreationContext; +import org.apache.commons.configuration3.beanutils.BeanDeclaration; +import org.apache.commons.configuration3.beanutils.BeanFactory; +import org.apache.commons.configuration3.beanutils.BeanHelper; +import org.apache.commons.configuration3.beanutils.DefaultBeanFactory; +import org.apache.commons.configuration3.beanutils.XMLBeanDeclaration; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.convert.ListDelimiterHandler; +import org.apache.commons.configuration3.event.ConfigurationErrorEvent; +import org.apache.commons.configuration3.event.ConfigurationEvent; +import org.apache.commons.configuration3.event.ErrorListenerTestImpl; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.event.EventListenerRegistrationData; +import org.apache.commons.configuration3.event.EventListenerTestImpl; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.reloading.ReloadingController; +import org.apache.commons.configuration3.reloading.ReloadingDetector; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilderEvents.java b/src/test/java/org/apache/commons/configuration3/builder/TestBasicConfigurationBuilderEvents.java similarity index 95% rename from src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilderEvents.java rename to src/test/java/org/apache/commons/configuration3/builder/TestBasicConfigurationBuilderEvents.java index 44a4915942..5461b60fb1 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilderEvents.java +++ b/src/test/java/org/apache/commons/configuration3/builder/TestBasicConfigurationBuilderEvents.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -23,11 +23,11 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.PropertiesConfiguration; -import org.apache.commons.configuration2.event.Event; -import org.apache.commons.configuration2.event.EventType; -import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration3.Configuration; +import org.apache.commons.configuration3.PropertiesConfiguration; +import org.apache.commons.configuration3.event.Event; +import org.apache.commons.configuration3.event.EventType; +import org.apache.commons.configuration3.ex.ConfigurationException; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestBuilderConfigurationWrapperFactory.java b/src/test/java/org/apache/commons/configuration3/builder/TestBuilderConfigurationWrapperFactory.java similarity index 92% rename from src/test/java/org/apache/commons/configuration2/builder/TestBuilderConfigurationWrapperFactory.java rename to src/test/java/org/apache/commons/configuration3/builder/TestBuilderConfigurationWrapperFactory.java index 6a69de2376..f3fff0d99b 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/TestBuilderConfigurationWrapperFactory.java +++ b/src/test/java/org/apache/commons/configuration3/builder/TestBuilderConfigurationWrapperFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -30,16 +30,16 @@ import java.util.Collection; -import org.apache.commons.configuration2.BaseHierarchicalConfiguration; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.HierarchicalConfiguration; -import org.apache.commons.configuration2.PropertiesConfiguration; -import org.apache.commons.configuration2.builder.BuilderConfigurationWrapperFactory.EventSourceSupport; -import org.apache.commons.configuration2.event.ConfigurationEvent; -import org.apache.commons.configuration2.event.EventListener; -import org.apache.commons.configuration2.event.EventListenerTestImpl; -import org.apache.commons.configuration2.event.EventSource; -import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration3.BaseHierarchicalConfiguration; +import org.apache.commons.configuration3.Configuration; +import org.apache.commons.configuration3.HierarchicalConfiguration; +import org.apache.commons.configuration3.PropertiesConfiguration; +import org.apache.commons.configuration3.builder.BuilderConfigurationWrapperFactory.EventSourceSupport; +import org.apache.commons.configuration3.event.ConfigurationEvent; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.event.EventListenerTestImpl; +import org.apache.commons.configuration3.event.EventSource; +import org.apache.commons.configuration3.ex.ConfigurationException; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestCopyObjectDefaultHandler.java b/src/test/java/org/apache/commons/configuration3/builder/TestCopyObjectDefaultHandler.java similarity index 95% rename from src/test/java/org/apache/commons/configuration2/builder/TestCopyObjectDefaultHandler.java rename to src/test/java/org/apache/commons/configuration3/builder/TestCopyObjectDefaultHandler.java index aebe8b4c78..f0873b3f24 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/TestCopyObjectDefaultHandler.java +++ b/src/test/java/org/apache/commons/configuration3/builder/TestCopyObjectDefaultHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -22,8 +22,8 @@ import java.util.Map; -import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration2.tree.ExpressionEngine; +import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration3.tree.ExpressionEngine; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestDatabaseBuilderParametersImpl.java b/src/test/java/org/apache/commons/configuration3/builder/TestDatabaseBuilderParametersImpl.java similarity index 97% rename from src/test/java/org/apache/commons/configuration2/builder/TestDatabaseBuilderParametersImpl.java rename to src/test/java/org/apache/commons/configuration3/builder/TestDatabaseBuilderParametersImpl.java index 26bdfddb77..43b06fb253 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/TestDatabaseBuilderParametersImpl.java +++ b/src/test/java/org/apache/commons/configuration3/builder/TestDatabaseBuilderParametersImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; @@ -24,7 +24,7 @@ import javax.sql.DataSource; -import org.apache.commons.configuration2.beanutils.BeanHelper; +import org.apache.commons.configuration3.beanutils.BeanHelper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestDefaultParametersManager.java b/src/test/java/org/apache/commons/configuration3/builder/TestDefaultParametersManager.java similarity index 95% rename from src/test/java/org/apache/commons/configuration2/builder/TestDefaultParametersManager.java rename to src/test/java/org/apache/commons/configuration3/builder/TestDefaultParametersManager.java index f954c0a851..aec4097a83 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/TestDefaultParametersManager.java +++ b/src/test/java/org/apache/commons/configuration3/builder/TestDefaultParametersManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -26,12 +26,12 @@ import java.nio.charset.StandardCharsets; import java.util.Map; -import org.apache.commons.configuration2.builder.fluent.FileBasedBuilderParameters; -import org.apache.commons.configuration2.builder.fluent.Parameters; -import org.apache.commons.configuration2.builder.fluent.PropertiesBuilderParameters; -import org.apache.commons.configuration2.builder.fluent.XMLBuilderParameters; -import org.apache.commons.configuration2.convert.ListDelimiterHandler; -import org.apache.commons.configuration2.tree.ExpressionEngine; +import org.apache.commons.configuration3.builder.fluent.FileBasedBuilderParameters; +import org.apache.commons.configuration3.builder.fluent.Parameters; +import org.apache.commons.configuration3.builder.fluent.PropertiesBuilderParameters; +import org.apache.commons.configuration3.builder.fluent.XMLBuilderParameters; +import org.apache.commons.configuration3.convert.ListDelimiterHandler; +import org.apache.commons.configuration3.tree.ExpressionEngine; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestDefaultReloadingDetectorFactory.java b/src/test/java/org/apache/commons/configuration3/builder/TestDefaultReloadingDetectorFactory.java similarity index 91% rename from src/test/java/org/apache/commons/configuration2/builder/TestDefaultReloadingDetectorFactory.java rename to src/test/java/org/apache/commons/configuration3/builder/TestDefaultReloadingDetectorFactory.java index dde3835101..679340ef66 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/TestDefaultReloadingDetectorFactory.java +++ b/src/test/java/org/apache/commons/configuration3/builder/TestDefaultReloadingDetectorFactory.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertSame; -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.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration3.reloading.FileHandlerReloadingDetector; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestEventListenerParameters.java b/src/test/java/org/apache/commons/configuration3/builder/TestEventListenerParameters.java similarity index 92% rename from src/test/java/org/apache/commons/configuration2/builder/TestEventListenerParameters.java rename to src/test/java/org/apache/commons/configuration3/builder/TestEventListenerParameters.java index 4dde79c567..6bdbd8ecfb 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/TestEventListenerParameters.java +++ b/src/test/java/org/apache/commons/configuration3/builder/TestEventListenerParameters.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; @@ -22,9 +22,9 @@ import java.util.Arrays; -import org.apache.commons.configuration2.event.ConfigurationEvent; -import org.apache.commons.configuration2.event.EventListenerRegistrationData; -import org.apache.commons.configuration2.event.EventListenerTestImpl; +import org.apache.commons.configuration3.event.ConfigurationEvent; +import org.apache.commons.configuration3.event.EventListenerRegistrationData; +import org.apache.commons.configuration3.event.EventListenerTestImpl; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedBuilderParameters.java b/src/test/java/org/apache/commons/configuration3/builder/TestFileBasedBuilderParameters.java similarity index 97% rename from src/test/java/org/apache/commons/configuration2/builder/TestFileBasedBuilderParameters.java rename to src/test/java/org/apache/commons/configuration3/builder/TestFileBasedBuilderParameters.java index 764b27e00f..75a3b20d0a 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedBuilderParameters.java +++ b/src/test/java/org/apache/commons/configuration3/builder/TestFileBasedBuilderParameters.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -32,12 +32,12 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.configuration2.ConfigurationAssert; -import org.apache.commons.configuration2.beanutils.BeanHelper; -import org.apache.commons.configuration2.io.FileBased; -import org.apache.commons.configuration2.io.FileHandler; -import org.apache.commons.configuration2.io.FileLocationStrategy; -import org.apache.commons.configuration2.io.FileSystem; +import org.apache.commons.configuration3.ConfigurationAssert; +import org.apache.commons.configuration3.beanutils.BeanHelper; +import org.apache.commons.configuration3.io.FileBased; +import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration3.io.FileLocationStrategy; +import org.apache.commons.configuration3.io.FileSystem; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java b/src/test/java/org/apache/commons/configuration3/builder/TestFileBasedConfigurationBuilder.java similarity index 95% rename from src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java rename to src/test/java/org/apache/commons/configuration3/builder/TestFileBasedConfigurationBuilder.java index ee531ea8fc..7f071d99b0 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java +++ b/src/test/java/org/apache/commons/configuration3/builder/TestFileBasedConfigurationBuilder.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; -import static org.apache.commons.configuration2.TempDirUtils.newFile; -import static org.apache.commons.configuration2.TempDirUtils.newFolder; +import static org.apache.commons.configuration3.TempDirUtils.newFile; +import static org.apache.commons.configuration3.TempDirUtils.newFolder; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -41,21 +41,21 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ConfigurationAssert; -import org.apache.commons.configuration2.FileBasedConfiguration; -import org.apache.commons.configuration2.PropertiesConfiguration; -import org.apache.commons.configuration2.XMLConfiguration; -import org.apache.commons.configuration2.XMLPropertiesConfiguration; -import org.apache.commons.configuration2.builder.fluent.Parameters; -import org.apache.commons.configuration2.builder.fluent.PropertiesBuilderParameters; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.io.FileHandler; -import org.apache.commons.configuration2.io.FileLocator; -import org.apache.commons.configuration2.io.FileLocatorUtils; -import org.apache.commons.configuration2.io.HomeDirectoryLocationStrategy; -import org.apache.commons.configuration2.io.URLConnectionOptions; +import org.apache.commons.configuration3.Configuration; +import org.apache.commons.configuration3.ConfigurationAssert; +import org.apache.commons.configuration3.FileBasedConfiguration; +import org.apache.commons.configuration3.PropertiesConfiguration; +import org.apache.commons.configuration3.XMLConfiguration; +import org.apache.commons.configuration3.XMLPropertiesConfiguration; +import org.apache.commons.configuration3.builder.fluent.Parameters; +import org.apache.commons.configuration3.builder.fluent.PropertiesBuilderParameters; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration3.io.FileLocator; +import org.apache.commons.configuration3.io.FileLocatorUtils; +import org.apache.commons.configuration3.io.HomeDirectoryLocationStrategy; +import org.apache.commons.configuration3.io.URLConnectionOptions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; @@ -296,7 +296,7 @@ public void testGetConfigurationLoadFromFile() throws ConfigurationException { */ @Test public void testGetConfigurationLoadFromJarFile() throws ConfigurationException, IOException { - final URL jarResourceUrl = getClass().getClassLoader().getResource("org/apache/commons/configuration2/test.jar"); + final URL jarResourceUrl = getClass().getClassLoader().getResource("org/apache/commons/configuration3/test.jar"); assertNotNull(jarResourceUrl); final Path testJar = Paths.get(tempFolder.getAbsolutePath(), "test.jar"); try (InputStream inputStream = jarResourceUrl.openStream()) { diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestHierarchicalBuilderParametersImpl.java b/src/test/java/org/apache/commons/configuration3/builder/TestHierarchicalBuilderParametersImpl.java similarity index 94% rename from src/test/java/org/apache/commons/configuration2/builder/TestHierarchicalBuilderParametersImpl.java rename to src/test/java/org/apache/commons/configuration3/builder/TestHierarchicalBuilderParametersImpl.java index 9510a13756..cdc9642962 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/TestHierarchicalBuilderParametersImpl.java +++ b/src/test/java/org/apache/commons/configuration3/builder/TestHierarchicalBuilderParametersImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; @@ -22,8 +22,8 @@ import java.util.Map; -import org.apache.commons.configuration2.beanutils.BeanHelper; -import org.apache.commons.configuration2.tree.ExpressionEngine; +import org.apache.commons.configuration3.beanutils.BeanHelper; +import org.apache.commons.configuration3.tree.ExpressionEngine; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestJndiBuilderParametersImpl.java b/src/test/java/org/apache/commons/configuration3/builder/TestJndiBuilderParametersImpl.java similarity index 96% rename from src/test/java/org/apache/commons/configuration2/builder/TestJndiBuilderParametersImpl.java rename to src/test/java/org/apache/commons/configuration3/builder/TestJndiBuilderParametersImpl.java index a279f70b5a..4307f76d70 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/TestJndiBuilderParametersImpl.java +++ b/src/test/java/org/apache/commons/configuration3/builder/TestJndiBuilderParametersImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; @@ -24,7 +24,7 @@ import javax.naming.Context; -import org.apache.commons.configuration2.beanutils.BeanHelper; +import org.apache.commons.configuration3.beanutils.BeanHelper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestPropertiesBuilderParametersImpl.java b/src/test/java/org/apache/commons/configuration3/builder/TestPropertiesBuilderParametersImpl.java similarity index 94% rename from src/test/java/org/apache/commons/configuration2/builder/TestPropertiesBuilderParametersImpl.java rename to src/test/java/org/apache/commons/configuration3/builder/TestPropertiesBuilderParametersImpl.java index 6bd13b7100..988706b1e6 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/TestPropertiesBuilderParametersImpl.java +++ b/src/test/java/org/apache/commons/configuration3/builder/TestPropertiesBuilderParametersImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -23,11 +23,11 @@ import java.util.Map; -import org.apache.commons.configuration2.ConfigurationConsumer; -import org.apache.commons.configuration2.PropertiesConfiguration; -import org.apache.commons.configuration2.PropertiesConfigurationLayout; -import org.apache.commons.configuration2.beanutils.BeanHelper; -import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration3.ConfigurationConsumer; +import org.apache.commons.configuration3.PropertiesConfiguration; +import org.apache.commons.configuration3.PropertiesConfigurationLayout; +import org.apache.commons.configuration3.beanutils.BeanHelper; +import org.apache.commons.configuration3.ex.ConfigurationException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestReloadingBuilderSupportListener.java b/src/test/java/org/apache/commons/configuration3/builder/TestReloadingBuilderSupportListener.java similarity index 87% rename from src/test/java/org/apache/commons/configuration2/builder/TestReloadingBuilderSupportListener.java rename to src/test/java/org/apache/commons/configuration3/builder/TestReloadingBuilderSupportListener.java index 12dfff746d..ed620f6651 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/TestReloadingBuilderSupportListener.java +++ b/src/test/java/org/apache/commons/configuration3/builder/TestReloadingBuilderSupportListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.ArgumentMatchers.any; @@ -24,12 +24,12 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.PropertiesConfiguration; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.reloading.ReloadingController; -import org.apache.commons.configuration2.reloading.ReloadingDetector; -import org.apache.commons.configuration2.reloading.ReloadingEvent; +import org.apache.commons.configuration3.Configuration; +import org.apache.commons.configuration3.PropertiesConfiguration; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.reloading.ReloadingController; +import org.apache.commons.configuration3.reloading.ReloadingDetector; +import org.apache.commons.configuration3.reloading.ReloadingEvent; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestReloadingFileBasedConfigurationBuilder.java b/src/test/java/org/apache/commons/configuration3/builder/TestReloadingFileBasedConfigurationBuilder.java similarity index 96% rename from src/test/java/org/apache/commons/configuration2/builder/TestReloadingFileBasedConfigurationBuilder.java rename to src/test/java/org/apache/commons/configuration3/builder/TestReloadingFileBasedConfigurationBuilder.java index 3725698d01..1d7b5c43e5 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/TestReloadingFileBasedConfigurationBuilder.java +++ b/src/test/java/org/apache/commons/configuration3/builder/TestReloadingFileBasedConfigurationBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -30,11 +30,11 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.configuration2.PropertiesConfiguration; -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.ReloadingDetector; +import org.apache.commons.configuration3.PropertiesConfiguration; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration3.reloading.FileHandlerReloadingDetector; +import org.apache.commons.configuration3.reloading.ReloadingDetector; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestXMLBuilderParametersImpl.java b/src/test/java/org/apache/commons/configuration3/builder/TestXMLBuilderParametersImpl.java similarity index 97% rename from src/test/java/org/apache/commons/configuration2/builder/TestXMLBuilderParametersImpl.java rename to src/test/java/org/apache/commons/configuration3/builder/TestXMLBuilderParametersImpl.java index 5e3f759085..e32fea4d83 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/TestXMLBuilderParametersImpl.java +++ b/src/test/java/org/apache/commons/configuration3/builder/TestXMLBuilderParametersImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder; +package org.apache.commons.configuration3.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; @@ -24,7 +24,7 @@ import javax.xml.parsers.DocumentBuilder; -import org.apache.commons.configuration2.beanutils.BeanHelper; +import org.apache.commons.configuration3.beanutils.BeanHelper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.xml.sax.EntityResolver; diff --git a/src/test/java/org/apache/commons/configuration2/builder/combined/AbstractMultiFileConfigurationBuilderTest.java b/src/test/java/org/apache/commons/configuration3/builder/combined/AbstractMultiFileConfigurationBuilderTest.java similarity index 91% rename from src/test/java/org/apache/commons/configuration2/builder/combined/AbstractMultiFileConfigurationBuilderTest.java rename to src/test/java/org/apache/commons/configuration3/builder/combined/AbstractMultiFileConfigurationBuilderTest.java index 1ebbbfb716..ac75aa46fe 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/combined/AbstractMultiFileConfigurationBuilderTest.java +++ b/src/test/java/org/apache/commons/configuration3/builder/combined/AbstractMultiFileConfigurationBuilderTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.combined; +package org.apache.commons.configuration3.builder.combined; -import org.apache.commons.configuration2.builder.BasicBuilderParameters; -import org.apache.commons.configuration2.builder.BuilderParameters; -import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration2.interpol.DefaultLookups; +import org.apache.commons.configuration3.builder.BasicBuilderParameters; +import org.apache.commons.configuration3.builder.BuilderParameters; +import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration3.interpol.DefaultLookups; import org.junit.jupiter.api.AfterEach; /** diff --git a/src/test/java/org/apache/commons/configuration2/builder/combined/TestBaseConfigurationBuilderProvider.java b/src/test/java/org/apache/commons/configuration3/builder/combined/TestBaseConfigurationBuilderProvider.java similarity index 90% rename from src/test/java/org/apache/commons/configuration2/builder/combined/TestBaseConfigurationBuilderProvider.java rename to src/test/java/org/apache/commons/configuration3/builder/combined/TestBaseConfigurationBuilderProvider.java index 43c1a133fc..95998a2f78 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/combined/TestBaseConfigurationBuilderProvider.java +++ b/src/test/java/org/apache/commons/configuration3/builder/combined/TestBaseConfigurationBuilderProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.combined; +package org.apache.commons.configuration3.builder.combined; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -25,21 +25,21 @@ import java.util.Collection; import java.util.Collections; -import org.apache.commons.configuration2.BaseHierarchicalConfiguration; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ConfigurationAssert; -import org.apache.commons.configuration2.HierarchicalConfiguration; -import org.apache.commons.configuration2.PropertiesConfiguration; -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.FileBasedBuilderParametersImpl; -import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder; -import org.apache.commons.configuration2.builder.ReloadingFileBasedConfigurationBuilder; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler; -import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration3.BaseHierarchicalConfiguration; +import org.apache.commons.configuration3.Configuration; +import org.apache.commons.configuration3.ConfigurationAssert; +import org.apache.commons.configuration3.HierarchicalConfiguration; +import org.apache.commons.configuration3.PropertiesConfiguration; +import org.apache.commons.configuration3.builder.BasicBuilderParameters; +import org.apache.commons.configuration3.builder.BasicConfigurationBuilder; +import org.apache.commons.configuration3.builder.BuilderParameters; +import org.apache.commons.configuration3.builder.ConfigurationBuilder; +import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; +import org.apache.commons.configuration3.builder.FileBasedConfigurationBuilder; +import org.apache.commons.configuration3.builder.ReloadingFileBasedConfigurationBuilder; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.convert.DisabledListDelimiterHandler; +import org.apache.commons.configuration3.ex.ConfigurationException; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java b/src/test/java/org/apache/commons/configuration3/builder/combined/TestCombinedBuilderParametersImpl.java similarity index 95% rename from src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java rename to src/test/java/org/apache/commons/configuration3/builder/combined/TestCombinedBuilderParametersImpl.java index 0536636697..b93eb0584d 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java +++ b/src/test/java/org/apache/commons/configuration3/builder/combined/TestCombinedBuilderParametersImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.combined; +package org.apache.commons.configuration3.builder.combined; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -31,17 +31,17 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.configuration2.ConfigurationAssert; -import org.apache.commons.configuration2.XMLConfiguration; -import org.apache.commons.configuration2.beanutils.BeanHelper; -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.DefaultParametersHandler; -import org.apache.commons.configuration2.builder.DefaultParametersManager; -import org.apache.commons.configuration2.builder.XMLBuilderParametersImpl; -import org.apache.commons.configuration2.builder.fluent.FileBasedBuilderParameters; +import org.apache.commons.configuration3.ConfigurationAssert; +import org.apache.commons.configuration3.XMLConfiguration; +import org.apache.commons.configuration3.beanutils.BeanHelper; +import org.apache.commons.configuration3.builder.BasicBuilderParameters; +import org.apache.commons.configuration3.builder.BasicConfigurationBuilder; +import org.apache.commons.configuration3.builder.BuilderParameters; +import org.apache.commons.configuration3.builder.ConfigurationBuilder; +import org.apache.commons.configuration3.builder.DefaultParametersHandler; +import org.apache.commons.configuration3.builder.DefaultParametersManager; +import org.apache.commons.configuration3.builder.XMLBuilderParametersImpl; +import org.apache.commons.configuration3.builder.fluent.FileBasedBuilderParameters; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java b/src/test/java/org/apache/commons/configuration3/builder/combined/TestCombinedConfigurationBuilder.java similarity index 94% rename from src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java rename to src/test/java/org/apache/commons/configuration3/builder/combined/TestCombinedConfigurationBuilder.java index 2ec29dc1f5..f729156f6e 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java +++ b/src/test/java/org/apache/commons/configuration3/builder/combined/TestCombinedConfigurationBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration2.builder.combined; +package org.apache.commons.configuration3.builder.combined; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -41,51 +41,51 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; -import org.apache.commons.configuration2.BaseHierarchicalConfiguration; -import org.apache.commons.configuration2.CombinedConfiguration; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.ConfigurationAssert; -import org.apache.commons.configuration2.ConfigurationDecoder; -import org.apache.commons.configuration2.DynamicCombinedConfiguration; -import org.apache.commons.configuration2.HierarchicalConfiguration; -import org.apache.commons.configuration2.PropertiesConfiguration; -import org.apache.commons.configuration2.XMLConfiguration; -import org.apache.commons.configuration2.XMLPropertiesConfiguration; -import org.apache.commons.configuration2.builder.BasicConfigurationBuilder; -import org.apache.commons.configuration2.builder.BuilderEventListenerImpl; -import org.apache.commons.configuration2.builder.ConfigurationBuilder; -import org.apache.commons.configuration2.builder.ConfigurationBuilderEvent; -import org.apache.commons.configuration2.builder.CopyObjectDefaultHandler; -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.PropertiesBuilderParametersImpl; -import org.apache.commons.configuration2.builder.ReloadingFileBasedConfigurationBuilder; -import org.apache.commons.configuration2.builder.XMLBuilderParametersImpl; -import org.apache.commons.configuration2.builder.XMLBuilderProperties; -import org.apache.commons.configuration2.builder.fluent.CombinedBuilderParameters; -import org.apache.commons.configuration2.builder.fluent.FileBasedBuilderParameters; -import org.apache.commons.configuration2.builder.fluent.Parameters; -import org.apache.commons.configuration2.builder.fluent.XMLBuilderParameters; -import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration2.convert.ListDelimiterHandler; -import org.apache.commons.configuration2.event.ConfigurationEvent; -import org.apache.commons.configuration2.event.Event; -import org.apache.commons.configuration2.event.EventListener; -import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration2.interpol.Lookup; -import org.apache.commons.configuration2.io.DefaultFileSystem; -import org.apache.commons.configuration2.io.FileHandler; -import org.apache.commons.configuration2.io.FileLocatorUtils; -import org.apache.commons.configuration2.io.FileSystem; -import org.apache.commons.configuration2.reloading.ReloadingController; -import org.apache.commons.configuration2.reloading.ReloadingControllerSupport; -import org.apache.commons.configuration2.resolver.CatalogResolver; -import org.apache.commons.configuration2.tree.DefaultExpressionEngine; -import org.apache.commons.configuration2.tree.DefaultExpressionEngineSymbols; -import org.apache.commons.configuration2.tree.ImmutableNode; -import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine; +import org.apache.commons.configuration3.BaseHierarchicalConfiguration; +import org.apache.commons.configuration3.CombinedConfiguration; +import org.apache.commons.configuration3.Configuration; +import org.apache.commons.configuration3.ConfigurationAssert; +import org.apache.commons.configuration3.ConfigurationDecoder; +import org.apache.commons.configuration3.DynamicCombinedConfiguration; +import org.apache.commons.configuration3.HierarchicalConfiguration; +import org.apache.commons.configuration3.PropertiesConfiguration; +import org.apache.commons.configuration3.XMLConfiguration; +import org.apache.commons.configuration3.XMLPropertiesConfiguration; +import org.apache.commons.configuration3.builder.BasicConfigurationBuilder; +import org.apache.commons.configuration3.builder.BuilderEventListenerImpl; +import org.apache.commons.configuration3.builder.ConfigurationBuilder; +import org.apache.commons.configuration3.builder.ConfigurationBuilderEvent; +import org.apache.commons.configuration3.builder.CopyObjectDefaultHandler; +import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; +import org.apache.commons.configuration3.builder.FileBasedBuilderProperties; +import org.apache.commons.configuration3.builder.FileBasedConfigurationBuilder; +import org.apache.commons.configuration3.builder.PropertiesBuilderParametersImpl; +import org.apache.commons.configuration3.builder.ReloadingFileBasedConfigurationBuilder; +import org.apache.commons.configuration3.builder.XMLBuilderParametersImpl; +import org.apache.commons.configuration3.builder.XMLBuilderProperties; +import org.apache.commons.configuration3.builder.fluent.CombinedBuilderParameters; +import org.apache.commons.configuration3.builder.fluent.FileBasedBuilderParameters; +import org.apache.commons.configuration3.builder.fluent.Parameters; +import org.apache.commons.configuration3.builder.fluent.XMLBuilderParameters; +import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration3.convert.ListDelimiterHandler; +import org.apache.commons.configuration3.event.ConfigurationEvent; +import org.apache.commons.configuration3.event.Event; +import org.apache.commons.configuration3.event.EventListener; +import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration3.interpol.Lookup; +import org.apache.commons.configuration3.io.DefaultFileSystem; +import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration3.io.FileLocatorUtils; +import org.apache.commons.configuration3.io.FileSystem; +import org.apache.commons.configuration3.reloading.ReloadingController; +import org.apache.commons.configuration3.reloading.ReloadingControllerSupport; +import org.apache.commons.configuration3.resolver.CatalogResolver; +import org.apache.commons.configuration3.tree.DefaultExpressionEngine; +import org.apache.commons.configuration3.tree.DefaultExpressionEngineSymbols; +import org.apache.commons.configuration3.tree.ImmutableNode; +import org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -435,7 +435,7 @@ private BasicConfigurationBuilder
      diff --git a/src/test/resources/testCCEntityResolver.xml b/src/test/resources/testCCEntityResolver.xml index 90be8b37c9..a412eafcee 100644 --- a/src/test/resources/testCCEntityResolver.xml +++ b/src/test/resources/testCCEntityResolver.xml @@ -22,7 +22,7 @@
      + config-class="org.apache.commons.configuration3.builder.combined.TestCombinedConfigurationBuilder$EntityResolverWithPropertiesTestImpl"/>
      diff --git a/src/test/resources/testCCFileSystem.xml b/src/test/resources/testCCFileSystem.xml index a54c69915d..d1f1a59d4b 100644 --- a/src/test/resources/testCCFileSystem.xml +++ b/src/test/resources/testCCFileSystem.xml @@ -22,7 +22,7 @@
      + config-class="org.apache.commons.configuration3.builder.combined.TestCombinedConfigurationBuilder$FileSystemTestImpl"/>
      diff --git a/src/test/resources/testCCFileSystemSubConfig.xml b/src/test/resources/testCCFileSystemSubConfig.xml index 330606df13..87ddac3c7b 100644 --- a/src/test/resources/testCCFileSystemSubConfig.xml +++ b/src/test/resources/testCCFileSystemSubConfig.xml @@ -22,10 +22,10 @@
      + config-class="org.apache.commons.configuration3.io.DefaultFileSystem"/>
      + config-class="org.apache.commons.configuration3.builder.combined.TestCombinedConfigurationBuilder$FileSystemTestImpl"/>       diff --git a/src/test/resources/testCCLookup.xml b/src/test/resources/testCCLookup.xml index 99a73b7dcd..96b559da94 100644 --- a/src/test/resources/testCCLookup.xml +++ b/src/test/resources/testCCLookup.xml @@ -23,7 +23,7 @@
      + config-class="org.apache.commons.configuration3.builder.combined.TestCombinedConfigurationBuilder$TestLookup"/>
      diff --git a/src/test/resources/testCCMultiTenent.xml b/src/test/resources/testCCMultiTenent.xml index 66c6e6ad90..723b56f717 100644 --- a/src/test/resources/testCCMultiTenent.xml +++ b/src/test/resources/testCCMultiTenent.xml @@ -22,9 +22,9 @@
      - +
      @@ -32,12 +32,12 @@ config-name="clientConfig" schemaValidation="false" config-optional="true" config-forceCreate="true"> + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/>       \ No newline at end of file diff --git a/src/test/resources/testCCMultiTenentReloading.xml b/src/test/resources/testCCMultiTenentReloading.xml index 342103a038..00f580d111 100644 --- a/src/test/resources/testCCMultiTenentReloading.xml +++ b/src/test/resources/testCCMultiTenentReloading.xml @@ -21,7 +21,7 @@
      + config-class="org.apache.commons.configuration3.DynamicCombinedConfiguration">
      diff --git a/src/test/resources/testCCResultClass.xml b/src/test/resources/testCCResultClass.xml index 8103c4c1c3..51815fa66b 100644 --- a/src/test/resources/testCCResultClass.xml +++ b/src/test/resources/testCCResultClass.xml @@ -22,8 +22,8 @@
      - + config-class="org.apache.commons.configuration3.builder.combined.TestCombinedConfigurationBuilder$CombinedConfigurationTestImpl"> +
      diff --git a/src/test/resources/testCCResultInitialization.xml b/src/test/resources/testCCResultInitialization.xml index 7e6707ef32..1b5d5beecd 100644 --- a/src/test/resources/testCCResultInitialization.xml +++ b/src/test/resources/testCCResultInitialization.xml @@ -22,11 +22,11 @@
      + config-class="org.apache.commons.configuration3.convert.DefaultListDelimiterHandler"> - - + + diff --git a/src/test/resources/testComplexInitialization.xml b/src/test/resources/testComplexInitialization.xml index c22f8157d5..7c3d081e58 100644 --- a/src/test/resources/testComplexInitialization.xml +++ b/src/test/resources/testComplexInitialization.xml @@ -20,8 +20,8 @@
      - - + + @@ -35,12 +35,12 @@ - - diff --git a/src/test/resources/testConfigurationInterpolatorUpdate.xml b/src/test/resources/testConfigurationInterpolatorUpdate.xml index b830b45a0e..a91937f448 100644 --- a/src/test/resources/testConfigurationInterpolatorUpdate.xml +++ b/src/test/resources/testConfigurationInterpolatorUpdate.xml @@ -19,13 +19,13 @@
      - - + + + config-class="org.apache.commons.configuration3.DefaultConfigurationBuilder$XMLConfigurationProvider" + configurationClass="org.apache.commons.configuration3.TestDefaultConfigurationBuilder$ExtendedXMLConfiguration"/> @@ -39,12 +39,12 @@ - - diff --git a/src/test/resources/testConfigurationProvider.xml b/src/test/resources/testConfigurationProvider.xml index b9cdf9f2fd..7e780ad50b 100644 --- a/src/test/resources/testConfigurationProvider.xml +++ b/src/test/resources/testConfigurationProvider.xml @@ -19,12 +19,12 @@
      - - + + + config-class="org.apache.commons.configuration3.DefaultConfigurationBuilder$FileConfigurationProvider"/> @@ -38,12 +38,12 @@ - - diff --git a/src/test/resources/testDigesterCreateObject.xml b/src/test/resources/testDigesterCreateObject.xml index 67851f1721..e7db993ca3 100644 --- a/src/test/resources/testDigesterCreateObject.xml +++ b/src/test/resources/testDigesterCreateObject.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/test/resources/testExpression.xml b/src/test/resources/testExpression.xml index 47074e26b2..dbf3fdeda8 100644 --- a/src/test/resources/testExpression.xml +++ b/src/test/resources/testExpression.xml @@ -19,16 +19,16 @@
      - + + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> - + + config-class="org.apache.commons.configuration3.interpol.ExprLookup"> @@ -37,20 +37,20 @@ + config-class="org.apache.commons.configuration3.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration3.MultiFileHierarchicalConfiguration"/>
      + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/>       \ No newline at end of file diff --git a/src/test/resources/testExtendedClass.xml b/src/test/resources/testExtendedClass.xml index 5c83539fd7..5e7f0b0682 100644 --- a/src/test/resources/testExtendedClass.xml +++ b/src/test/resources/testExtendedClass.xml @@ -19,9 +19,9 @@
      - - + config-class="org.apache.commons.configuration3.TestDefaultConfigurationBuilder$ExtendedCombinedConfiguration"> + + @@ -35,12 +35,12 @@ - - diff --git a/src/test/resources/testExtendedXMLConfigurationProvider.xml b/src/test/resources/testExtendedXMLConfigurationProvider.xml index b830b45a0e..a91937f448 100644 --- a/src/test/resources/testExtendedXMLConfigurationProvider.xml +++ b/src/test/resources/testExtendedXMLConfigurationProvider.xml @@ -19,13 +19,13 @@
      - - + + + config-class="org.apache.commons.configuration3.DefaultConfigurationBuilder$XMLConfigurationProvider" + configurationClass="org.apache.commons.configuration3.TestDefaultConfigurationBuilder$ExtendedXMLConfiguration"/> @@ -39,12 +39,12 @@ - - diff --git a/src/test/resources/testFileReloadConfigurationBuilder.xml b/src/test/resources/testFileReloadConfigurationBuilder.xml index 96cf65aac5..bb0b906cd8 100644 --- a/src/test/resources/testFileReloadConfigurationBuilder.xml +++ b/src/test/resources/testFileReloadConfigurationBuilder.xml @@ -19,33 +19,33 @@
      - + + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> - + + config-class="org.apache.commons.configuration3.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration3.MultiFileHierarchicalConfiguration"/>
      + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration3.reloading.VFSFileChangedReloadingStrategy"/> + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration3.reloading.VFSFileChangedReloadingStrategy"/>       \ No newline at end of file diff --git a/src/test/resources/testFileReloadConfigurationBuilder2.xml b/src/test/resources/testFileReloadConfigurationBuilder2.xml index 5332973e5d..d063ec58d1 100644 --- a/src/test/resources/testFileReloadConfigurationBuilder2.xml +++ b/src/test/resources/testFileReloadConfigurationBuilder2.xml @@ -19,33 +19,33 @@
      - + + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> - + + config-class="org.apache.commons.configuration3.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration3.MultiFileHierarchicalConfiguration"/>
      + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration3.reloading.VFSFileChangedReloadingStrategy"/> + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration3.reloading.VFSFileChangedReloadingStrategy"/>       \ No newline at end of file diff --git a/src/test/resources/testFileSystem.xml b/src/test/resources/testFileSystem.xml index 9d321932e7..62d8a3d022 100644 --- a/src/test/resources/testFileSystem.xml +++ b/src/test/resources/testFileSystem.xml @@ -19,13 +19,13 @@
      - - + + - + + config-class="org.apache.commons.configuration3.DefaultConfigurationBuilder$FileConfigurationProvider"/> @@ -39,12 +39,12 @@ - - diff --git a/src/test/resources/testGlobalLookup.xml b/src/test/resources/testGlobalLookup.xml index ba37d8cf33..c1c21aef6b 100644 --- a/src/test/resources/testGlobalLookup.xml +++ b/src/test/resources/testGlobalLookup.xml @@ -19,12 +19,12 @@
      - - + + + config-class="org.apache.commons.configuration3.TestDefaultConfigurationBuilder$TestLookup"/> @@ -38,12 +38,12 @@ - - diff --git a/src/test/resources/testInterpolationBuilder.xml b/src/test/resources/testInterpolationBuilder.xml index 19c3dac26b..4837ff77a9 100644 --- a/src/test/resources/testInterpolationBuilder.xml +++ b/src/test/resources/testInterpolationBuilder.xml @@ -25,6 +25,6 @@ - + diff --git a/src/test/resources/testMultiTenentConfigurationBuilder.xml b/src/test/resources/testMultiTenentConfigurationBuilder.xml index 59ef5e309b..69e7e8dd28 100644 --- a/src/test/resources/testMultiTenentConfigurationBuilder.xml +++ b/src/test/resources/testMultiTenentConfigurationBuilder.xml @@ -19,28 +19,28 @@
      - + + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration3.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration3.MultiFileHierarchicalConfiguration"/>
      + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/>       \ No newline at end of file diff --git a/src/test/resources/testMultiTenentConfigurationBuilder2.xml b/src/test/resources/testMultiTenentConfigurationBuilder2.xml index 8078a15cb9..8a087788b7 100644 --- a/src/test/resources/testMultiTenentConfigurationBuilder2.xml +++ b/src/test/resources/testMultiTenentConfigurationBuilder2.xml @@ -19,33 +19,33 @@
      - + + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration3.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration3.MultiFileHierarchicalConfiguration"/>
      + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration3.reloading.FileChangedReloadingStrategy"/> + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration3.reloading.FileChangedReloadingStrategy"/>       \ No newline at end of file diff --git a/src/test/resources/testMultiTenentConfigurationBuilder3.xml b/src/test/resources/testMultiTenentConfigurationBuilder3.xml index e1d79c0f15..071a505381 100644 --- a/src/test/resources/testMultiTenentConfigurationBuilder3.xml +++ b/src/test/resources/testMultiTenentConfigurationBuilder3.xml @@ -19,33 +19,33 @@
      - + + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration3.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration3.MultiFileHierarchicalConfiguration"/>
      + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration3.reloading.FileChangedReloadingStrategy"/> + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration3.reloading.FileChangedReloadingStrategy"/>       \ No newline at end of file diff --git a/src/test/resources/testMultiTenentConfigurationBuilder4.xml b/src/test/resources/testMultiTenentConfigurationBuilder4.xml index d4ace8e8f3..faf9c612ee 100644 --- a/src/test/resources/testMultiTenentConfigurationBuilder4.xml +++ b/src/test/resources/testMultiTenentConfigurationBuilder4.xml @@ -20,15 +20,15 @@
      - + + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration3.TestDynamicCombinedConfiguration$ThreadLookup"/>
      @@ -38,12 +38,12 @@ config-forceCreate="true" schemaValidation="true"> + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/>       \ No newline at end of file diff --git a/src/test/resources/testMultiTenentConfigurationBuilder5.xml b/src/test/resources/testMultiTenentConfigurationBuilder5.xml index a9ffae65bd..8b78c4bd21 100644 --- a/src/test/resources/testMultiTenentConfigurationBuilder5.xml +++ b/src/test/resources/testMultiTenentConfigurationBuilder5.xml @@ -22,11 +22,11 @@
      - + + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/>
      @@ -35,13 +35,13 @@ config-name="clientConfig" config-optional="true" config-forceCreate="true" schemaValidation="false"> + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/>       diff --git a/src/test/resources/testSystemProperties.xml b/src/test/resources/testSystemProperties.xml index 8f36f3eae3..3ad677604f 100644 --- a/src/test/resources/testSystemProperties.xml +++ b/src/test/resources/testSystemProperties.xml @@ -19,14 +19,14 @@
      - - + +
      -       \ No newline at end of file diff --git a/src/test/resources/testVFSMultiTenentConfigurationBuilder1.xml b/src/test/resources/testVFSMultiTenentConfigurationBuilder1.xml index d0a2a76fb2..5e66bd278a 100644 --- a/src/test/resources/testVFSMultiTenentConfigurationBuilder1.xml +++ b/src/test/resources/testVFSMultiTenentConfigurationBuilder1.xml @@ -19,34 +19,34 @@
      - + + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> - + + config-class="org.apache.commons.configuration3.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration3.MultiFileHierarchicalConfiguration"/>
      + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration3.reloading.VFSFileChangedReloadingStrategy"/> + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration3.reloading.VFSFileChangedReloadingStrategy"/>       \ No newline at end of file diff --git a/src/test/resources/testVFSMultiTenentConfigurationBuilder2.xml b/src/test/resources/testVFSMultiTenentConfigurationBuilder2.xml index 4fcef32c45..e76eb8ae01 100644 --- a/src/test/resources/testVFSMultiTenentConfigurationBuilder2.xml +++ b/src/test/resources/testVFSMultiTenentConfigurationBuilder2.xml @@ -19,34 +19,34 @@
      - + + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> - + + config-class="org.apache.commons.configuration3.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration3.MultiFileHierarchicalConfiguration"/>
      + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration3.reloading.VFSFileChangedReloadingStrategy"/> + config-class="org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration3.reloading.VFSFileChangedReloadingStrategy"/>       \ No newline at end of file diff --git a/src/test/resources/testValidation.xml b/src/test/resources/testValidation.xml index 13b2158b99..d6ed4e0caa 100644 --- a/src/test/resources/testValidation.xml +++ b/src/test/resources/testValidation.xml @@ -19,8 +19,8 @@
      - - + +
      diff --git a/src/test/resources/testValidation2.xml b/src/test/resources/testValidation2.xml index e7ea005dd6..42c7f72070 100644 --- a/src/test/resources/testValidation2.xml +++ b/src/test/resources/testValidation2.xml @@ -19,8 +19,8 @@
      - - + +
      diff --git a/src/test/resources/testValidation3.xml b/src/test/resources/testValidation3.xml index df8f4316d3..b4e4e31a22 100644 --- a/src/test/resources/testValidation3.xml +++ b/src/test/resources/testValidation3.xml @@ -19,15 +19,15 @@
      - - + + + config-class="org.apache.commons.configuration3.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration3.MultiFileHierarchicalConfiguration"/>
      From efade0322165e8d765ceae73a2ef0473d8e49772 Mon Sep 17 00:00:00 2001 From: dockxm Date: Tue, 19 Mar 2024 08:11:57 +0100 Subject: [PATCH 3/4] Revert "CONFIGURATION-836: configuration3" This reverts commit defe1e2697d1b62e2311c454291e9d10419a8717. --- RELEASE-NOTES.txt | 18 ++-- pom.xml | 16 +-- src/conf/findbugs-exclude-filter.xml | 28 +++--- .../AbstractConfiguration.java | 40 ++++---- .../AbstractHierarchicalConfiguration.java | 38 +++---- .../AbstractYAMLBasedConfiguration.java | 8 +- .../BaseConfiguration.java | 4 +- .../BaseConfigurationXMLReader.java | 2 +- .../BaseHierarchicalConfiguration.java | 32 +++--- .../CombinedConfiguration.java | 38 +++---- .../CompositeConfiguration.java | 6 +- .../Configuration.java | 8 +- .../ConfigurationComparator.java | 2 +- .../ConfigurationConsumer.java | 4 +- .../ConfigurationConverter.java | 4 +- .../ConfigurationDecoder.java | 2 +- .../ConfigurationLookup.java | 4 +- .../ConfigurationMap.java | 4 +- .../ConfigurationUtils.java | 20 ++-- .../ConfigurationXMLReader.java | 2 +- .../DataConfiguration.java | 8 +- .../DatabaseConfiguration.java | 14 +-- .../DynamicCombinedConfiguration.java | 22 ++-- .../EnvironmentConfiguration.java | 2 +- .../FileBasedConfiguration.java | 4 +- .../FindNodeVisitor.java | 6 +- .../HierarchicalConfiguration.java | 6 +- .../HierarchicalConfigurationConverter.java | 6 +- .../HierarchicalConfigurationXMLReader.java | 8 +- .../INIConfiguration.java | 24 ++--- .../ImmutableConfiguration.java | 84 ++++++++-------- ...mutableConfigurationInvocationHandler.java | 2 +- .../ImmutableHierarchicalConfiguration.java | 4 +- .../Initializable.java | 2 +- .../JNDIConfiguration.java | 6 +- .../JSONConfiguration.java | 8 +- .../MapConfiguration.java | 8 +- .../PatternSubtreeConfigurationWrapper.java | 16 +-- .../PrefixedKeysIterator.java | 2 +- .../PropertiesConfiguration.java | 22 ++-- .../PropertiesConfigurationLayout.java | 10 +- .../StrictConfigurationComparator.java | 2 +- .../SubnodeConfiguration.java | 14 +-- .../SubsetConfiguration.java | 4 +- .../SystemConfiguration.java | 6 +- .../XMLConfiguration.java | 22 ++-- .../XMLDocumentHelper.java | 4 +- .../XMLListReference.java | 10 +- .../XMLPropertiesConfiguration.java | 10 +- .../YAMLConfiguration.java | 8 +- .../beanutils/BeanCreationContext.java | 2 +- .../beanutils/BeanDeclaration.java | 2 +- .../beanutils/BeanFactory.java | 2 +- .../beanutils/BeanHelper.java | 4 +- .../beanutils/CombinedBeanDeclaration.java | 2 +- .../beanutils/ConfigurationDynaBean.java | 14 +-- .../beanutils/ConfigurationDynaClass.java | 6 +- .../beanutils/ConstructorArg.java | 2 +- .../beanutils/DefaultBeanFactory.java | 8 +- .../beanutils/XMLBeanDeclaration.java | 12 +-- .../beanutils/package-info.java | 2 +- .../builder/AutoSaveListener.java | 12 +-- .../builder/BasicBuilderParameters.java | 22 ++-- .../builder/BasicBuilderProperties.java | 20 ++-- .../builder/BasicConfigurationBuilder.java | 32 +++--- .../BuilderConfigurationWrapperFactory.java | 14 +-- .../builder/BuilderParameters.java | 2 +- .../builder/ConfigurationBuilder.java | 10 +- .../builder/ConfigurationBuilderEvent.java | 6 +- ...onfigurationBuilderResultCreatedEvent.java | 10 +- .../builder/CopyObjectDefaultHandler.java | 6 +- .../DatabaseBuilderParametersImpl.java | 2 +- .../builder/DatabaseBuilderProperties.java | 2 +- .../builder/DefaultParametersHandler.java | 4 +- .../builder/DefaultParametersManager.java | 8 +- .../DefaultReloadingDetectorFactory.java | 10 +- .../builder/EventListenerParameters.java | 12 +-- .../builder/EventListenerProvider.java | 4 +- .../FileBasedBuilderParametersImpl.java | 10 +- .../builder/FileBasedBuilderProperties.java | 8 +- .../FileBasedConfigurationBuilder.java | 14 +-- .../HierarchicalBuilderParametersImpl.java | 4 +- .../HierarchicalBuilderProperties.java | 4 +- .../builder/INIBuilderParametersImpl.java | 2 +- .../builder/INIBuilderProperties.java | 2 +- .../builder/JndiBuilderParametersImpl.java | 2 +- .../builder/JndiBuilderProperties.java | 2 +- .../PropertiesBuilderParametersImpl.java | 10 +- .../builder/PropertiesBuilderProperties.java | 10 +- .../ReloadingBuilderSupportListener.java | 10 +- .../builder/ReloadingDetectorFactory.java | 8 +- ...eloadingFileBasedConfigurationBuilder.java | 14 +-- .../builder/XMLBuilderParametersImpl.java | 2 +- .../builder/XMLBuilderProperties.java | 2 +- .../BaseConfigurationBuilderProvider.java | 14 +-- .../CombinedBuilderParametersImpl.java | 16 +-- .../combined/CombinedBuilderProperties.java | 12 +-- .../CombinedConfigurationBuilder.java | 94 +++++++++--------- .../CombinedConfigurationBuilderProvider.java | 22 ++-- .../ConfigurationBuilderProvider.java | 8 +- .../combined/ConfigurationDeclaration.java | 6 +- ...ExtensionConfigurationBuilderProvider.java | 8 +- .../MultiFileBuilderParametersImpl.java | 10 +- .../combined/MultiFileBuilderProperties.java | 4 +- .../MultiFileConfigurationBuilder.java | 32 +++--- ...MultiFileConfigurationBuilderProvider.java | 32 +++--- .../builder/combined/MultiWrapDynaBean.java | 4 +- .../builder/combined/MultiWrapDynaClass.java | 2 +- ...ReloadingCombinedConfigurationBuilder.java | 22 ++-- ...eloadingMultiFileConfigurationBuilder.java | 16 +-- .../builder/combined/package-info.java | 2 +- .../fluent/CombinedBuilderParameters.java | 8 +- .../builder/fluent/Configurations.java | 20 ++-- .../fluent/DatabaseBuilderParameters.java | 8 +- .../fluent/FileBasedBuilderParameters.java | 8 +- .../fluent/HierarchicalBuilderParameters.java | 10 +- .../builder/fluent/INIBuilderParameters.java | 12 +-- .../builder/fluent/JndiBuilderParameters.java | 8 +- .../fluent/MultiFileBuilderParameters.java | 8 +- .../builder/fluent/Parameters.java | 28 +++--- .../fluent/PropertiesBuilderParameters.java | 10 +- .../builder/fluent/XMLBuilderParameters.java | 12 +-- .../builder/fluent/package-info.java | 2 +- .../builder/package-info.java | 2 +- .../convert/AbstractListDelimiterHandler.java | 2 +- .../convert/ConversionHandler.java | 6 +- .../convert/DefaultConversionHandler.java | 6 +- .../convert/DefaultListDelimiterHandler.java | 2 +- .../convert/DisabledListDelimiterHandler.java | 2 +- .../convert/LegacyListDelimiterHandler.java | 2 +- .../convert/ListDelimiterHandler.java | 6 +- .../convert/PropertyConverter.java | 4 +- .../convert/ValueTransformer.java | 2 +- .../convert/package-info.java | 2 +- .../event/BaseEventSource.java | 4 +- .../event/ConfigurationErrorEvent.java | 6 +- .../event/ConfigurationEvent.java | 2 +- .../event/Event.java | 2 +- .../event/EventListener.java | 2 +- .../event/EventListenerList.java | 2 +- .../event/EventListenerRegistrationData.java | 2 +- .../event/EventSource.java | 2 +- .../event/EventType.java | 2 +- .../event/package-info.java | 2 +- .../ex/ConfigurationException.java | 2 +- .../ex/ConfigurationRuntimeException.java | 2 +- .../ex/ConversionException.java | 2 +- .../ex/package-info.java | 2 +- .../interpol/ConfigurationInterpolator.java | 6 +- .../interpol/ConstantLookup.java | 2 +- .../interpol/DefaultLookups.java | 2 +- .../interpol/DummyLookup.java | 2 +- .../interpol/EnvironmentLookup.java | 2 +- .../interpol/ExprLookup.java | 6 +- .../interpol/InterpolatorSpecification.java | 2 +- .../interpol/Lookup.java | 2 +- .../interpol/StringLookupAdapter.java | 2 +- .../interpol/SystemPropertiesLookup.java | 2 +- .../interpol/package-info.java | 2 +- .../io/AbsoluteNameLocationStrategy.java | 2 +- .../io/BasePathLocationStrategy.java | 2 +- .../io/ClasspathLocationStrategy.java | 2 +- .../io/CombinedLocationStrategy.java | 2 +- .../io/ConfigurationLogger.java | 4 +- .../io/DefaultFileSystem.java | 4 +- .../io/FileBased.java | 4 +- .../io/FileHandler.java | 14 +-- .../io/FileHandlerListener.java | 2 +- .../io/FileHandlerListenerAdapter.java | 2 +- .../io/FileLocationStrategy.java | 2 +- .../io/FileLocator.java | 2 +- .../io/FileLocatorAware.java | 2 +- .../io/FileLocatorUtils.java | 4 +- .../io/FileOptionsProvider.java | 2 +- .../io/FileSystem.java | 4 +- .../io/FileSystemLocationStrategy.java | 2 +- .../io/FileUtils.java | 2 +- .../io/HomeDirectoryLocationStrategy.java | 2 +- .../io/InputStreamSupport.java | 4 +- .../io/ProvidedURLLocationStrategy.java | 2 +- .../io/URLConnectionOptions.java | 2 +- .../io/VFSFileSystem.java | 6 +- .../io/VerifiableOutputStream.java | 2 +- .../io/package-info.java | 2 +- .../package-info.java | 2 +- .../plist/PropertyListConfiguration.java | 22 ++-- .../plist/XMLPropertyListConfiguration.java | 24 ++--- .../plist/package-info.java | 2 +- .../CombinedReloadingController.java | 2 +- .../FileHandlerReloadingDetector.java | 6 +- .../reloading/ManagedReloadingDetector.java | 4 +- .../ManagedReloadingDetectorMBean.java | 2 +- .../reloading/PeriodicReloadingTrigger.java | 2 +- .../reloading/ReloadingController.java | 12 +-- .../reloading/ReloadingControllerSupport.java | 2 +- .../reloading/ReloadingDetector.java | 2 +- .../reloading/ReloadingEvent.java | 6 +- .../VFSFileHandlerReloadingDetector.java | 8 +- .../reloading/package-info.java | 2 +- .../resolver/CatalogResolver.java | 12 +-- .../resolver/DefaultEntityResolver.java | 2 +- .../resolver/EntityRegistry.java | 2 +- .../resolver/EntityResolverSupport.java | 2 +- .../resolver/package-info.java | 2 +- .../ConfigurationPropertiesFactoryBean.java | 14 +-- .../spring/ConfigurationPropertySource.java | 4 +- .../spring/package-info.java | 2 +- .../sync/LockMode.java | 2 +- .../sync/NoOpSynchronizer.java | 2 +- .../sync/ReadWriteSynchronizer.java | 2 +- .../sync/Synchronizer.java | 4 +- .../sync/SynchronizerSupport.java | 2 +- .../sync/package-info.java | 2 +- .../tree/AbstractImmutableNodeHandler.java | 2 +- .../tree/ConfigurationNodeVisitor.java | 2 +- .../tree/ConfigurationNodeVisitorAdapter.java | 2 +- .../tree/DefaultConfigurationKey.java | 2 +- .../tree/DefaultExpressionEngine.java | 2 +- .../tree/DefaultExpressionEngineSymbols.java | 2 +- .../tree/ExpressionEngine.java | 4 +- .../tree/ImmutableNode.java | 2 +- .../tree/InMemoryNodeModel.java | 4 +- .../tree/InMemoryNodeModelSupport.java | 2 +- .../tree/MergeCombiner.java | 2 +- .../tree/ModelTransaction.java | 2 +- .../tree/NodeAddData.java | 2 +- .../tree/NodeCombiner.java | 2 +- .../tree/NodeHandler.java | 2 +- .../tree/NodeHandlerDecorator.java | 2 +- .../tree/NodeKeyResolver.java | 2 +- .../tree/NodeMatcher.java | 2 +- .../tree/NodeModel.java | 2 +- .../tree/NodeModelSupport.java | 2 +- .../tree/NodeNameMatchers.java | 2 +- .../tree/NodeSelector.java | 2 +- .../tree/NodeTracker.java | 4 +- .../tree/NodeTreeWalker.java | 2 +- .../tree/NodeUpdateData.java | 2 +- .../tree/OverrideCombiner.java | 2 +- .../tree/QueryResult.java | 2 +- .../tree/ReferenceNodeHandler.java | 2 +- .../tree/ReferenceTracker.java | 2 +- .../tree/TrackedNodeHandler.java | 2 +- .../tree/TrackedNodeModel.java | 2 +- .../tree/TreeData.java | 2 +- .../tree/TreeUtils.java | 2 +- .../tree/UnionCombiner.java | 2 +- .../tree/package-info.java | 2 +- .../AbstractConfigurationNodeIterator.java | 4 +- .../xpath/ConfigurationAttributePointer.java | 6 +- .../ConfigurationNodeIteratorAttribute.java | 2 +- .../ConfigurationNodeIteratorChildren.java | 2 +- .../tree/xpath/ConfigurationNodePointer.java | 4 +- .../ConfigurationNodePointerFactory.java | 4 +- .../tree/xpath/XPathContextFactory.java | 4 +- .../tree/xpath/XPathExpressionEngine.java | 12 +-- .../tree/xpath/package-info.java | 2 +- .../web/AppletConfiguration.java | 2 +- .../web/BaseWebConfiguration.java | 4 +- .../web/ServletConfiguration.java | 2 +- .../web/ServletContextConfiguration.java | 2 +- .../web/ServletFilterConfiguration.java | 2 +- .../web/ServletRequestConfiguration.java | 2 +- .../web/package-info.java | 2 +- src/main/javacc/PropertyListParser.jj | 6 +- .../xdoc/userguide/howto_basicfeatures.xml | 10 +- src/site/xdoc/userguide/howto_builders.xml | 2 +- .../xdoc/userguide/howto_combinedbuilder.xml | 20 ++-- src/site/xdoc/userguide/howto_events.xml | 4 +- src/site/xdoc/userguide/howto_filebased.xml | 4 +- src/site/xdoc/userguide/howto_multitenant.xml | 16 +-- src/site/xdoc/userguide/howto_utilities.xml | 2 +- src/site/xdoc/userguide/upgradeto2_0.xml | 2 +- src/site/xdoc/userguide/upgradeto2_x.xml | 2 +- .../BaseNonStringProperties.java | 2 +- .../ConfigurationAssert.java | 4 +- .../DatabaseConfigurationTestHelper.java | 14 +-- .../EnumFixture.java | 2 +- .../FileURLStreamHandler.java | 2 +- .../InterpolationTestHelper.java | 4 +- .../Logging.java | 2 +- .../MockInitialContextFactory.java | 2 +- .../NonCloneableConfiguration.java | 2 +- .../NonStringTestHolder.java | 2 +- .../SynchronizerTestImpl.java | 4 +- .../TempDirUtils.java | 2 +- .../TestAbstractConfiguration.java | 6 +- ...estAbstractConfigurationBasicFeatures.java | 20 ++-- ...tAbstractConfigurationSynchronization.java | 10 +- ...TestAbstractHierarchicalConfiguration.java | 28 +++--- .../TestBaseConfiguration.java | 16 +-- .../TestBaseConfigurationXMLReader.java | 2 +- ...rarchicalConfigurationSynchronization.java | 18 ++-- .../TestBaseNullConfiguration.java | 6 +- .../TestCatalogResolver.java | 10 +- .../TestCombinedConfiguration.java | 36 +++---- .../TestCompositeConfiguration.java | 18 ++-- ...ositeConfigurationNonStringProperties.java | 4 +- .../TestConfigurationConverter.java | 4 +- .../TestConfigurationLookup.java | 2 +- .../TestConfigurationMap.java | 2 +- .../TestConfigurationSet.java | 2 +- .../TestConfigurationUtils.java | 28 +++--- .../TestDataConfiguration.java | 8 +- .../TestDatabaseConfiguration.java | 16 +-- .../TestDefaultImmutableConfiguration.java | 4 +- .../TestDynamicCombinedConfiguration.java | 40 ++++---- .../TestEnvironmentConfiguration.java | 2 +- .../TestEqualBehavior.java | 10 +- .../TestEqualsProperty.java | 4 +- .../TestHierarchicalConfiguration.java | 14 +-- ...estHierarchicalConfigurationXMLReader.java | 6 +- .../TestHierarchicalXMLConfiguration.java | 6 +- .../TestINIConfiguration.java | 28 +++--- .../TestImmutableConfiguration.java | 8 +- .../TestJNDIConfiguration.java | 10 +- .../TestJNDIEnvironmentValues.java | 2 +- .../TestJSONConfiguration.java | 4 +- .../TestMapConfiguration.java | 10 +- .../TestNonStringProperties.java | 4 +- .../TestNullCompositeConfiguration.java | 8 +- .../TestNullJNDIEnvironmentValues.java | 2 +- .../TestPatternSubtreeConfiguration.java | 10 +- ...estPatternSubtreeConfigurationWrapper.java | 2 +- .../TestPropertiesConfiguration.java | 32 +++--- .../TestPropertiesConfigurationLayout.java | 12 +-- .../TestPropertiesSequence.java | 8 +- .../TestStrictConfigurationComparator.java | 2 +- .../TestSubnodeConfiguration.java | 22 ++-- .../TestSubsetConfiguration.java | 14 +-- .../TestSystemConfiguration.java | 8 +- .../TestThreesomeConfiguration.java | 8 +- .../TestXMLConfiguration.java | 26 ++--- .../TestXMLConfiguration_605.java | 12 +-- .../TestXMLDocumentHelper.java | 4 +- .../TestXMLListHandling.java | 12 +-- .../TestXMLPropertiesConfiguration.java | 8 +- .../TestYAMLConfiguration.java | 4 +- .../beanutils/BeanCreationTestBean.java | 2 +- .../BeanCreationTestBeanWithListChild.java | 2 +- .../beanutils/BeanCreationTestCtorBean.java | 2 +- .../beanutils/BeanDeclarationTestImpl.java | 2 +- .../beanutils/TestBeanHelper.java | 6 +- .../TestCombinedBeanDeclaration.java | 2 +- .../beanutils/TestConfigurationDynaBean.java | 8 +- .../TestConfigurationDynaBeanXMLConfig.java | 6 +- .../beanutils/TestConstructorArg.java | 2 +- .../beanutils/TestDefaultBeanFactory.java | 10 +- .../beanutils/TestXMLBeanDeclaration.java | 8 +- .../builder/BuilderEventListenerImpl.java | 6 +- .../builder/ParametersBeanTestImpl.java | 2 +- .../builder/TestAutoSaveListener.java | 8 +- .../builder/TestBasicBuilderParameters.java | 26 ++--- .../TestBasicConfigurationBuilder.java | 50 +++++----- .../TestBasicConfigurationBuilderEvents.java | 12 +-- ...estBuilderConfigurationWrapperFactory.java | 22 ++-- .../builder/TestCopyObjectDefaultHandler.java | 6 +- .../TestDatabaseBuilderParametersImpl.java | 4 +- .../builder/TestDefaultParametersManager.java | 14 +-- .../TestDefaultReloadingDetectorFactory.java | 8 +- .../builder/TestEventListenerParameters.java | 8 +- .../TestFileBasedBuilderParameters.java | 14 +-- .../TestFileBasedConfigurationBuilder.java | 38 +++---- ...TestHierarchicalBuilderParametersImpl.java | 6 +- .../TestJndiBuilderParametersImpl.java | 4 +- .../TestPropertiesBuilderParametersImpl.java | 12 +-- .../TestReloadingBuilderSupportListener.java | 14 +-- ...eloadingFileBasedConfigurationBuilder.java | 12 +-- .../builder/TestXMLBuilderParametersImpl.java | 4 +- ...ractMultiFileConfigurationBuilderTest.java | 10 +- .../TestBaseConfigurationBuilderProvider.java | 32 +++--- .../TestCombinedBuilderParametersImpl.java | 24 ++--- .../TestCombinedConfigurationBuilder.java | 94 +++++++++--------- .../TestCombinedConfigurationBuilderVFS.java | 20 ++-- .../TestConfigurationDeclaration.java | 8 +- ...ExtensionConfigurationBuilderProvider.java | 16 +-- .../TestMultiFileBuilderParametersImpl.java | 8 +- .../TestMultiFileConfigurationBuilder.java | 46 ++++----- .../combined/TestMultiWrapDynaBean.java | 10 +- ...ReloadingCombinedConfigurationBuilder.java | 20 ++-- ...CombinedConfigurationBuilderFileBased.java | 46 ++++----- ...eloadingMultiFileConfigurationBuilder.java | 20 ++-- .../builder/fluent/TestConfigurations.java | 24 ++--- .../builder/fluent/TestParameters.java | 28 +++--- .../convert/TestDefaultConversionHandler.java | 6 +- .../TestDefaultListDelimiterHandler.java | 2 +- .../TestDisabledListDelimiterHandler.java | 2 +- .../convert/TestPropertyConverter.java | 4 +- .../event/AbstractEventListenerTestImpl.java | 2 +- .../AbstractTestConfigurationEvents.java | 4 +- .../event/ErrorListenerTestImpl.java | 2 +- .../event/EventListenerTestImpl.java | 2 +- .../event/TestConfigurationEventTypes.java | 2 +- .../TestDatabaseConfigurationEvents.java | 8 +- .../event/TestEvent.java | 2 +- .../event/TestEventListenerList.java | 2 +- .../event/TestEventSource.java | 2 +- .../event/TestEventType.java | 2 +- .../TestHierarchicalConfigurationEvents.java | 16 +-- .../event/TestMapConfigurationEvents.java | 6 +- .../TestPropertiesConfigurationEvents.java | 6 +- .../event/TestSubsetConfigurationEvents.java | 8 +- .../event/TestXMLConfigurationEvents.java | 6 +- .../TestConfigurationInterpolator.java | 2 +- .../interpol/TestConstantLookup.java | 2 +- .../interpol/TestDummyLookup.java | 2 +- .../interpol/TestEnvironmentLookup.java | 2 +- .../interpol/TestExprLookup.java | 12 +-- .../TestInterpolatorSpecification.java | 2 +- .../interpol/TestSystemPropertiesLookup.java | 2 +- .../io/TestAbsoluteNameLocationStrategy.java | 4 +- .../io/TestBasePathLocationStrategy.java | 4 +- .../io/TestClasspathLocationStrategy.java | 10 +- .../io/TestCombinedLocationStrategy.java | 4 +- .../io/TestConfigurationLogger.java | 6 +- .../io/TestDefaultFileSystem.java | 4 +- .../io/TestFileHandler.java | 16 +-- .../io/TestFileLocator.java | 4 +- .../io/TestFileLocatorUtils.java | 8 +- .../io/TestFileSystemLocationStrategy.java | 4 +- .../io/TestHomeDirectoryLocationStrategy.java | 6 +- .../io/TestProvidedURLLocationStrategy.java | 4 +- .../plist/AbstractTestPListEvents.java | 6 +- .../plist/TestPropertyListConfiguration.java | 22 ++-- .../TestPropertyListConfigurationEvents.java | 12 +-- .../plist/TestPropertyListParser.java | 2 +- .../TestXMLPropertyListConfiguration.java | 16 +-- ...estXMLPropertyListConfigurationEvents.java | 12 +-- .../reloading/AlwaysReloadingDetector.java | 2 +- .../reloading/RandomReloadingDetector.java | 2 +- .../TestCombinedReloadingController.java | 2 +- .../TestFileHandlerReloadingDetector.java | 4 +- .../TestManagedReloadingDetector.java | 2 +- .../TestPeriodicReloadingTrigger.java | 2 +- .../reloading/TestReloadingController.java | 6 +- .../TestVFSFileHandlerReloadingDetector.java | 12 +-- ...estConfigurationPropertiesFactoryBean.java | 12 +-- .../TestConfigurationPropertySource.java | 4 +- .../sync/TestReadWriteSynchronizer.java | 2 +- .../test/HsqlDB.java | 2 +- .../tree/AbstractCombinerTest.java | 12 +-- .../AbstractImmutableNodeHandlerTest.java | 8 +- .../tree/NodeStructureHelper.java | 2 +- .../tree/TestDefaultConfigurationKey.java | 2 +- .../tree/TestDefaultExpressionEngine.java | 2 +- .../TestDefaultExpressionEngineSymbols.java | 2 +- .../tree/TestImmutableNode.java | 2 +- .../tree/TestInMemoryNodeModel.java | 10 +- .../tree/TestInMemoryNodeModelReferences.java | 2 +- .../TestInMemoryNodeModelTrackedNodes.java | 4 +- .../tree/TestMergeCombiner.java | 10 +- .../tree/TestNodeAddData.java | 2 +- .../tree/TestNodeHandlerDecorator.java | 2 +- .../tree/TestNodeNameMatchers.java | 2 +- .../tree/TestNodeSelector.java | 4 +- .../tree/TestNodeTreeWalker.java | 2 +- .../tree/TestNodeUpdateData.java | 2 +- .../tree/TestOverrideCombiner.java | 12 +-- .../tree/TestQueryResult.java | 4 +- .../tree/TestTrackedNodeHandler.java | 2 +- .../tree/TestTrackedNodeModel.java | 2 +- .../tree/TestTreeData.java | 2 +- .../tree/TestUnionCombiner.java | 6 +- .../tree/xpath/AbstractXPathTest.java | 8 +- .../TestConfigurationAttributePointer.java | 8 +- .../TestConfigurationIteratorAttributes.java | 4 +- ...TestConfigurationNodeIteratorChildren.java | 6 +- .../xpath/TestConfigurationNodePointer.java | 4 +- .../TestConfigurationNodePointerFactory.java | 4 +- .../tree/xpath/TestXPathContextFactory.java | 8 +- .../tree/xpath/TestXPathExpressionEngine.java | 12 +-- .../TestXPathExpressionEngineInConfig.java | 8 +- .../web/TestAppletConfiguration.java | 12 +-- .../web/TestServletConfiguration.java | 8 +- .../web/TestServletContextConfiguration.java | 8 +- .../web/TestServletFilterConfiguration.java | 9 +- .../web/TestServletRequestConfiguration.java | 14 +-- .../test.jar | Bin src/test/resources/testCCCustomProvider.xml | 2 +- src/test/resources/testCCEntityResolver.xml | 2 +- src/test/resources/testCCFileSystem.xml | 2 +- .../resources/testCCFileSystemSubConfig.xml | 4 +- src/test/resources/testCCLookup.xml | 2 +- src/test/resources/testCCMultiTenent.xml | 8 +- .../resources/testCCMultiTenentReloading.xml | 2 +- src/test/resources/testCCResultClass.xml | 4 +- .../resources/testCCResultInitialization.xml | 6 +- .../resources/testComplexInitialization.xml | 8 +- .../testConfigurationInterpolatorUpdate.xml | 12 +-- .../resources/testConfigurationProvider.xml | 10 +- .../resources/testDigesterCreateObject.xml | 2 +- src/test/resources/testExpression.xml | 18 ++-- src/test/resources/testExtendedClass.xml | 10 +- .../testExtendedXMLConfigurationProvider.xml | 12 +-- .../testFileReloadConfigurationBuilder.xml | 20 ++-- .../testFileReloadConfigurationBuilder2.xml | 20 ++-- src/test/resources/testFileSystem.xml | 12 +-- src/test/resources/testGlobalLookup.xml | 10 +- .../resources/testInterpolationBuilder.xml | 2 +- .../testMultiTenentConfigurationBuilder.xml | 14 +-- .../testMultiTenentConfigurationBuilder2.xml | 18 ++-- .../testMultiTenentConfigurationBuilder3.xml | 18 ++-- .../testMultiTenentConfigurationBuilder4.xml | 12 +-- .../testMultiTenentConfigurationBuilder5.xml | 10 +- src/test/resources/testSystemProperties.xml | 6 +- ...estVFSMultiTenentConfigurationBuilder1.xml | 20 ++-- ...estVFSMultiTenentConfigurationBuilder2.xml | 20 ++-- src/test/resources/testValidation.xml | 4 +- src/test/resources/testValidation2.xml | 4 +- src/test/resources/testValidation3.xml | 10 +- 510 files changed, 2049 insertions(+), 2048 deletions(-) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/AbstractConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/AbstractHierarchicalConfiguration.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/AbstractYAMLBasedConfiguration.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/BaseConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/BaseConfigurationXMLReader.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/BaseHierarchicalConfiguration.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/CombinedConfiguration.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/CompositeConfiguration.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/Configuration.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/ConfigurationComparator.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/ConfigurationConsumer.java (92%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/ConfigurationConverter.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/ConfigurationDecoder.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/ConfigurationLookup.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/ConfigurationMap.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/ConfigurationUtils.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/ConfigurationXMLReader.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/DataConfiguration.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/DatabaseConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/DynamicCombinedConfiguration.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/EnvironmentConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/FileBasedConfiguration.java (92%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/FindNodeVisitor.java (93%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/HierarchicalConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/HierarchicalConfigurationConverter.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/HierarchicalConfigurationXMLReader.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/INIConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/ImmutableConfiguration.java (92%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/ImmutableConfigurationInvocationHandler.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/ImmutableHierarchicalConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/Initializable.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/JNDIConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/JSONConfiguration.java (92%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/MapConfiguration.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/PatternSubtreeConfigurationWrapper.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/PrefixedKeysIterator.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/PropertiesConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/PropertiesConfigurationLayout.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/StrictConfigurationComparator.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/SubnodeConfiguration.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/SubsetConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/SystemConfiguration.java (95%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/XMLConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/XMLDocumentHelper.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/XMLListReference.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/XMLPropertiesConfiguration.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/YAMLConfiguration.java (94%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/beanutils/BeanCreationContext.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/beanutils/BeanDeclaration.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/beanutils/BeanFactory.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/beanutils/BeanHelper.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/beanutils/CombinedBeanDeclaration.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/beanutils/ConfigurationDynaBean.java (94%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/beanutils/ConfigurationDynaClass.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/beanutils/ConstructorArg.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/beanutils/DefaultBeanFactory.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/beanutils/XMLBeanDeclaration.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/beanutils/package-info.java (95%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/AutoSaveListener.java (92%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/BasicBuilderParameters.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/BasicBuilderProperties.java (93%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/BasicConfigurationBuilder.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/BuilderConfigurationWrapperFactory.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/BuilderParameters.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/ConfigurationBuilder.java (87%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/ConfigurationBuilderEvent.java (95%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/ConfigurationBuilderResultCreatedEvent.java (92%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/CopyObjectDefaultHandler.java (95%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/DatabaseBuilderParametersImpl.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/DatabaseBuilderProperties.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/DefaultParametersHandler.java (95%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/DefaultParametersManager.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/DefaultReloadingDetectorFactory.java (85%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/EventListenerParameters.java (91%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/EventListenerProvider.java (94%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/FileBasedBuilderParametersImpl.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/FileBasedBuilderProperties.java (94%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/FileBasedConfigurationBuilder.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/HierarchicalBuilderParametersImpl.java (94%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/HierarchicalBuilderProperties.java (93%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/INIBuilderParametersImpl.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/INIBuilderProperties.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/JndiBuilderParametersImpl.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/JndiBuilderProperties.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/PropertiesBuilderParametersImpl.java (91%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/PropertiesBuilderProperties.java (91%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/ReloadingBuilderSupportListener.java (92%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/ReloadingDetectorFactory.java (89%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/ReloadingFileBasedConfigurationBuilder.java (95%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/XMLBuilderParametersImpl.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/XMLBuilderProperties.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/BaseConfigurationBuilderProvider.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/CombinedBuilderParametersImpl.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/CombinedBuilderProperties.java (95%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/CombinedConfigurationBuilder.java (94%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/CombinedConfigurationBuilderProvider.java (87%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/ConfigurationBuilderProvider.java (88%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/ConfigurationDeclaration.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/FileExtensionConfigurationBuilderProvider.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/MultiFileBuilderParametersImpl.java (95%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/MultiFileBuilderProperties.java (94%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/MultiFileConfigurationBuilder.java (95%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/MultiFileConfigurationBuilderProvider.java (89%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/MultiWrapDynaBean.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/MultiWrapDynaClass.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/ReloadingCombinedConfigurationBuilder.java (91%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/ReloadingMultiFileConfigurationBuilder.java (91%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/package-info.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/fluent/CombinedBuilderParameters.java (84%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/fluent/Configurations.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/fluent/DatabaseBuilderParameters.java (84%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/fluent/FileBasedBuilderParameters.java (84%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/fluent/HierarchicalBuilderParameters.java (82%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/fluent/INIBuilderParameters.java (79%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/fluent/JndiBuilderParameters.java (84%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/fluent/MultiFileBuilderParameters.java (85%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/fluent/Parameters.java (93%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/fluent/PropertiesBuilderParameters.java (82%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/fluent/XMLBuilderParameters.java (79%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/fluent/package-info.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/builder/package-info.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/convert/AbstractListDelimiterHandler.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/convert/ConversionHandler.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/convert/DefaultConversionHandler.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/convert/DefaultListDelimiterHandler.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/convert/DisabledListDelimiterHandler.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/convert/LegacyListDelimiterHandler.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/convert/ListDelimiterHandler.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/convert/PropertyConverter.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/convert/ValueTransformer.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/convert/package-info.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/event/BaseEventSource.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/event/ConfigurationErrorEvent.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/event/ConfigurationEvent.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/event/Event.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/event/EventListener.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/event/EventListenerList.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/event/EventListenerRegistrationData.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/event/EventSource.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/event/EventType.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/event/package-info.java (95%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/ex/ConfigurationException.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/ex/ConfigurationRuntimeException.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/ex/ConversionException.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/ex/package-info.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/interpol/ConfigurationInterpolator.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/interpol/ConstantLookup.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/interpol/DefaultLookups.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/interpol/DummyLookup.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/interpol/EnvironmentLookup.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/interpol/ExprLookup.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/interpol/InterpolatorSpecification.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/interpol/Lookup.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/interpol/StringLookupAdapter.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/interpol/SystemPropertiesLookup.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/interpol/package-info.java (94%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/AbsoluteNameLocationStrategy.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/BasePathLocationStrategy.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/ClasspathLocationStrategy.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/CombinedLocationStrategy.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/ConfigurationLogger.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/DefaultFileSystem.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/FileBased.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/FileHandler.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/FileHandlerListener.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/FileHandlerListenerAdapter.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/FileLocationStrategy.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/FileLocator.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/FileLocatorAware.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/FileLocatorUtils.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/FileOptionsProvider.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/FileSystem.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/FileSystemLocationStrategy.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/FileUtils.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/HomeDirectoryLocationStrategy.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/InputStreamSupport.java (94%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/ProvidedURLLocationStrategy.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/URLConnectionOptions.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/VFSFileSystem.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/VerifiableOutputStream.java (95%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/io/package-info.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/package-info.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/plist/PropertyListConfiguration.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/plist/XMLPropertyListConfiguration.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/plist/package-info.java (94%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/reloading/CombinedReloadingController.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/reloading/FileHandlerReloadingDetector.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/reloading/ManagedReloadingDetector.java (94%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/reloading/ManagedReloadingDetectorMBean.java (95%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/reloading/PeriodicReloadingTrigger.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/reloading/ReloadingController.java (95%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/reloading/ReloadingControllerSupport.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/reloading/ReloadingDetector.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/reloading/ReloadingEvent.java (94%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/reloading/VFSFileHandlerReloadingDetector.java (95%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/reloading/package-info.java (95%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/resolver/CatalogResolver.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/resolver/DefaultEntityResolver.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/resolver/EntityRegistry.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/resolver/EntityResolverSupport.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/resolver/package-info.java (94%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/spring/ConfigurationPropertiesFactoryBean.java (93%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/spring/ConfigurationPropertySource.java (94%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/spring/package-info.java (94%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/sync/LockMode.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/sync/NoOpSynchronizer.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/sync/ReadWriteSynchronizer.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/sync/Synchronizer.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/sync/SynchronizerSupport.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/sync/package-info.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/AbstractImmutableNodeHandler.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/ConfigurationNodeVisitor.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/ConfigurationNodeVisitorAdapter.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/DefaultConfigurationKey.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/DefaultExpressionEngine.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/DefaultExpressionEngineSymbols.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/ExpressionEngine.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/ImmutableNode.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/InMemoryNodeModel.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/InMemoryNodeModelSupport.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/MergeCombiner.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/ModelTransaction.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/NodeAddData.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/NodeCombiner.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/NodeHandler.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/NodeHandlerDecorator.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/NodeKeyResolver.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/NodeMatcher.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/NodeModel.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/NodeModelSupport.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/NodeNameMatchers.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/NodeSelector.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/NodeTracker.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/NodeTreeWalker.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/NodeUpdateData.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/OverrideCombiner.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/QueryResult.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/ReferenceNodeHandler.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/ReferenceTracker.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/TrackedNodeHandler.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/TrackedNodeModel.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/TreeData.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/TreeUtils.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/UnionCombiner.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/package-info.java (94%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/xpath/AbstractConfigurationNodeIterator.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/xpath/ConfigurationAttributePointer.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/xpath/ConfigurationNodeIteratorAttribute.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/xpath/ConfigurationNodeIteratorChildren.java (99%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/xpath/ConfigurationNodePointer.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/xpath/ConfigurationNodePointerFactory.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/xpath/XPathContextFactory.java (93%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/xpath/XPathExpressionEngine.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/tree/xpath/package-info.java (94%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/web/AppletConfiguration.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/web/BaseWebConfiguration.java (96%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/web/ServletConfiguration.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/web/ServletContextConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/web/ServletFilterConfiguration.java (97%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/web/ServletRequestConfiguration.java (98%) rename src/main/java/org/apache/commons/{configuration3 => configuration2}/web/package-info.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/BaseNonStringProperties.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/ConfigurationAssert.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/DatabaseConfigurationTestHelper.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/EnumFixture.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/FileURLStreamHandler.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/InterpolationTestHelper.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/Logging.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/MockInitialContextFactory.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/NonCloneableConfiguration.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/NonStringTestHolder.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/SynchronizerTestImpl.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TempDirUtils.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestAbstractConfiguration.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestAbstractConfigurationBasicFeatures.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestAbstractConfigurationSynchronization.java (96%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestAbstractHierarchicalConfiguration.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestBaseConfiguration.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestBaseConfigurationXMLReader.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestBaseHierarchicalConfigurationSynchronization.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestBaseNullConfiguration.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestCatalogResolver.java (91%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestCombinedConfiguration.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestCompositeConfiguration.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestCompositeConfigurationNonStringProperties.java (94%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestConfigurationConverter.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestConfigurationLookup.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestConfigurationMap.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestConfigurationSet.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestConfigurationUtils.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestDataConfiguration.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestDatabaseConfiguration.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestDefaultImmutableConfiguration.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestDynamicCombinedConfiguration.java (93%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestEnvironmentConfiguration.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestEqualBehavior.java (96%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestEqualsProperty.java (93%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestHierarchicalConfiguration.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestHierarchicalConfigurationXMLReader.java (94%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestHierarchicalXMLConfiguration.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestINIConfiguration.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestImmutableConfiguration.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestJNDIConfiguration.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestJNDIEnvironmentValues.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestJSONConfiguration.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestMapConfiguration.java (94%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestNonStringProperties.java (93%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestNullCompositeConfiguration.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestNullJNDIEnvironmentValues.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestPatternSubtreeConfiguration.java (91%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestPatternSubtreeConfigurationWrapper.java (96%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestPropertiesConfiguration.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestPropertiesConfigurationLayout.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestPropertiesSequence.java (96%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestStrictConfigurationComparator.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestSubnodeConfiguration.java (96%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestSubsetConfiguration.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestSystemConfiguration.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestThreesomeConfiguration.java (91%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestXMLConfiguration.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestXMLConfiguration_605.java (93%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestXMLDocumentHelper.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestXMLListHandling.java (94%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestXMLPropertiesConfiguration.java (96%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/TestYAMLConfiguration.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/beanutils/BeanCreationTestBean.java (96%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/beanutils/BeanCreationTestBeanWithListChild.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/beanutils/BeanCreationTestCtorBean.java (96%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/beanutils/BeanDeclarationTestImpl.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/beanutils/TestBeanHelper.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/beanutils/TestCombinedBeanDeclaration.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/beanutils/TestConfigurationDynaBean.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/beanutils/TestConfigurationDynaBeanXMLConfig.java (89%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/beanutils/TestConstructorArg.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/beanutils/TestDefaultBeanFactory.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/beanutils/TestXMLBeanDeclaration.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/BuilderEventListenerImpl.java (94%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/ParametersBeanTestImpl.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/TestAutoSaveListener.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/TestBasicBuilderParameters.java (96%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/TestBasicConfigurationBuilder.java (93%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/TestBasicConfigurationBuilderEvents.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/TestBuilderConfigurationWrapperFactory.java (92%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/TestCopyObjectDefaultHandler.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/TestDatabaseBuilderParametersImpl.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/TestDefaultParametersManager.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/TestDefaultReloadingDetectorFactory.java (91%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/TestEventListenerParameters.java (92%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/TestFileBasedBuilderParameters.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/TestFileBasedConfigurationBuilder.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/TestHierarchicalBuilderParametersImpl.java (94%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/TestJndiBuilderParametersImpl.java (96%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/TestPropertiesBuilderParametersImpl.java (94%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/TestReloadingBuilderSupportListener.java (87%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/TestReloadingFileBasedConfigurationBuilder.java (96%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/TestXMLBuilderParametersImpl.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/AbstractMultiFileConfigurationBuilderTest.java (91%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/TestBaseConfigurationBuilderProvider.java (90%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/TestCombinedBuilderParametersImpl.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/TestCombinedConfigurationBuilder.java (94%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/TestCombinedConfigurationBuilderVFS.java (80%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/TestConfigurationDeclaration.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/TestFileExtensionConfigurationBuilderProvider.java (93%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/TestMultiFileBuilderParametersImpl.java (94%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/TestMultiFileConfigurationBuilder.java (91%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/TestMultiWrapDynaBean.java (96%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/TestReloadingCombinedConfigurationBuilder.java (89%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java (90%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/combined/TestReloadingMultiFileConfigurationBuilder.java (93%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/fluent/TestConfigurations.java (96%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/builder/fluent/TestParameters.java (94%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/convert/TestDefaultConversionHandler.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/convert/TestDefaultListDelimiterHandler.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/convert/TestDisabledListDelimiterHandler.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/convert/TestPropertyConverter.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/event/AbstractEventListenerTestImpl.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/event/AbstractTestConfigurationEvents.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/event/ErrorListenerTestImpl.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/event/EventListenerTestImpl.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/event/TestConfigurationEventTypes.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/event/TestDatabaseConfigurationEvents.java (87%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/event/TestEvent.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/event/TestEventListenerList.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/event/TestEventSource.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/event/TestEventType.java (96%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/event/TestHierarchicalConfigurationEvents.java (90%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/event/TestMapConfigurationEvents.java (86%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/event/TestPropertiesConfigurationEvents.java (86%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/event/TestSubsetConfigurationEvents.java (83%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/event/TestXMLConfigurationEvents.java (86%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/interpol/TestConfigurationInterpolator.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/interpol/TestConstantLookup.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/interpol/TestDummyLookup.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/interpol/TestEnvironmentLookup.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/interpol/TestExprLookup.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/interpol/TestInterpolatorSpecification.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/interpol/TestSystemPropertiesLookup.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/io/TestAbsoluteNameLocationStrategy.java (96%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/io/TestBasePathLocationStrategy.java (96%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/io/TestClasspathLocationStrategy.java (90%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/io/TestCombinedLocationStrategy.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/io/TestConfigurationLogger.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/io/TestDefaultFileSystem.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/io/TestFileHandler.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/io/TestFileLocator.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/io/TestFileLocatorUtils.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/io/TestFileSystemLocationStrategy.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/io/TestHomeDirectoryLocationStrategy.java (96%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/io/TestProvidedURLLocationStrategy.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/plist/AbstractTestPListEvents.java (92%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/plist/TestPropertyListConfiguration.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/plist/TestPropertyListConfigurationEvents.java (80%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/plist/TestPropertyListParser.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/plist/TestXMLPropertyListConfiguration.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/plist/TestXMLPropertyListConfigurationEvents.java (80%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/reloading/AlwaysReloadingDetector.java (96%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/reloading/RandomReloadingDetector.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/reloading/TestCombinedReloadingController.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/reloading/TestFileHandlerReloadingDetector.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/reloading/TestManagedReloadingDetector.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/reloading/TestPeriodicReloadingTrigger.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/reloading/TestReloadingController.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/reloading/TestVFSFileHandlerReloadingDetector.java (94%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/spring/TestConfigurationPropertiesFactoryBean.java (93%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/spring/TestConfigurationPropertySource.java (96%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/sync/TestReadWriteSynchronizer.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/test/HsqlDB.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/AbstractCombinerTest.java (89%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/AbstractImmutableNodeHandlerTest.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/NodeStructureHelper.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/TestDefaultConfigurationKey.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/TestDefaultExpressionEngine.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/TestDefaultExpressionEngineSymbols.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/TestImmutableNode.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/TestInMemoryNodeModel.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/TestInMemoryNodeModelReferences.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/TestInMemoryNodeModelTrackedNodes.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/TestMergeCombiner.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/TestNodeAddData.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/TestNodeHandlerDecorator.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/TestNodeNameMatchers.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/TestNodeSelector.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/TestNodeTreeWalker.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/TestNodeUpdateData.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/TestOverrideCombiner.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/TestQueryResult.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/TestTrackedNodeHandler.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/TestTrackedNodeModel.java (99%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/TestTreeData.java (96%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/TestUnionCombiner.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/xpath/AbstractXPathTest.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/xpath/TestConfigurationAttributePointer.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/xpath/TestConfigurationIteratorAttributes.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/xpath/TestConfigurationNodeIteratorChildren.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/xpath/TestConfigurationNodePointer.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/xpath/TestConfigurationNodePointerFactory.java (97%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/xpath/TestXPathContextFactory.java (89%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/xpath/TestXPathExpressionEngine.java (98%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/tree/xpath/TestXPathExpressionEngineInConfig.java (95%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/web/TestAppletConfiguration.java (91%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/web/TestServletConfiguration.java (93%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/web/TestServletContextConfiguration.java (94%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/web/TestServletFilterConfiguration.java (91%) rename src/test/java/org/apache/commons/{configuration3 => configuration2}/web/TestServletRequestConfiguration.java (91%) rename src/test/resources/org/apache/commons/{configuration3 => configuration2}/test.jar (100%) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index b9e7dc0dd2..d3449696af 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -212,8 +212,8 @@ Fixed Bugs * CONFIGURATION-822: Fix ambiguity on the section determining #229. Thanks to Branislav Be?o, Gary Gregory, Bruno P. Kinoshita. * Use Java style array decelerations #244. Thanks to Arturo Bernal. * Add ImmutableNode.stream(). Thanks to Gary Gregory. -* Avoid NullPointerException in org.apache.commons.configuration3.web.AppletConfiguration.getKeysInternal(). Thanks to Gary Gregory. -* Fix JDBC prepared statements leak in org.apache.commons.configuration3.DatabaseConfiguration.clearPropertyDirect(String). Thanks to Gary Gregory. +* Avoid NullPointerException in org.apache.commons.configuration2.web.AppletConfiguration.getKeysInternal(). Thanks to Gary Gregory. +* Fix JDBC prepared statements leak in org.apache.commons.configuration2.DatabaseConfiguration.clearPropertyDirect(String). Thanks to Gary Gregory. Changes ------- @@ -465,7 +465,7 @@ Fixed Bugs ---------- * CONFIGURATION-750: XMLPropertyListConfiguration cannot set arrays in the correct plist form. Thanks to Jason Pickens, Gary Gregory, Emmanuel Bourg. -* Fix Javadoc for org.apache.commons.configuration3.PropertiesConfiguration.getIncludeOptional(). Thanks to Gary Gregory. +* Fix Javadoc for org.apache.commons.configuration2.PropertiesConfiguration.getIncludeOptional(). Thanks to Gary Gregory. * CONFIGURATION-760: Properties file using cyclical includes cause a StackOverflowError instead of detecting the misconfiguration. Thanks to Gary Gregory. Changes @@ -587,7 +587,7 @@ Fixed Bugs * CONFIGURATION-710: Fixed numerous typos in user guides. Thanks to thc202. * CONFIGURATION-711: Update Apache Commons Lang from 3.7 to 3.8.1. -* CONFIGURATION-727: org.apache.commons.configuration3.DatabaseConfiguration never closes result sets and statements. +* CONFIGURATION-727: org.apache.commons.configuration2.DatabaseConfiguration never closes result sets and statements. Changes ------- @@ -643,7 +643,7 @@ New features Path. * CONFIGURATION-698 - Add org.apache.commons.configuration3.MapConfiguration.toString(). + Add org.apache.commons.configuration2.MapConfiguration.toString(). * CONFIGURATION-698 Add toString() methods here and there to help debugging. @@ -740,16 +740,16 @@ New features Add convenience ctor ConfigurationRuntimeException(String, Object...). * CONFIGURATION-665 - Add org.apache.commons.configuration3.AbstractHierarchicalConfiguration.toString(). + Add org.apache.commons.configuration2.AbstractHierarchicalConfiguration.toString(). * CONFIGURATION-664 - Add API org.apache.commons.configuration3.tree.ImmutableNode.getChildren(String). + Add API org.apache.commons.configuration2.tree.ImmutableNode.getChildren(String). * CONFIGURATION-660 Add toString() methods here and there to help debugging. * CONFIGURATION-658 - Add API org.apache.commons.configuration3.DataConfiguration.getURI(String) + Add API org.apache.commons.configuration2.DataConfiguration.getURI(String) methods. * CONFIGURATION-656 @@ -986,7 +986,7 @@ https://commons.apache.org/configuration/userguide/upgradeto2_0.html that describes all breaking changes and helps when upgrading to the new version. One obvious breaking change is the renaming of the main package -(all classes are now located under org.apache.commons.configuration3) and the +(all classes are now located under org.apache.commons.configuration2) and the Maven coordinates (groupId: org.apache.commons, artifactId: commons-configuration2). This was necessary to allow both versions to coexist on the classpath without conflicts. diff --git a/pom.xml b/pom.xml index defc526eb7..08a0d7ad45 100644 --- a/pom.xml +++ b/pom.xml @@ -23,8 +23,8 @@ 67 4.0.0 - commons-configuration3 - 3.0.0-SNAPSHOT + commons-configuration2 + 2.10.1-SNAPSHOT Apache Commons Configuration 2001 @@ -402,7 +402,7 @@ - + jakarta.servlet jakarta.servlet-api 6.0.0 @@ -535,7 +535,7 @@ configuration - org.apache.commons.configuration3 + org.apache.commons.configuration2 2.10.0 2.10.1 (Java 8 or above) @@ -571,7 +571,7 @@ false - 3.0.0-SNAPSHOT + 2.9.0 RC1 true scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid} @@ -634,7 +634,7 @@ The below setting for not failing upon error stems from the fact that javacc's generated code. - Javacc is responsible for a portion of the code in the package org.apache.commons.configuration3.plist, + Javacc is responsible for a portion of the code in the package org.apache.commons.configuration2.plist, and only generates a portion of the package. Furthermore, the javacc parser generator generates javadoc that does not conform to the java 1.8 standard and causes the build to fail. For the sake of releasing commons-configuration-2.4. @@ -663,7 +663,7 @@ true - org.apache.commons.configuration3.Logging + org.apache.commons.configuration2.Logging       @@ -715,7 +715,7 @@ - org.apache.commons.configuration3 + org.apache.commons.configuration2 diff --git a/src/conf/findbugs-exclude-filter.xml b/src/conf/findbugs-exclude-filter.xml index 4e6cc125ba..fa853dc153 100644 --- a/src/conf/findbugs-exclude-filter.xml +++ b/src/conf/findbugs-exclude-filter.xml @@ -28,12 +28,12 @@ - + - + @@ -42,7 +42,7 @@ the default encoding is used. This is stated in the documentation. --> - + @@ -56,17 +56,17 @@ block. --> - + - + - + @@ -75,12 +75,12 @@ --> - - - - - - + + + + + + @@ -88,12 +88,12 @@ queries on configuration nodes. They are not intended to be serialized. --> - + - + diff --git a/src/main/java/org/apache/commons/configuration3/AbstractConfiguration.java b/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/AbstractConfiguration.java rename to src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java index 42789da839..05be78bfae 100644 --- a/src/main/java/org/apache/commons/configuration3/AbstractConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.math.BigDecimal; import java.math.BigInteger; @@ -33,22 +33,22 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; -import org.apache.commons.configuration3.convert.ConversionHandler; -import org.apache.commons.configuration3.convert.DefaultConversionHandler; -import org.apache.commons.configuration3.convert.DisabledListDelimiterHandler; -import org.apache.commons.configuration3.convert.ListDelimiterHandler; -import org.apache.commons.configuration3.event.BaseEventSource; -import org.apache.commons.configuration3.event.ConfigurationErrorEvent; -import org.apache.commons.configuration3.event.ConfigurationEvent; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.ex.ConversionException; -import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration3.interpol.InterpolatorSpecification; -import org.apache.commons.configuration3.interpol.Lookup; -import org.apache.commons.configuration3.io.ConfigurationLogger; -import org.apache.commons.configuration3.sync.LockMode; -import org.apache.commons.configuration3.sync.NoOpSynchronizer; -import org.apache.commons.configuration3.sync.Synchronizer; +import org.apache.commons.configuration2.convert.ConversionHandler; +import org.apache.commons.configuration2.convert.DefaultConversionHandler; +import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler; +import org.apache.commons.configuration2.convert.ListDelimiterHandler; +import org.apache.commons.configuration2.event.BaseEventSource; +import org.apache.commons.configuration2.event.ConfigurationErrorEvent; +import org.apache.commons.configuration2.event.ConfigurationEvent; +import org.apache.commons.configuration2.event.EventListener; +import org.apache.commons.configuration2.ex.ConversionException; +import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration2.interpol.InterpolatorSpecification; +import org.apache.commons.configuration2.interpol.Lookup; +import org.apache.commons.configuration2.io.ConfigurationLogger; +import org.apache.commons.configuration2.sync.LockMode; +import org.apache.commons.configuration2.sync.NoOpSynchronizer; +import org.apache.commons.configuration2.sync.Synchronizer; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ClassUtils; import org.apache.commons.lang3.ObjectUtils; @@ -73,7 +73,7 @@ * and multiple values are added for this property. List splitting is controlled by a {@link ListDelimiterHandler} * object which can be set using the {@link #setListDelimiterHandler(ListDelimiterHandler)} method. It is disabled per * default. To enable this feature, set a suitable {@code ListDelimiterHandler}, e.g. an instance of - * {@link org.apache.commons.configuration3.convert.DefaultListDelimiterHandler DefaultListDelimiterHandler} configured + * {@link org.apache.commons.configuration2.convert.DefaultListDelimiterHandler DefaultListDelimiterHandler} configured * with the desired list delimiter character.
      • *
    • Allows specifying how missing properties are treated. Per default the get methods returning an object will return * null if the searched property key is not found (and no default value is provided). With the @@ -142,7 +142,7 @@ public ListDelimiterHandler getListDelimiterHandler() { * Sets the {@code ListDelimiterHandler} to be used by this instance. This object is invoked every time when dealing * with string properties that may contain a list delimiter and thus have to be split to multiple values. Per default, a * {@code ListDelimiterHandler} implementation is set which does not support list splitting. This can be changed for - * instance by setting a {@link org.apache.commons.configuration3.convert.DefaultListDelimiterHandler + * instance by setting a {@link org.apache.commons.configuration2.convert.DefaultListDelimiterHandler * DefaultListDelimiterHandler} object. *

      *

      @@ -1364,7 +1364,7 @@ public void append(final Configuration c) { * component that does not support variable interpolation. * * @return a configuration with all variables interpolated - * @throws org.apache.commons.configuration3.ex.ConfigurationRuntimeException if this configuration cannot be cloned + * @throws org.apache.commons.configuration2.ex.ConfigurationRuntimeException if this configuration cannot be cloned * @since 1.5 */ public Configuration interpolatedConfiguration() { diff --git a/src/main/java/org/apache/commons/configuration3/AbstractHierarchicalConfiguration.java b/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/AbstractHierarchicalConfiguration.java rename to src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java index 9a05525a65..bcfc07f32b 100644 --- a/src/main/java/org/apache/commons/configuration3/AbstractHierarchicalConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.util.Collection; import java.util.Collections; @@ -30,19 +30,19 @@ import java.util.Stack; import java.util.stream.Collectors; -import org.apache.commons.configuration3.event.ConfigurationEvent; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration3.sync.NoOpSynchronizer; -import org.apache.commons.configuration3.tree.ConfigurationNodeVisitorAdapter; -import org.apache.commons.configuration3.tree.DefaultExpressionEngine; -import org.apache.commons.configuration3.tree.ExpressionEngine; -import org.apache.commons.configuration3.tree.NodeAddData; -import org.apache.commons.configuration3.tree.NodeHandler; -import org.apache.commons.configuration3.tree.NodeKeyResolver; -import org.apache.commons.configuration3.tree.NodeModel; -import org.apache.commons.configuration3.tree.NodeTreeWalker; -import org.apache.commons.configuration3.tree.NodeUpdateData; -import org.apache.commons.configuration3.tree.QueryResult; +import org.apache.commons.configuration2.event.ConfigurationEvent; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.sync.NoOpSynchronizer; +import org.apache.commons.configuration2.tree.ConfigurationNodeVisitorAdapter; +import org.apache.commons.configuration2.tree.DefaultExpressionEngine; +import org.apache.commons.configuration2.tree.ExpressionEngine; +import org.apache.commons.configuration2.tree.NodeAddData; +import org.apache.commons.configuration2.tree.NodeHandler; +import org.apache.commons.configuration2.tree.NodeKeyResolver; +import org.apache.commons.configuration2.tree.NodeModel; +import org.apache.commons.configuration2.tree.NodeTreeWalker; +import org.apache.commons.configuration2.tree.NodeUpdateData; +import org.apache.commons.configuration2.tree.QueryResult; /** *

      @@ -115,7 +115,7 @@ * the stored properties. The examples above are valid for the default expression engine, which is used when a new * {@code AbstractHierarchicalConfiguration} instance is created. With the {@code setExpressionEngine()} method a * different expression engine can be set. For instance with - * {@link org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine} there is an expression engine available + * {@link org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine} there is an expression engine available * that supports configuration keys in XPATH syntax. *

      *

      @@ -135,14 +135,14 @@ * *

      * Whether an {@code AbstractHierarchicalConfiguration} object is thread-safe or not depends on the underlying - * {@code NodeModel} and the {@link org.apache.commons.configuration3.sync.Synchronizer Synchronizer} it is associated + * {@code NodeModel} and the {@link org.apache.commons.configuration2.sync.Synchronizer Synchronizer} it is associated * with. Some {@code NodeModel} implementations are inherently thread-safe; they do not require a special * {@code Synchronizer}. (Per default, a dummy {@code Synchronizer} is used which is not thread-safe!) The methods for * querying or updating configuration data invoke this {@code Synchronizer} accordingly. When accessing the * configuration's root node directly, the client application is responsible for proper synchronization. This is - * achieved by calling the methods {@link #lock(org.apache.commons.configuration3.sync.LockMode) lock()}, and - * {@link #unlock(org.apache.commons.configuration3.sync.LockMode) unlock()} with a proper - * {@link org.apache.commons.configuration3.sync.LockMode LockMode} argument. In any case, it is recommended to not + * achieved by calling the methods {@link #lock(org.apache.commons.configuration2.sync.LockMode) lock()}, and + * {@link #unlock(org.apache.commons.configuration2.sync.LockMode) unlock()} with a proper + * {@link org.apache.commons.configuration2.sync.LockMode LockMode} argument. In any case, it is recommended to not * access the root node directly, but to use corresponding methods for querying or updating configuration data instead. * Direct manipulations of a configuration's node structure circumvent many internal mechanisms and thus can cause * undesired effects. For concrete subclasses dealing with specific node structures, this situation may be different. diff --git a/src/main/java/org/apache/commons/configuration3/AbstractYAMLBasedConfiguration.java b/src/main/java/org/apache/commons/configuration2/AbstractYAMLBasedConfiguration.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/AbstractYAMLBasedConfiguration.java rename to src/main/java/org/apache/commons/configuration2/AbstractYAMLBasedConfiguration.java index 64767df551..a0e6c74798 100644 --- a/src/main/java/org/apache/commons/configuration3/AbstractYAMLBasedConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/AbstractYAMLBasedConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.util.ArrayList; import java.util.Collection; @@ -25,9 +25,9 @@ import java.util.Map; import java.util.stream.Collectors; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.ConfigurationLogger; -import org.apache.commons.configuration3.tree.ImmutableNode; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.ConfigurationLogger; +import org.apache.commons.configuration2.tree.ImmutableNode; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/BaseConfiguration.java b/src/main/java/org/apache/commons/configuration2/BaseConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/BaseConfiguration.java rename to src/main/java/org/apache/commons/configuration2/BaseConfiguration.java index 37e78856ac..73474b66d6 100644 --- a/src/main/java/org/apache/commons/configuration3/BaseConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/BaseConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.util.ArrayList; import java.util.Collection; @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; /** * Basic configuration class. Stores the configuration data but does not provide any load or save functions. If you want diff --git a/src/main/java/org/apache/commons/configuration3/BaseConfigurationXMLReader.java b/src/main/java/org/apache/commons/configuration2/BaseConfigurationXMLReader.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/BaseConfigurationXMLReader.java rename to src/main/java/org/apache/commons/configuration2/BaseConfigurationXMLReader.java index 35e68367bb..4a0593bb36 100644 --- a/src/main/java/org/apache/commons/configuration3/BaseConfigurationXMLReader.java +++ b/src/main/java/org/apache/commons/configuration2/BaseConfigurationXMLReader.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/BaseHierarchicalConfiguration.java b/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/BaseHierarchicalConfiguration.java rename to src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java index 0e1aa8ad29..4392f1f483 100644 --- a/src/main/java/org/apache/commons/configuration3/BaseHierarchicalConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.util.Collection; import java.util.Collections; @@ -26,21 +26,21 @@ import java.util.Map; import java.util.stream.Collectors; -import org.apache.commons.configuration3.event.ConfigurationEvent; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration3.tree.ConfigurationNodeVisitorAdapter; -import org.apache.commons.configuration3.tree.ImmutableNode; -import org.apache.commons.configuration3.tree.InMemoryNodeModel; -import org.apache.commons.configuration3.tree.InMemoryNodeModelSupport; -import org.apache.commons.configuration3.tree.NodeHandler; -import org.apache.commons.configuration3.tree.NodeModel; -import org.apache.commons.configuration3.tree.NodeSelector; -import org.apache.commons.configuration3.tree.NodeTreeWalker; -import org.apache.commons.configuration3.tree.QueryResult; -import org.apache.commons.configuration3.tree.ReferenceNodeHandler; -import org.apache.commons.configuration3.tree.TrackedNodeModel; +import org.apache.commons.configuration2.event.ConfigurationEvent; +import org.apache.commons.configuration2.event.EventListener; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration2.tree.ConfigurationNodeVisitorAdapter; +import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.InMemoryNodeModel; +import org.apache.commons.configuration2.tree.InMemoryNodeModelSupport; +import org.apache.commons.configuration2.tree.NodeHandler; +import org.apache.commons.configuration2.tree.NodeModel; +import org.apache.commons.configuration2.tree.NodeSelector; +import org.apache.commons.configuration2.tree.NodeTreeWalker; +import org.apache.commons.configuration2.tree.QueryResult; +import org.apache.commons.configuration2.tree.ReferenceNodeHandler; +import org.apache.commons.configuration2.tree.TrackedNodeModel; import org.apache.commons.lang3.ObjectUtils; /** diff --git a/src/main/java/org/apache/commons/configuration3/CombinedConfiguration.java b/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/CombinedConfiguration.java rename to src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java index f8ff432d97..f11e5a767a 100644 --- a/src/main/java/org/apache/commons/configuration3/CombinedConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -28,21 +28,21 @@ import java.util.Set; import java.util.stream.Collectors; -import org.apache.commons.configuration3.event.ConfigurationEvent; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.event.EventSource; -import org.apache.commons.configuration3.event.EventType; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration3.sync.LockMode; -import org.apache.commons.configuration3.tree.DefaultConfigurationKey; -import org.apache.commons.configuration3.tree.DefaultExpressionEngine; -import org.apache.commons.configuration3.tree.ExpressionEngine; -import org.apache.commons.configuration3.tree.ImmutableNode; -import org.apache.commons.configuration3.tree.NodeCombiner; -import org.apache.commons.configuration3.tree.NodeTreeWalker; -import org.apache.commons.configuration3.tree.QueryResult; -import org.apache.commons.configuration3.tree.TreeUtils; -import org.apache.commons.configuration3.tree.UnionCombiner; +import org.apache.commons.configuration2.event.ConfigurationEvent; +import org.apache.commons.configuration2.event.EventListener; +import org.apache.commons.configuration2.event.EventSource; +import org.apache.commons.configuration2.event.EventType; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.sync.LockMode; +import org.apache.commons.configuration2.tree.DefaultConfigurationKey; +import org.apache.commons.configuration2.tree.DefaultExpressionEngine; +import org.apache.commons.configuration2.tree.ExpressionEngine; +import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.NodeCombiner; +import org.apache.commons.configuration2.tree.NodeTreeWalker; +import org.apache.commons.configuration2.tree.QueryResult; +import org.apache.commons.configuration2.tree.TreeUtils; +import org.apache.commons.configuration2.tree.UnionCombiner; import org.apache.commons.lang3.StringUtils; /** @@ -53,7 +53,7 @@ * This class maintains a list of configuration objects, which can be added using the diverse {@code addConfiguration()} * methods. After that the configurations can be accessed either by name (if one was provided when the configuration was * added) or by index. For the whole set of managed configurations a logical node structure is constructed. For this - * purpose a {@link org.apache.commons.configuration3.tree.NodeCombiner NodeCombiner} object can be set. This makes it + * purpose a {@link org.apache.commons.configuration2.tree.NodeCombiner NodeCombiner} object can be set. This makes it * possible to specify different algorithms for the combination process. *

      *

      @@ -99,7 +99,7 @@ * * * - * As a {@code NodeCombiner} a {@link org.apache.commons.configuration3.tree.OverrideCombiner OverrideCombiner} is used. + * As a {@code NodeCombiner} a {@link org.apache.commons.configuration2.tree.OverrideCombiner OverrideCombiner} is used. * This combiner will ensure that defined user settings take precedence over the default values. If the resulting * {@code CombinedConfiguration} is queried for the background color, {@code blue} will be returned because this value * is defined in {@code user.properties}. Now consider what happens if the key {@code gui.background} is removed from @@ -201,7 +201,7 @@ public CombinedConfiguration(final NodeCombiner comb) { /** * Creates a new instance of {@code CombinedConfiguration} that uses a union combiner. * - * @see org.apache.commons.configuration3.tree.UnionCombiner + * @see org.apache.commons.configuration2.tree.UnionCombiner */ public CombinedConfiguration() { this(null); diff --git a/src/main/java/org/apache/commons/configuration3/CompositeConfiguration.java b/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/CompositeConfiguration.java rename to src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java index 9fef163cf6..129aff7b3f 100644 --- a/src/main/java/org/apache/commons/configuration3/CompositeConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.util.ArrayList; import java.util.Collection; @@ -26,8 +26,8 @@ import java.util.ListIterator; import java.util.Set; -import org.apache.commons.configuration3.convert.ListDelimiterHandler; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.convert.ListDelimiterHandler; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/Configuration.java b/src/main/java/org/apache/commons/configuration2/Configuration.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/Configuration.java rename to src/main/java/org/apache/commons/configuration2/Configuration.java index 3c6fe9978c..76e4fe11d3 100644 --- a/src/main/java/org/apache/commons/configuration3/Configuration.java +++ b/src/main/java/org/apache/commons/configuration2/Configuration.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.util.Collection; import java.util.Map; -import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration3.interpol.Lookup; -import org.apache.commons.configuration3.sync.SynchronizerSupport; +import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration2.interpol.Lookup; +import org.apache.commons.configuration2.sync.SynchronizerSupport; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/ConfigurationComparator.java b/src/main/java/org/apache/commons/configuration2/ConfigurationComparator.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/ConfigurationComparator.java rename to src/main/java/org/apache/commons/configuration2/ConfigurationComparator.java index 6400da8482..563b08fa72 100644 --- a/src/main/java/org/apache/commons/configuration3/ConfigurationComparator.java +++ b/src/main/java/org/apache/commons/configuration2/ConfigurationComparator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; /** * Comparator for configurations interface. diff --git a/src/main/java/org/apache/commons/configuration3/ConfigurationConsumer.java b/src/main/java/org/apache/commons/configuration2/ConfigurationConsumer.java similarity index 92% rename from src/main/java/org/apache/commons/configuration3/ConfigurationConsumer.java rename to src/main/java/org/apache/commons/configuration2/ConfigurationConsumer.java index c0eda68220..b3e86f4140 100644 --- a/src/main/java/org/apache/commons/configuration3/ConfigurationConsumer.java +++ b/src/main/java/org/apache/commons/configuration2/ConfigurationConsumer.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; -import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationException; /** * A Configuration task that may throw a ConfigurationException. diff --git a/src/main/java/org/apache/commons/configuration3/ConfigurationConverter.java b/src/main/java/org/apache/commons/configuration2/ConfigurationConverter.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/ConfigurationConverter.java rename to src/main/java/org/apache/commons/configuration2/ConfigurationConverter.java index 78e21d11eb..0df7cfc805 100644 --- a/src/main/java/org/apache/commons/configuration3/ConfigurationConverter.java +++ b/src/main/java/org/apache/commons/configuration2/ConfigurationConverter.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Properties; -import org.apache.commons.configuration3.convert.ListDelimiterHandler; +import org.apache.commons.configuration2.convert.ListDelimiterHandler; import org.apache.commons.lang3.StringUtils; /** diff --git a/src/main/java/org/apache/commons/configuration3/ConfigurationDecoder.java b/src/main/java/org/apache/commons/configuration2/ConfigurationDecoder.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/ConfigurationDecoder.java rename to src/main/java/org/apache/commons/configuration2/ConfigurationDecoder.java index 3c16b07e2c..07eb50d307 100644 --- a/src/main/java/org/apache/commons/configuration3/ConfigurationDecoder.java +++ b/src/main/java/org/apache/commons/configuration2/ConfigurationDecoder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/ConfigurationLookup.java b/src/main/java/org/apache/commons/configuration2/ConfigurationLookup.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/ConfigurationLookup.java rename to src/main/java/org/apache/commons/configuration2/ConfigurationLookup.java index b09463dc66..c88d1e744c 100644 --- a/src/main/java/org/apache/commons/configuration3/ConfigurationLookup.java +++ b/src/main/java/org/apache/commons/configuration2/ConfigurationLookup.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; -import org.apache.commons.configuration3.interpol.Lookup; +import org.apache.commons.configuration2.interpol.Lookup; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/ConfigurationMap.java b/src/main/java/org/apache/commons/configuration2/ConfigurationMap.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/ConfigurationMap.java rename to src/main/java/org/apache/commons/configuration2/ConfigurationMap.java index d8a246b8df..0ab0ce41b1 100644 --- a/src/main/java/org/apache/commons/configuration3/ConfigurationMap.java +++ b/src/main/java/org/apache/commons/configuration2/ConfigurationMap.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.util.AbstractMap; import java.util.AbstractSet; @@ -26,7 +26,7 @@ /** *

      - * The {@code ConfigurationMap} wraps a configuration-collection {@link org.apache.commons.configuration3.Configuration} + * The {@code ConfigurationMap} wraps a configuration-collection {@link org.apache.commons.configuration2.Configuration} * instance to provide a {@code Map} interface. *

      * diff --git a/src/main/java/org/apache/commons/configuration3/ConfigurationUtils.java b/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/ConfigurationUtils.java rename to src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java index 8fd7b6ee24..22686f28ce 100644 --- a/src/main/java/org/apache/commons/configuration3/ConfigurationUtils.java +++ b/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.io.PrintStream; import java.io.PrintWriter; @@ -25,15 +25,15 @@ import java.lang.reflect.Proxy; import java.util.Iterator; -import org.apache.commons.configuration3.event.ConfigurationErrorEvent; -import org.apache.commons.configuration3.event.Event; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.event.EventSource; -import org.apache.commons.configuration3.event.EventType; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration3.sync.NoOpSynchronizer; -import org.apache.commons.configuration3.sync.Synchronizer; -import org.apache.commons.configuration3.tree.ExpressionEngine; +import org.apache.commons.configuration2.event.ConfigurationErrorEvent; +import org.apache.commons.configuration2.event.Event; +import org.apache.commons.configuration2.event.EventListener; +import org.apache.commons.configuration2.event.EventSource; +import org.apache.commons.configuration2.event.EventType; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.sync.NoOpSynchronizer; +import org.apache.commons.configuration2.sync.Synchronizer; +import org.apache.commons.configuration2.tree.ExpressionEngine; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/main/java/org/apache/commons/configuration3/ConfigurationXMLReader.java b/src/main/java/org/apache/commons/configuration2/ConfigurationXMLReader.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/ConfigurationXMLReader.java rename to src/main/java/org/apache/commons/configuration2/ConfigurationXMLReader.java index d732347b4a..a0d072996c 100644 --- a/src/main/java/org/apache/commons/configuration3/ConfigurationXMLReader.java +++ b/src/main/java/org/apache/commons/configuration2/ConfigurationXMLReader.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.io.IOException; diff --git a/src/main/java/org/apache/commons/configuration3/DataConfiguration.java b/src/main/java/org/apache/commons/configuration2/DataConfiguration.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/DataConfiguration.java rename to src/main/java/org/apache/commons/configuration2/DataConfiguration.java index 47ed193f5b..6dd0396b37 100644 --- a/src/main/java/org/apache/commons/configuration3/DataConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/DataConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.awt.Color; import java.math.BigDecimal; @@ -30,9 +30,9 @@ import java.util.Locale; import java.util.NoSuchElementException; -import org.apache.commons.configuration3.convert.ConversionHandler; -import org.apache.commons.configuration3.convert.DefaultConversionHandler; -import org.apache.commons.configuration3.ex.ConversionException; +import org.apache.commons.configuration2.convert.ConversionHandler; +import org.apache.commons.configuration2.convert.DefaultConversionHandler; +import org.apache.commons.configuration2.ex.ConversionException; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/org/apache/commons/configuration3/DatabaseConfiguration.java b/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/DatabaseConfiguration.java rename to src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java index 4215cb833c..bb90256cac 100644 --- a/src/main/java/org/apache/commons/configuration3/DatabaseConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.sql.Clob; import java.sql.Connection; @@ -30,12 +30,12 @@ import javax.sql.DataSource; -import org.apache.commons.configuration3.convert.DisabledListDelimiterHandler; -import org.apache.commons.configuration3.convert.ListDelimiterHandler; -import org.apache.commons.configuration3.event.ConfigurationErrorEvent; -import org.apache.commons.configuration3.event.ConfigurationEvent; -import org.apache.commons.configuration3.event.EventType; -import org.apache.commons.configuration3.io.ConfigurationLogger; +import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler; +import org.apache.commons.configuration2.convert.ListDelimiterHandler; +import org.apache.commons.configuration2.event.ConfigurationErrorEvent; +import org.apache.commons.configuration2.event.ConfigurationEvent; +import org.apache.commons.configuration2.event.EventType; +import org.apache.commons.configuration2.io.ConfigurationLogger; import org.apache.commons.lang3.StringUtils; /** diff --git a/src/main/java/org/apache/commons/configuration3/DynamicCombinedConfiguration.java b/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/DynamicCombinedConfiguration.java rename to src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java index 6b6d2fd147..263aea7ec4 100644 --- a/src/main/java/org/apache/commons/configuration3/DynamicCombinedConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.math.BigDecimal; import java.math.BigInteger; @@ -30,15 +30,15 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.apache.commons.configuration3.event.BaseEventSource; -import org.apache.commons.configuration3.event.Event; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.event.EventType; -import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration3.interpol.Lookup; -import org.apache.commons.configuration3.io.ConfigurationLogger; -import org.apache.commons.configuration3.tree.ImmutableNode; -import org.apache.commons.configuration3.tree.NodeCombiner; +import org.apache.commons.configuration2.event.BaseEventSource; +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.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration2.interpol.Lookup; +import org.apache.commons.configuration2.io.ConfigurationLogger; +import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.NodeCombiner; /** *

      @@ -99,7 +99,7 @@ public DynamicCombinedConfiguration(final NodeCombiner comb) { /** * Creates a new instance of {@code DynamicCombinedConfiguration} that uses a union combiner. * - * @see org.apache.commons.configuration3.tree.UnionCombiner + * @see org.apache.commons.configuration2.tree.UnionCombiner */ public DynamicCombinedConfiguration() { initLogger(new ConfigurationLogger(DynamicCombinedConfiguration.class)); diff --git a/src/main/java/org/apache/commons/configuration3/EnvironmentConfiguration.java b/src/main/java/org/apache/commons/configuration2/EnvironmentConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/EnvironmentConfiguration.java rename to src/main/java/org/apache/commons/configuration2/EnvironmentConfiguration.java index 7612ebad6e..f3819c3be0 100644 --- a/src/main/java/org/apache/commons/configuration3/EnvironmentConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/EnvironmentConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.util.HashMap; diff --git a/src/main/java/org/apache/commons/configuration3/FileBasedConfiguration.java b/src/main/java/org/apache/commons/configuration2/FileBasedConfiguration.java similarity index 92% rename from src/main/java/org/apache/commons/configuration3/FileBasedConfiguration.java rename to src/main/java/org/apache/commons/configuration2/FileBasedConfiguration.java index 7e78668933..bdb2eb8201 100644 --- a/src/main/java/org/apache/commons/configuration3/FileBasedConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/FileBasedConfiguration.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; -import org.apache.commons.configuration3.io.FileBased; +import org.apache.commons.configuration2.io.FileBased; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/FindNodeVisitor.java b/src/main/java/org/apache/commons/configuration2/FindNodeVisitor.java similarity index 93% rename from src/main/java/org/apache/commons/configuration3/FindNodeVisitor.java rename to src/main/java/org/apache/commons/configuration2/FindNodeVisitor.java index dc75df67ad..aeb67c0c90 100644 --- a/src/main/java/org/apache/commons/configuration3/FindNodeVisitor.java +++ b/src/main/java/org/apache/commons/configuration2/FindNodeVisitor.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; -import org.apache.commons.configuration3.tree.ConfigurationNodeVisitorAdapter; -import org.apache.commons.configuration3.tree.NodeHandler; +import org.apache.commons.configuration2.tree.ConfigurationNodeVisitorAdapter; +import org.apache.commons.configuration2.tree.NodeHandler; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/HierarchicalConfiguration.java b/src/main/java/org/apache/commons/configuration2/HierarchicalConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/HierarchicalConfiguration.java rename to src/main/java/org/apache/commons/configuration2/HierarchicalConfiguration.java index c1ae432b61..d4075e01bf 100644 --- a/src/main/java/org/apache/commons/configuration3/HierarchicalConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/HierarchicalConfiguration.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.util.Collection; import java.util.List; -import org.apache.commons.configuration3.tree.ExpressionEngine; -import org.apache.commons.configuration3.tree.NodeModelSupport; +import org.apache.commons.configuration2.tree.ExpressionEngine; +import org.apache.commons.configuration2.tree.NodeModelSupport; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/HierarchicalConfigurationConverter.java b/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationConverter.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/HierarchicalConfigurationConverter.java rename to src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationConverter.java index c14f9dd645..93725f7b90 100644 --- a/src/main/java/org/apache/commons/configuration3/HierarchicalConfigurationConverter.java +++ b/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationConverter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.util.ArrayList; import java.util.Collection; @@ -25,8 +25,8 @@ import java.util.List; import java.util.Set; -import org.apache.commons.configuration3.tree.DefaultConfigurationKey; -import org.apache.commons.configuration3.tree.DefaultExpressionEngine; +import org.apache.commons.configuration2.tree.DefaultConfigurationKey; +import org.apache.commons.configuration2.tree.DefaultExpressionEngine; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/HierarchicalConfigurationXMLReader.java b/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationXMLReader.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/HierarchicalConfigurationXMLReader.java rename to src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationXMLReader.java index c7078652a1..e84868f00e 100644 --- a/src/main/java/org/apache/commons/configuration3/HierarchicalConfigurationXMLReader.java +++ b/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationXMLReader.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; -import org.apache.commons.configuration3.tree.ConfigurationNodeVisitorAdapter; -import org.apache.commons.configuration3.tree.NodeHandler; -import org.apache.commons.configuration3.tree.NodeTreeWalker; +import org.apache.commons.configuration2.tree.ConfigurationNodeVisitorAdapter; +import org.apache.commons.configuration2.tree.NodeHandler; +import org.apache.commons.configuration2.tree.NodeTreeWalker; import org.xml.sax.Attributes; import org.xml.sax.helpers.AttributesImpl; diff --git a/src/main/java/org/apache/commons/configuration3/INIConfiguration.java b/src/main/java/org/apache/commons/configuration2/INIConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/INIConfiguration.java rename to src/main/java/org/apache/commons/configuration2/INIConfiguration.java index 593c741b24..4749d9301c 100644 --- a/src/main/java/org/apache/commons/configuration3/INIConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/INIConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.io.BufferedReader; import java.io.IOException; @@ -28,16 +28,16 @@ import java.util.Set; import java.util.stream.Collectors; -import org.apache.commons.configuration3.convert.ListDelimiterHandler; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration3.tree.ImmutableNode; -import org.apache.commons.configuration3.tree.InMemoryNodeModel; -import org.apache.commons.configuration3.tree.InMemoryNodeModelSupport; -import org.apache.commons.configuration3.tree.NodeHandler; -import org.apache.commons.configuration3.tree.NodeHandlerDecorator; -import org.apache.commons.configuration3.tree.NodeSelector; -import org.apache.commons.configuration3.tree.TrackedNodeModel; +import org.apache.commons.configuration2.convert.ListDelimiterHandler; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.InMemoryNodeModel; +import org.apache.commons.configuration2.tree.InMemoryNodeModelSupport; +import org.apache.commons.configuration2.tree.NodeHandler; +import org.apache.commons.configuration2.tree.NodeHandlerDecorator; +import org.apache.commons.configuration2.tree.NodeSelector; +import org.apache.commons.configuration2.tree.TrackedNodeModel; /** *

      @@ -101,7 +101,7 @@ * In all instances, a parameter's key is prepended with its section name and a '.' (period). Thus a parameter named * "var1" in "section1" will have the key {@code section1.var1} in this configuration. (This is the default behavior. * Because this is a hierarchical configuration you can change this by setting a different - * {@link org.apache.commons.configuration3.tree.ExpressionEngine}.) + * {@link org.apache.commons.configuration2.tree.ExpressionEngine}.) *

      *

      * Implementation Details: Consider the following ini file: diff --git a/src/main/java/org/apache/commons/configuration3/ImmutableConfiguration.java b/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java similarity index 92% rename from src/main/java/org/apache/commons/configuration3/ImmutableConfiguration.java rename to src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java index 780aca8d8f..a76593394c 100644 --- a/src/main/java/org/apache/commons/configuration3/ImmutableConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.math.BigDecimal; import java.math.BigInteger; @@ -25,8 +25,8 @@ import java.util.NoSuchElementException; import java.util.Properties; -import org.apache.commons.configuration3.convert.PropertyConverter; -import org.apache.commons.configuration3.ex.ConversionException; +import org.apache.commons.configuration2.convert.PropertyConverter; +import org.apache.commons.configuration2.ex.ConversionException; /** *

      @@ -73,7 +73,7 @@ public interface ImmutableConfiguration { * @return the value of the requested type for the key * @throws java.util.NoSuchElementException if the key doesn't map to an existing object and * {@code throwExceptionOnMissing=true} - * @throws org.apache.commons.configuration3.ex.ConversionException if the value is not compatible with the requested + * @throws org.apache.commons.configuration2.ex.ConversionException if the value is not compatible with the requested * type * @since 2.0 */ @@ -90,7 +90,7 @@ public interface ImmutableConfiguration { * * @return the value of the requested type for the key * - * @throws org.apache.commons.configuration3.ex.ConversionException if the value is not compatible with the requested + * @throws org.apache.commons.configuration2.ex.ConversionException if the value is not compatible with the requested * type * * @since 2.0 @@ -105,7 +105,7 @@ public interface ImmutableConfiguration { * @param key The configuration key. * @return The associated array if the key is found, and the value compatible with the type specified. * - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not * compatible with a list of the specified class. * * @since 2.0 @@ -121,7 +121,7 @@ public interface ImmutableConfiguration { * @param defaultValue the default value * @return The associated array if the key is found, and the value compatible with the type specified. * - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not * compatible with an array of the specified class. * @throws IllegalArgumentException if the default value is not an array of the specified type * @@ -177,7 +177,7 @@ public interface ImmutableConfiguration { * * @param key The configuration key. * @return The associated boolean. - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Boolean. */ boolean getBoolean(String key); @@ -189,7 +189,7 @@ public interface ImmutableConfiguration { * @param key The configuration key. * @param defaultValue The default value. * @return The associated boolean. - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Boolean. */ boolean getBoolean(String key, boolean defaultValue); @@ -200,7 +200,7 @@ public interface ImmutableConfiguration { * @param key The configuration key. * @param defaultValue The default value. * @return The associated boolean if key is found and has valid format, default value otherwise. - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Boolean. */ Boolean getBoolean(String key, Boolean defaultValue); @@ -210,7 +210,7 @@ public interface ImmutableConfiguration { * * @param key The configuration key. * @return The associated byte. - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Byte. */ byte getByte(String key); @@ -222,7 +222,7 @@ public interface ImmutableConfiguration { * @param key The configuration key. * @param defaultValue The default value. * @return The associated byte. - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Byte. */ byte getByte(String key, byte defaultValue); @@ -233,7 +233,7 @@ public interface ImmutableConfiguration { * @param key The configuration key. * @param defaultValue The default value. * @return The associated byte if key is found and has valid format, default value otherwise. - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Byte. */ Byte getByte(String key, Byte defaultValue); @@ -247,7 +247,7 @@ public interface ImmutableConfiguration { * @param key the configuration key * @param target the target collection (may be null) * @return the collection to which data was added - * @throws org.apache.commons.configuration3.ex.ConversionException if the conversion is not possible + * @throws org.apache.commons.configuration2.ex.ConversionException if the conversion is not possible * @since 2.0 */ Collection getCollection(Class cls, String key, Collection target); @@ -273,7 +273,7 @@ public interface ImmutableConfiguration { * @param target the target collection (may be null) * @param defaultValue the default value (may be null) * @return the collection to which data was added - * @throws org.apache.commons.configuration3.ex.ConversionException if the conversion is not possible + * @throws org.apache.commons.configuration2.ex.ConversionException if the conversion is not possible * @since 2.0 */ Collection getCollection(Class cls, String key, Collection target, Collection defaultValue); @@ -283,7 +283,7 @@ public interface ImmutableConfiguration { * * @param key The configuration key. * @return The associated double. - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Double. */ double getDouble(String key); @@ -295,7 +295,7 @@ public interface ImmutableConfiguration { * @param key The configuration key. * @param defaultValue The default value. * @return The associated double. - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Double. */ double getDouble(String key, double defaultValue); @@ -306,7 +306,7 @@ public interface ImmutableConfiguration { * @param key The configuration key. * @param defaultValue The default value. * @return The associated double if key is found and has valid format, default value otherwise. - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Double. */ Double getDouble(String key, Double defaultValue); @@ -316,7 +316,7 @@ public interface ImmutableConfiguration { * * @param key The configuration key. * @return The associated Duration if key is found and has valid format, default value otherwise. - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Duration. * @since 2.8.0 */ @@ -334,7 +334,7 @@ default Duration getDuration(final String key) { * @param key The configuration key. * @param defaultValue The default value. * @return The associated Duration if key is found and has valid format, default value otherwise. - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Duration. * @since 2.8.0 */ @@ -376,7 +376,7 @@ default Duration getDuration(final String key, final Duration defaultValue) { * @param key The configuration key. * @return The associated enum. * - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * String. * @since 2.8.0 */ @@ -398,7 +398,7 @@ default > T getEnum(final String key, final Class enumType) * @param defaultValue The default value. * @return The associated enum if key is found and has valid format, default value otherwise. * - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Enum. * @since 2.8.0 */ @@ -419,7 +419,7 @@ default > T getEnum(final String key, final Class enumType, * * @param key The configuration key. * @return The associated float. - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Float. */ float getFloat(String key); @@ -431,7 +431,7 @@ default > T getEnum(final String key, final Class enumType, * @param key The configuration key. * @param defaultValue The default value. * @return The associated float. - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Float. */ float getFloat(String key, float defaultValue); @@ -443,7 +443,7 @@ default > T getEnum(final String key, final Class enumType, * @param key The configuration key. * @param defaultValue The default value. * @return The associated float if key is found and has valid format, default value otherwise. - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Float. */ Float getFloat(String key, Float defaultValue); @@ -453,7 +453,7 @@ default > T getEnum(final String key, final Class enumType, * * @param key The configuration key. * @return The associated int. - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Integer. */ int getInt(String key); @@ -465,7 +465,7 @@ default > T getEnum(final String key, final Class enumType, * @param key The configuration key. * @param defaultValue The default value. * @return The associated int. - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Integer. */ int getInt(String key, int defaultValue); @@ -477,7 +477,7 @@ default > T getEnum(final String key, final Class enumType, * @param key The configuration key. * @param defaultValue The default value. * @return The associated int if key is found and has valid format, default value otherwise. - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Integer. */ Integer getInteger(String key, Integer defaultValue); @@ -537,7 +537,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * @param key The configuration key. * @return The associated list if the key is found. * - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not * compatible with a list of the specified class. * * @since 2.0 @@ -557,7 +557,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * @param defaultValue the default value. * @return The associated List. * - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not * compatible with a list of the specified class. * * @since 2.0 @@ -574,7 +574,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * @param key The configuration key. * @return The associated List. * - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * List. */ List getList(String key); @@ -587,7 +587,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * @param defaultValue The default value. * @return The associated List of strings. * - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * List. * @see #getList(Class, String, List) */ @@ -598,7 +598,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * * @param key The configuration key. * @return The associated long. - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Long. */ long getLong(String key); @@ -611,7 +611,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * @param defaultValue The default value. * @return The associated long. * - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Long. */ long getLong(String key, long defaultValue); @@ -624,7 +624,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * @param defaultValue The default value. * @return The associated long if key is found and has valid format, default value otherwise. * - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Long. */ Long getLong(String key, Long defaultValue); @@ -637,7 +637,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * * @param key The configuration key. * @return The associated properties if key is found. - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * String/List. * @throws IllegalArgumentException if one of the tokens is malformed (does not contain an equals sign). */ @@ -663,7 +663,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * @param key The configuration key. * @return The associated short. * - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Short. */ short getShort(String key); @@ -675,7 +675,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * @param defaultValue The default value. * @return The associated short. * - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Short. */ short getShort(String key, short defaultValue); @@ -688,7 +688,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * @param defaultValue The default value. * @return The associated short if key is found and has valid format, default value otherwise. * - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Short. */ Short getShort(String key, Short defaultValue); @@ -699,7 +699,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * @param key The configuration key. * @return The associated string. * - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * String. */ String getString(String key); @@ -712,7 +712,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * @param defaultValue The default value. * @return The associated string if key is found and has valid format, default value otherwise. * - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * String. */ String getString(String key, String defaultValue); @@ -724,7 +724,7 @@ default Iterator getKeys(final String prefix, final String delimiter) { * @param key The configuration key. * @return The associated string array if key is found. * - * @throws org.apache.commons.configuration3.ex.ConversionException is thrown if the key maps to an object that is not a + * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * String/List of Strings. */ String[] getStringArray(String key); diff --git a/src/main/java/org/apache/commons/configuration3/ImmutableConfigurationInvocationHandler.java b/src/main/java/org/apache/commons/configuration2/ImmutableConfigurationInvocationHandler.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/ImmutableConfigurationInvocationHandler.java rename to src/main/java/org/apache/commons/configuration2/ImmutableConfigurationInvocationHandler.java index ab91a12ca6..5392062456 100644 --- a/src/main/java/org/apache/commons/configuration3/ImmutableConfigurationInvocationHandler.java +++ b/src/main/java/org/apache/commons/configuration2/ImmutableConfigurationInvocationHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; diff --git a/src/main/java/org/apache/commons/configuration3/ImmutableHierarchicalConfiguration.java b/src/main/java/org/apache/commons/configuration2/ImmutableHierarchicalConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/ImmutableHierarchicalConfiguration.java rename to src/main/java/org/apache/commons/configuration2/ImmutableHierarchicalConfiguration.java index 23a49543ff..4c966b89a0 100644 --- a/src/main/java/org/apache/commons/configuration3/ImmutableHierarchicalConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/ImmutableHierarchicalConfiguration.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.util.List; -import org.apache.commons.configuration3.tree.ExpressionEngine; +import org.apache.commons.configuration2.tree.ExpressionEngine; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/Initializable.java b/src/main/java/org/apache/commons/configuration2/Initializable.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/Initializable.java rename to src/main/java/org/apache/commons/configuration2/Initializable.java index 9be3e92175..359b566b62 100644 --- a/src/main/java/org/apache/commons/configuration3/Initializable.java +++ b/src/main/java/org/apache/commons/configuration2/Initializable.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/JNDIConfiguration.java b/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/JNDIConfiguration.java rename to src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java index e9c5446abc..929156262a 100644 --- a/src/main/java/org/apache/commons/configuration3/JNDIConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.util.ArrayList; import java.util.Arrays; @@ -32,8 +32,8 @@ import javax.naming.NamingException; import javax.naming.NotContextException; -import org.apache.commons.configuration3.event.ConfigurationErrorEvent; -import org.apache.commons.configuration3.io.ConfigurationLogger; +import org.apache.commons.configuration2.event.ConfigurationErrorEvent; +import org.apache.commons.configuration2.io.ConfigurationLogger; import org.apache.commons.lang3.StringUtils; /** diff --git a/src/main/java/org/apache/commons/configuration3/JSONConfiguration.java b/src/main/java/org/apache/commons/configuration2/JSONConfiguration.java similarity index 92% rename from src/main/java/org/apache/commons/configuration3/JSONConfiguration.java rename to src/main/java/org/apache/commons/configuration2/JSONConfiguration.java index 542b1f09b0..d18060553a 100644 --- a/src/main/java/org/apache/commons/configuration3/JSONConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/JSONConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.io.IOException; import java.io.InputStream; @@ -23,9 +23,9 @@ import java.io.Writer; import java.util.Map; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.InputStreamSupport; -import org.apache.commons.configuration3.tree.ImmutableNode; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.InputStreamSupport; +import org.apache.commons.configuration2.tree.ImmutableNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.type.MapType; diff --git a/src/main/java/org/apache/commons/configuration3/MapConfiguration.java b/src/main/java/org/apache/commons/configuration2/MapConfiguration.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/MapConfiguration.java rename to src/main/java/org/apache/commons/configuration2/MapConfiguration.java index b6d755ae62..c42591e80f 100644 --- a/src/main/java/org/apache/commons/configuration3/MapConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/MapConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.util.ArrayList; import java.util.Collection; @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Properties; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; /** *

      @@ -50,11 +50,11 @@ *

      *

      * The handling of list delimiters is a bit different for this configuration implementation: When a property of type - * String is queried, it is passed to the current {@link org.apache.commons.configuration3.convert.ListDelimiterHandler + * String is queried, it is passed to the current {@link org.apache.commons.configuration2.convert.ListDelimiterHandler * ListDelimiterHandler} which may generate multiple values. Note that per default a list delimiter handler is set which * does not do any list splitting, so this feature is disabled. It can be enabled by setting a properly configured * {@code ListDelimiterHandler} implementation, e.g. a - * {@link org.apache.commons.configuration3.convert.DefaultListDelimiterHandler DefaultListDelimiterHandler} object. + * {@link org.apache.commons.configuration2.convert.DefaultListDelimiterHandler DefaultListDelimiterHandler} object. *

      *

      * Notice that list splitting is only performed for single string values. If a property has multiple values, the single diff --git a/src/main/java/org/apache/commons/configuration3/PatternSubtreeConfigurationWrapper.java b/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/PatternSubtreeConfigurationWrapper.java rename to src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java index b3fe798955..ab3b89e522 100644 --- a/src/main/java/org/apache/commons/configuration3/PatternSubtreeConfigurationWrapper.java +++ b/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.io.IOException; import java.io.Reader; @@ -28,13 +28,13 @@ import java.util.Objects; import java.util.Properties; -import org.apache.commons.configuration3.event.Event; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.event.EventType; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.FileBased; -import org.apache.commons.configuration3.tree.ExpressionEngine; -import org.apache.commons.configuration3.tree.ImmutableNode; +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.io.FileBased; +import org.apache.commons.configuration2.tree.ExpressionEngine; +import org.apache.commons.configuration2.tree.ImmutableNode; /** * Wraps a BaseHierarchicalConfiguration and allows subtrees to be accessed via a configured path with replaceable diff --git a/src/main/java/org/apache/commons/configuration3/PrefixedKeysIterator.java b/src/main/java/org/apache/commons/configuration2/PrefixedKeysIterator.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/PrefixedKeysIterator.java rename to src/main/java/org/apache/commons/configuration2/PrefixedKeysIterator.java index 7e30ccf747..2e40316904 100644 --- a/src/main/java/org/apache/commons/configuration3/PrefixedKeysIterator.java +++ b/src/main/java/org/apache/commons/configuration2/PrefixedKeysIterator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/src/main/java/org/apache/commons/configuration3/PropertiesConfiguration.java b/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/PropertiesConfiguration.java rename to src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java index d8ede33943..c3e89663a2 100644 --- a/src/main/java/org/apache/commons/configuration3/PropertiesConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.io.FileNotFoundException; import java.io.FilterWriter; @@ -35,15 +35,15 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.configuration3.convert.ListDelimiterHandler; -import org.apache.commons.configuration3.convert.ValueTransformer; -import org.apache.commons.configuration3.event.ConfigurationEvent; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration3.io.FileHandler; -import org.apache.commons.configuration3.io.FileLocator; -import org.apache.commons.configuration3.io.FileLocatorAware; -import org.apache.commons.configuration3.io.FileLocatorUtils; +import org.apache.commons.configuration2.convert.ListDelimiterHandler; +import org.apache.commons.configuration2.convert.ValueTransformer; +import org.apache.commons.configuration2.event.ConfigurationEvent; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration2.io.FileLocator; +import org.apache.commons.configuration2.io.FileLocatorAware; +import org.apache.commons.configuration2.io.FileLocatorUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.StringEscapeUtils; @@ -87,7 +87,7 @@ * below. *

    • The list delimiter facilities provided by {@link AbstractConfiguration} are supported, too. If an appropriate * {@link ListDelimiterHandler} is set (for instance a - * {@link org.apache.commons.configuration3.convert.DefaultListDelimiterHandler D efaultListDelimiterHandler} object + * {@link org.apache.commons.configuration2.convert.DefaultListDelimiterHandler D efaultListDelimiterHandler} object * configured with a comma as delimiter character), value can contain value delimiters and will then be * interpreted as a list of tokens. So the following property definition * diff --git a/src/main/java/org/apache/commons/configuration3/PropertiesConfigurationLayout.java b/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/PropertiesConfigurationLayout.java rename to src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java index c1c517c5d2..52f34e2f28 100644 --- a/src/main/java/org/apache/commons/configuration3/PropertiesConfigurationLayout.java +++ b/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.io.IOException; import java.io.Reader; @@ -29,10 +29,10 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.commons.configuration3.event.ConfigurationEvent; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.event.ConfigurationEvent; +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.lang3.StringUtils; /** diff --git a/src/main/java/org/apache/commons/configuration3/StrictConfigurationComparator.java b/src/main/java/org/apache/commons/configuration2/StrictConfigurationComparator.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/StrictConfigurationComparator.java rename to src/main/java/org/apache/commons/configuration2/StrictConfigurationComparator.java index 8c154cf614..89d3b45aeb 100644 --- a/src/main/java/org/apache/commons/configuration3/StrictConfigurationComparator.java +++ b/src/main/java/org/apache/commons/configuration2/StrictConfigurationComparator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.util.Iterator; diff --git a/src/main/java/org/apache/commons/configuration3/SubnodeConfiguration.java b/src/main/java/org/apache/commons/configuration2/SubnodeConfiguration.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/SubnodeConfiguration.java rename to src/main/java/org/apache/commons/configuration2/SubnodeConfiguration.java index 513b76f513..6ed272ece5 100644 --- a/src/main/java/org/apache/commons/configuration3/SubnodeConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/SubnodeConfiguration.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; -import org.apache.commons.configuration3.tree.ImmutableNode; -import org.apache.commons.configuration3.tree.InMemoryNodeModel; -import org.apache.commons.configuration3.tree.InMemoryNodeModelSupport; -import org.apache.commons.configuration3.tree.NodeModel; -import org.apache.commons.configuration3.tree.NodeSelector; -import org.apache.commons.configuration3.tree.TrackedNodeModel; +import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.InMemoryNodeModel; +import org.apache.commons.configuration2.tree.InMemoryNodeModelSupport; +import org.apache.commons.configuration2.tree.NodeModel; +import org.apache.commons.configuration2.tree.NodeSelector; +import org.apache.commons.configuration2.tree.TrackedNodeModel; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/SubsetConfiguration.java b/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/SubsetConfiguration.java rename to src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java index 71d5176378..fd87053f0f 100644 --- a/src/main/java/org/apache/commons/configuration3/SubsetConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.util.Iterator; -import org.apache.commons.configuration3.convert.ListDelimiterHandler; +import org.apache.commons.configuration2.convert.ListDelimiterHandler; import org.apache.commons.lang3.StringUtils; /** diff --git a/src/main/java/org/apache/commons/configuration3/SystemConfiguration.java b/src/main/java/org/apache/commons/configuration2/SystemConfiguration.java similarity index 95% rename from src/main/java/org/apache/commons/configuration3/SystemConfiguration.java rename to src/main/java/org/apache/commons/configuration2/SystemConfiguration.java index 05b5afe205..6f2d688d35 100644 --- a/src/main/java/org/apache/commons/configuration3/SystemConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/SystemConfiguration.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.util.Iterator; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.FileHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/main/java/org/apache/commons/configuration3/XMLConfiguration.java b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/XMLConfiguration.java rename to src/main/java/org/apache/commons/configuration2/XMLConfiguration.java index 9c1693bd1b..8b0c93bb7a 100644 --- a/src/main/java/org/apache/commons/configuration3/XMLConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.io.IOException; import java.io.InputStream; @@ -41,16 +41,16 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.apache.commons.configuration3.convert.ListDelimiterHandler; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.ConfigurationLogger; -import org.apache.commons.configuration3.io.FileLocator; -import org.apache.commons.configuration3.io.FileLocatorAware; -import org.apache.commons.configuration3.io.InputStreamSupport; -import org.apache.commons.configuration3.resolver.DefaultEntityResolver; -import org.apache.commons.configuration3.tree.ImmutableNode; -import org.apache.commons.configuration3.tree.NodeTreeWalker; -import org.apache.commons.configuration3.tree.ReferenceNodeHandler; +import org.apache.commons.configuration2.convert.ListDelimiterHandler; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.ConfigurationLogger; +import org.apache.commons.configuration2.io.FileLocator; +import org.apache.commons.configuration2.io.FileLocatorAware; +import org.apache.commons.configuration2.io.InputStreamSupport; +import org.apache.commons.configuration2.resolver.DefaultEntityResolver; +import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.NodeTreeWalker; +import org.apache.commons.configuration2.tree.ReferenceNodeHandler; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.mutable.MutableObject; import org.w3c.dom.Attr; diff --git a/src/main/java/org/apache/commons/configuration3/XMLDocumentHelper.java b/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/XMLDocumentHelper.java rename to src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java index 4f012ca941..61be4c7a6c 100644 --- a/src/main/java/org/apache/commons/configuration3/XMLDocumentHelper.java +++ b/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.util.Collections; import java.util.HashMap; @@ -32,7 +32,7 @@ import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; -import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationException; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/src/main/java/org/apache/commons/configuration3/XMLListReference.java b/src/main/java/org/apache/commons/configuration2/XMLListReference.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/XMLListReference.java rename to src/main/java/org/apache/commons/configuration2/XMLListReference.java index 8a9d1dd910..d4e4a306ef 100644 --- a/src/main/java/org/apache/commons/configuration3/XMLListReference.java +++ b/src/main/java/org/apache/commons/configuration2/XMLListReference.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.apache.commons.configuration3.convert.ListDelimiterHandler; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration3.tree.ImmutableNode; -import org.apache.commons.configuration3.tree.ReferenceNodeHandler; +import org.apache.commons.configuration2.convert.ListDelimiterHandler; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.ReferenceNodeHandler; import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Element; diff --git a/src/main/java/org/apache/commons/configuration3/XMLPropertiesConfiguration.java b/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/XMLPropertiesConfiguration.java rename to src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java index d518a7ce3e..645ee6c7f9 100644 --- a/src/main/java/org/apache/commons/configuration3/XMLPropertiesConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.io.PrintWriter; import java.io.Reader; @@ -27,10 +27,10 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import org.apache.commons.configuration3.convert.ListDelimiterHandler; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.FileLocator; -import org.apache.commons.configuration3.io.FileLocatorAware; +import org.apache.commons.configuration2.convert.ListDelimiterHandler; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.FileLocator; +import org.apache.commons.configuration2.io.FileLocatorAware; import org.apache.commons.text.StringEscapeUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/src/main/java/org/apache/commons/configuration3/YAMLConfiguration.java b/src/main/java/org/apache/commons/configuration2/YAMLConfiguration.java similarity index 94% rename from src/main/java/org/apache/commons/configuration3/YAMLConfiguration.java rename to src/main/java/org/apache/commons/configuration2/YAMLConfiguration.java index bf0c44e025..7f392ccd60 100644 --- a/src/main/java/org/apache/commons/configuration3/YAMLConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/YAMLConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.io.IOException; import java.io.InputStream; @@ -23,9 +23,9 @@ import java.io.Writer; import java.util.Map; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.InputStreamSupport; -import org.apache.commons.configuration3.tree.ImmutableNode; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.InputStreamSupport; +import org.apache.commons.configuration2.tree.ImmutableNode; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.Yaml; diff --git a/src/main/java/org/apache/commons/configuration3/beanutils/BeanCreationContext.java b/src/main/java/org/apache/commons/configuration2/beanutils/BeanCreationContext.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/beanutils/BeanCreationContext.java rename to src/main/java/org/apache/commons/configuration2/beanutils/BeanCreationContext.java index 58ca596479..6f123179fd 100644 --- a/src/main/java/org/apache/commons/configuration3/beanutils/BeanCreationContext.java +++ b/src/main/java/org/apache/commons/configuration2/beanutils/BeanCreationContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.beanutils; +package org.apache.commons.configuration2.beanutils; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/beanutils/BeanDeclaration.java b/src/main/java/org/apache/commons/configuration2/beanutils/BeanDeclaration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/beanutils/BeanDeclaration.java rename to src/main/java/org/apache/commons/configuration2/beanutils/BeanDeclaration.java index 8a670dec8d..9dfd3a96f8 100644 --- a/src/main/java/org/apache/commons/configuration3/beanutils/BeanDeclaration.java +++ b/src/main/java/org/apache/commons/configuration2/beanutils/BeanDeclaration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.beanutils; +package org.apache.commons.configuration2.beanutils; import java.util.Collection; import java.util.Map; diff --git a/src/main/java/org/apache/commons/configuration3/beanutils/BeanFactory.java b/src/main/java/org/apache/commons/configuration2/beanutils/BeanFactory.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/beanutils/BeanFactory.java rename to src/main/java/org/apache/commons/configuration2/beanutils/BeanFactory.java index d219c97a6a..295e0de28e 100644 --- a/src/main/java/org/apache/commons/configuration3/beanutils/BeanFactory.java +++ b/src/main/java/org/apache/commons/configuration2/beanutils/BeanFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.beanutils; +package org.apache.commons.configuration2.beanutils; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/beanutils/BeanHelper.java b/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/beanutils/BeanHelper.java rename to src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java index fd30bab67b..f5a2ecbd73 100644 --- a/src/main/java/org/apache/commons/configuration3/beanutils/BeanHelper.java +++ b/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.beanutils; +package org.apache.commons.configuration2.beanutils; import java.beans.PropertyDescriptor; import java.lang.reflect.InvocationTargetException; @@ -34,7 +34,7 @@ import org.apache.commons.beanutils.PropertyUtilsBean; import org.apache.commons.beanutils.WrapDynaBean; import org.apache.commons.beanutils.WrapDynaClass; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; import org.apache.commons.lang3.ClassUtils; /** diff --git a/src/main/java/org/apache/commons/configuration3/beanutils/CombinedBeanDeclaration.java b/src/main/java/org/apache/commons/configuration2/beanutils/CombinedBeanDeclaration.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/beanutils/CombinedBeanDeclaration.java rename to src/main/java/org/apache/commons/configuration2/beanutils/CombinedBeanDeclaration.java index 9827eba3a7..11f3160017 100644 --- a/src/main/java/org/apache/commons/configuration3/beanutils/CombinedBeanDeclaration.java +++ b/src/main/java/org/apache/commons/configuration2/beanutils/CombinedBeanDeclaration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.beanutils; +package org.apache.commons.configuration2.beanutils; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/org/apache/commons/configuration3/beanutils/ConfigurationDynaBean.java b/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.java similarity index 94% rename from src/main/java/org/apache/commons/configuration3/beanutils/ConfigurationDynaBean.java rename to src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.java index 277374f8d8..5522ccca16 100644 --- a/src/main/java/org/apache/commons/configuration3/beanutils/ConfigurationDynaBean.java +++ b/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3.beanutils; +package org.apache.commons.configuration2.beanutils; import java.lang.reflect.Array; import java.util.Collection; @@ -24,22 +24,22 @@ import org.apache.commons.beanutils.DynaBean; import org.apache.commons.beanutils.DynaClass; -import org.apache.commons.configuration3.Configuration; -import org.apache.commons.configuration3.ConfigurationMap; -import org.apache.commons.configuration3.SubsetConfiguration; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.ConfigurationMap; +import org.apache.commons.configuration2.SubsetConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** * The {@code ConfigurationDynaBean} dynamically reads and writes configurations properties from a wrapped - * configuration-collection {@link org.apache.commons.configuration3.Configuration} instance. It also implements a + * configuration-collection {@link org.apache.commons.configuration2.Configuration} instance. It also implements a * {@link java.util.Map} interface so that it can be used in JSP 2.0 Expression Language expressions. * *

      * The {@code ConfigurationDynaBean} maps nested and mapped properties to the appropriate {@code Configuration} subset - * using the {@link org.apache.commons.configuration3.Configuration#subset} method. Similarly, indexed properties + * using the {@link org.apache.commons.configuration2.Configuration#subset} method. Similarly, indexed properties * reference lists of configuration properties using the - * {@link org.apache.commons.configuration3.Configuration#getList(String)} method. Setting an indexed property is + * {@link org.apache.commons.configuration2.Configuration#getList(String)} method. Setting an indexed property is * supported, too. *

      * diff --git a/src/main/java/org/apache/commons/configuration3/beanutils/ConfigurationDynaClass.java b/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/beanutils/ConfigurationDynaClass.java rename to src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java index d74ee86004..aeae16c08a 100644 --- a/src/main/java/org/apache/commons/configuration3/beanutils/ConfigurationDynaClass.java +++ b/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3.beanutils; +package org.apache.commons.configuration2.beanutils; import java.util.ArrayList; import java.util.Iterator; @@ -24,13 +24,13 @@ import org.apache.commons.beanutils.DynaBean; import org.apache.commons.beanutils.DynaClass; import org.apache.commons.beanutils.DynaProperty; -import org.apache.commons.configuration3.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** * The {@code ConfigurationDynaClass} dynamically determines properties for a {@code ConfigurationDynaBean} from a - * wrapped configuration-collection {@link org.apache.commons.configuration3.Configuration} instance. + * wrapped configuration-collection {@link org.apache.commons.configuration2.Configuration} instance. * * @since 1.0-rc1 */ diff --git a/src/main/java/org/apache/commons/configuration3/beanutils/ConstructorArg.java b/src/main/java/org/apache/commons/configuration2/beanutils/ConstructorArg.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/beanutils/ConstructorArg.java rename to src/main/java/org/apache/commons/configuration2/beanutils/ConstructorArg.java index e5b094af7b..09f62a1d66 100644 --- a/src/main/java/org/apache/commons/configuration3/beanutils/ConstructorArg.java +++ b/src/main/java/org/apache/commons/configuration2/beanutils/ConstructorArg.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.beanutils; +package org.apache.commons.configuration2.beanutils; import java.util.Objects; diff --git a/src/main/java/org/apache/commons/configuration3/beanutils/DefaultBeanFactory.java b/src/main/java/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/beanutils/DefaultBeanFactory.java rename to src/main/java/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.java index 94680709af..c0a64f3e03 100644 --- a/src/main/java/org/apache/commons/configuration3/beanutils/DefaultBeanFactory.java +++ b/src/main/java/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.beanutils; +package org.apache.commons.configuration2.beanutils; import java.lang.reflect.Constructor; import java.util.Collection; @@ -22,9 +22,9 @@ import java.util.LinkedList; import java.util.List; -import org.apache.commons.configuration3.convert.ConversionHandler; -import org.apache.commons.configuration3.convert.DefaultConversionHandler; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.convert.ConversionHandler; +import org.apache.commons.configuration2.convert.DefaultConversionHandler; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/beanutils/XMLBeanDeclaration.java b/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/beanutils/XMLBeanDeclaration.java rename to src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java index fdfc7d0f8d..2f8a93d70b 100644 --- a/src/main/java/org/apache/commons/configuration3/beanutils/XMLBeanDeclaration.java +++ b/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.beanutils; +package org.apache.commons.configuration2.beanutils; import java.util.ArrayList; import java.util.Collection; @@ -26,11 +26,11 @@ import java.util.function.Function; import java.util.stream.Collectors; -import org.apache.commons.configuration3.BaseHierarchicalConfiguration; -import org.apache.commons.configuration3.HierarchicalConfiguration; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration3.tree.NodeHandler; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; +import org.apache.commons.configuration2.HierarchicalConfiguration; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration2.tree.NodeHandler; import org.apache.commons.lang3.StringUtils; /** diff --git a/src/main/java/org/apache/commons/configuration3/beanutils/package-info.java b/src/main/java/org/apache/commons/configuration2/beanutils/package-info.java similarity index 95% rename from src/main/java/org/apache/commons/configuration3/beanutils/package-info.java rename to src/main/java/org/apache/commons/configuration2/beanutils/package-info.java index 78aa046463..d4a5656b08 100644 --- a/src/main/java/org/apache/commons/configuration3/beanutils/package-info.java +++ b/src/main/java/org/apache/commons/configuration2/beanutils/package-info.java @@ -22,4 +22,4 @@ * classes for declaring beans in configuration files, from which then instances can be created. *

      */ -package org.apache.commons.configuration3.beanutils; +package org.apache.commons.configuration2.beanutils; diff --git a/src/main/java/org/apache/commons/configuration3/builder/AutoSaveListener.java b/src/main/java/org/apache/commons/configuration2/builder/AutoSaveListener.java similarity index 92% rename from src/main/java/org/apache/commons/configuration3/builder/AutoSaveListener.java rename to src/main/java/org/apache/commons/configuration2/builder/AutoSaveListener.java index 85b712abca..dfaae168a2 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/AutoSaveListener.java +++ b/src/main/java/org/apache/commons/configuration2/builder/AutoSaveListener.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; -import org.apache.commons.configuration3.event.ConfigurationEvent; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.FileHandler; -import org.apache.commons.configuration3.io.FileHandlerListenerAdapter; +import org.apache.commons.configuration2.event.ConfigurationEvent; +import org.apache.commons.configuration2.event.EventListener; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration2.io.FileHandlerListenerAdapter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/main/java/org/apache/commons/configuration3/builder/BasicBuilderParameters.java b/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/builder/BasicBuilderParameters.java rename to src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java index c5df435f6a..98d59d4866 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/BasicBuilderParameters.java +++ b/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.apache.commons.configuration3.ConfigurationDecoder; -import org.apache.commons.configuration3.beanutils.BeanHelper; -import org.apache.commons.configuration3.convert.ConversionHandler; -import org.apache.commons.configuration3.convert.ListDelimiterHandler; -import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration3.interpol.InterpolatorSpecification; -import org.apache.commons.configuration3.interpol.Lookup; -import org.apache.commons.configuration3.io.ConfigurationLogger; -import org.apache.commons.configuration3.sync.Synchronizer; +import org.apache.commons.configuration2.ConfigurationDecoder; +import org.apache.commons.configuration2.beanutils.BeanHelper; +import org.apache.commons.configuration2.convert.ConversionHandler; +import org.apache.commons.configuration2.convert.ListDelimiterHandler; +import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration2.interpol.InterpolatorSpecification; +import org.apache.commons.configuration2.interpol.Lookup; +import org.apache.commons.configuration2.io.ConfigurationLogger; +import org.apache.commons.configuration2.sync.Synchronizer; /** *

      @@ -139,7 +139,7 @@ public BasicBuilderParameters setThrowExceptionOnMissing(final boolean b) { /** * Sets the value of the listDelimiterHandler property. This property defines the object responsible for * dealing with list delimiter and escaping characters. Note: - * {@link org.apache.commons.configuration3.AbstractConfiguration AbstractConfiguration} does not allow setting this + * {@link org.apache.commons.configuration2.AbstractConfiguration AbstractConfiguration} does not allow setting this * property to null. If the default {@code ListDelimiterHandler} is to be used, do not call this method. * * @param handler the {@code ListDelimiterHandler} diff --git a/src/main/java/org/apache/commons/configuration3/builder/BasicBuilderProperties.java b/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java similarity index 93% rename from src/main/java/org/apache/commons/configuration3/builder/BasicBuilderProperties.java rename to src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java index 972693a45f..ac19e4e773 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/BasicBuilderProperties.java +++ b/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import java.util.Collection; import java.util.Map; -import org.apache.commons.configuration3.ConfigurationDecoder; -import org.apache.commons.configuration3.beanutils.BeanHelper; -import org.apache.commons.configuration3.convert.ConversionHandler; -import org.apache.commons.configuration3.convert.ListDelimiterHandler; -import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration3.interpol.Lookup; -import org.apache.commons.configuration3.io.ConfigurationLogger; -import org.apache.commons.configuration3.sync.Synchronizer; +import org.apache.commons.configuration2.ConfigurationDecoder; +import org.apache.commons.configuration2.beanutils.BeanHelper; +import org.apache.commons.configuration2.convert.ConversionHandler; +import org.apache.commons.configuration2.convert.ListDelimiterHandler; +import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration2.interpol.Lookup; +import org.apache.commons.configuration2.io.ConfigurationLogger; +import org.apache.commons.configuration2.sync.Synchronizer; /** *

      @@ -105,7 +105,7 @@ public interface BasicBuilderProperties { /** * Sets the value of the listDelimiterHandler property. This property defines the object responsible for * dealing with list delimiter and escaping characters. Note: - * {@link org.apache.commons.configuration3.AbstractConfiguration AbstractConfiguration} does not allow setting this + * {@link org.apache.commons.configuration2.AbstractConfiguration AbstractConfiguration} does not allow setting this * property to null. If the default {@code ListDelimiterHandler} is to be used, do not call this method. * * @param handler the {@code ListDelimiterHandler} diff --git a/src/main/java/org/apache/commons/configuration3/builder/BasicConfigurationBuilder.java b/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/builder/BasicConfigurationBuilder.java rename to src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java index 34432e803d..5fd501b5ad 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/BasicConfigurationBuilder.java +++ b/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java @@ -14,28 +14,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.apache.commons.configuration3.ConfigurationUtils; -import org.apache.commons.configuration3.ImmutableConfiguration; -import org.apache.commons.configuration3.Initializable; -import org.apache.commons.configuration3.beanutils.BeanDeclaration; -import org.apache.commons.configuration3.beanutils.BeanHelper; -import org.apache.commons.configuration3.beanutils.ConstructorArg; -import org.apache.commons.configuration3.event.Event; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.event.EventListenerList; -import org.apache.commons.configuration3.event.EventListenerRegistrationData; -import org.apache.commons.configuration3.event.EventSource; -import org.apache.commons.configuration3.event.EventType; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration3.reloading.ReloadingController; +import org.apache.commons.configuration2.ConfigurationUtils; +import org.apache.commons.configuration2.ImmutableConfiguration; +import org.apache.commons.configuration2.Initializable; +import org.apache.commons.configuration2.beanutils.BeanDeclaration; +import org.apache.commons.configuration2.beanutils.BeanHelper; +import org.apache.commons.configuration2.beanutils.ConstructorArg; +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.EventListenerRegistrationData; +import org.apache.commons.configuration2.event.EventSource; +import org.apache.commons.configuration2.event.EventType; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.reloading.ReloadingController; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/builder/BuilderConfigurationWrapperFactory.java b/src/main/java/org/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/builder/BuilderConfigurationWrapperFactory.java rename to src/main/java/org/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory.java index c2198565e3..444673a101 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/BuilderConfigurationWrapperFactory.java +++ b/src/main/java/org/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import org.apache.commons.configuration3.ConfigurationUtils; -import org.apache.commons.configuration3.ImmutableConfiguration; -import org.apache.commons.configuration3.event.EventSource; -import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration2.ConfigurationUtils; +import org.apache.commons.configuration2.ImmutableConfiguration; +import org.apache.commons.configuration2.event.EventSource; +import org.apache.commons.configuration2.ex.ConfigurationException; /** *

      @@ -78,7 +78,7 @@ public BuilderConfigurationWrapperFactory() { * @param builder the wrapped {@code ConfigurationBuilder} (must not be null) * @return the wrapper configuration * @throws IllegalArgumentException if a required parameter is missing - * @throws org.apache.commons.configuration3.ex.ConfigurationRuntimeException if an error occurs when creating the + * @throws org.apache.commons.configuration2.ex.ConfigurationRuntimeException if an error occurs when creating the * result {@code ImmutableConfiguration} */ public T createBuilderConfigurationWrapper(final Class ifcClass, final ConfigurationBuilder builder) { @@ -107,7 +107,7 @@ public EventSourceSupport getEventSourceSupport() { * @param evSrcSupport the level of {@code EventSource} support * @return the wrapper configuration * @throws IllegalArgumentException if a required parameter is missing - * @throws org.apache.commons.configuration3.ex.ConfigurationRuntimeException if an error occurs when creating the + * @throws org.apache.commons.configuration2.ex.ConfigurationRuntimeException if an error occurs when creating the * result {@code ImmutableConfiguration} */ public static T createBuilderConfigurationWrapper(final Class ifcClass, diff --git a/src/main/java/org/apache/commons/configuration3/builder/BuilderParameters.java b/src/main/java/org/apache/commons/configuration2/builder/BuilderParameters.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/builder/BuilderParameters.java rename to src/main/java/org/apache/commons/configuration2/builder/BuilderParameters.java index 94f0312b9a..c2cdc4ec9d 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/BuilderParameters.java +++ b/src/main/java/org/apache/commons/configuration2/builder/BuilderParameters.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import java.util.Map; diff --git a/src/main/java/org/apache/commons/configuration3/builder/ConfigurationBuilder.java b/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilder.java similarity index 87% rename from src/main/java/org/apache/commons/configuration3/builder/ConfigurationBuilder.java rename to src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilder.java index 2c0bebf5d1..e00bc89e95 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/ConfigurationBuilder.java +++ b/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilder.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; -import org.apache.commons.configuration3.ImmutableConfiguration; -import org.apache.commons.configuration3.event.EventSource; -import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration2.ImmutableConfiguration; +import org.apache.commons.configuration2.event.EventSource; +import org.apache.commons.configuration2.ex.ConfigurationException; /** *

      * Definition of an interface for objects that can create {@link ImmutableConfiguration} or - * {@link org.apache.commons.configuration3.Configuration Configuration} objects of a specific type. + * {@link org.apache.commons.configuration2.Configuration Configuration} objects of a specific type. *

      *

      * This interface defines an abstract way of creating a {@code ImmutableConfiguration} object. It does not assume any diff --git a/src/main/java/org/apache/commons/configuration3/builder/ConfigurationBuilderEvent.java b/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderEvent.java similarity index 95% rename from src/main/java/org/apache/commons/configuration3/builder/ConfigurationBuilderEvent.java rename to src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderEvent.java index 1de040de68..c5dc3eaabe 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/ConfigurationBuilderEvent.java +++ b/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderEvent.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; -import org.apache.commons.configuration3.event.Event; -import org.apache.commons.configuration3.event.EventType; +import org.apache.commons.configuration2.event.Event; +import org.apache.commons.configuration2.event.EventType; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/builder/ConfigurationBuilderResultCreatedEvent.java b/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderResultCreatedEvent.java similarity index 92% rename from src/main/java/org/apache/commons/configuration3/builder/ConfigurationBuilderResultCreatedEvent.java rename to src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderResultCreatedEvent.java index 312c8b32de..5b4e0f0d89 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/ConfigurationBuilderResultCreatedEvent.java +++ b/src/main/java/org/apache/commons/configuration2/builder/ConfigurationBuilderResultCreatedEvent.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; -import org.apache.commons.configuration3.ImmutableConfiguration; -import org.apache.commons.configuration3.event.EventType; +import org.apache.commons.configuration2.ImmutableConfiguration; +import org.apache.commons.configuration2.event.EventType; /** *

      @@ -45,9 +45,9 @@ public class ConfigurationBuilderResultCreatedEvent extends ConfigurationBuilder public static final EventType RESULT_CREATED = new EventType<>(ANY, "RESULT_CREATED"); // SpotBugs - // [ERROR] Medium: Class org.apache.commons.configuration3.builder.ConfigurationBuilderResultCreatedEvent defines + // [ERROR] Medium: Class org.apache.commons.configuration2.builder.ConfigurationBuilderResultCreatedEvent defines // non-transient non-serializable instance field configuration - // [org.apache.commons.configuration3.builder.ConfigurationBuilderResultCreatedEvent] In + // [org.apache.commons.configuration2.builder.ConfigurationBuilderResultCreatedEvent] In // ConfigurationBuilderResultCreatedEvent.java SE_BAD_FIELD // // private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/apache/commons/configuration3/builder/CopyObjectDefaultHandler.java b/src/main/java/org/apache/commons/configuration2/builder/CopyObjectDefaultHandler.java similarity index 95% rename from src/main/java/org/apache/commons/configuration3/builder/CopyObjectDefaultHandler.java rename to src/main/java/org/apache/commons/configuration2/builder/CopyObjectDefaultHandler.java index f66403d852..78ff60d1da 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/CopyObjectDefaultHandler.java +++ b/src/main/java/org/apache/commons/configuration2/builder/CopyObjectDefaultHandler.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; -import org.apache.commons.configuration3.beanutils.BeanHelper; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.beanutils.BeanHelper; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/builder/DatabaseBuilderParametersImpl.java b/src/main/java/org/apache/commons/configuration2/builder/DatabaseBuilderParametersImpl.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/builder/DatabaseBuilderParametersImpl.java rename to src/main/java/org/apache/commons/configuration2/builder/DatabaseBuilderParametersImpl.java index 09e6f004e5..eecc2c26b2 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/DatabaseBuilderParametersImpl.java +++ b/src/main/java/org/apache/commons/configuration2/builder/DatabaseBuilderParametersImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import javax.sql.DataSource; diff --git a/src/main/java/org/apache/commons/configuration3/builder/DatabaseBuilderProperties.java b/src/main/java/org/apache/commons/configuration2/builder/DatabaseBuilderProperties.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/builder/DatabaseBuilderProperties.java rename to src/main/java/org/apache/commons/configuration2/builder/DatabaseBuilderProperties.java index 2aca4fe4d3..e931869897 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/DatabaseBuilderProperties.java +++ b/src/main/java/org/apache/commons/configuration2/builder/DatabaseBuilderProperties.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import javax.sql.DataSource; diff --git a/src/main/java/org/apache/commons/configuration3/builder/DefaultParametersHandler.java b/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersHandler.java similarity index 95% rename from src/main/java/org/apache/commons/configuration3/builder/DefaultParametersHandler.java rename to src/main/java/org/apache/commons/configuration2/builder/DefaultParametersHandler.java index 3b76ea4b41..a58adbf2b7 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/DefaultParametersHandler.java +++ b/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; /** *

      @@ -22,7 +22,7 @@ *

      *

      * An object implementing this interface knows how to initialize a parameters object of a specific class with default - * values. Such objects can be registered at the {@link org.apache.commons.configuration3.builder.fluent.Parameters + * values. Such objects can be registered at the {@link org.apache.commons.configuration2.builder.fluent.Parameters * Parameters} class. Whenever a specific parameters object is created all registered {@code DefaultParametersHandler} * objects that can handle this parameters type are invoked, so that they get the chance to perform arbitrary * initialization. diff --git a/src/main/java/org/apache/commons/configuration3/builder/DefaultParametersManager.java b/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersManager.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/builder/DefaultParametersManager.java rename to src/main/java/org/apache/commons/configuration2/builder/DefaultParametersManager.java index 16c9358616..1f09202fee 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/DefaultParametersManager.java +++ b/src/main/java/org/apache/commons/configuration2/builder/DefaultParametersManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import java.util.Collection; import java.util.concurrent.CopyOnWriteArrayList; @@ -74,15 +74,15 @@ public void registerDefaultsHandler(final Class paramsClass, final Defaul * classes do not stand in a real inheritance hierarchy; however, there is a logic hierarchy defined by the methods * supported by the different parameter objects. A properties parameter object for instance supports all methods defined * for a file-based parameter object. So one can argue that - * {@link org.apache.commons.configuration3.builder.fluent.FileBasedBuilderParameters FileBasedBuilderParameters} is a - * base interface of {@link org.apache.commons.configuration3.builder.fluent.PropertiesBuilderParameters + * {@link org.apache.commons.configuration2.builder.fluent.FileBasedBuilderParameters FileBasedBuilderParameters} is a + * base interface of {@link org.apache.commons.configuration2.builder.fluent.PropertiesBuilderParameters * PropertiesBuilderParameters} (although, for technical reasons, this relation is not reflected in the Java classes). A * {@link DefaultParametersHandler} object defined for a base interface can also deal with parameter objects "derived" * from this base interface (i.e. supporting a super set of the methods defined by the base interface). Now there may be * the use case that there is an implementation of {@code DefaultParametersHandler} for a base interface (e.g. * {@code FileBasedBuilderParameters}), but it should only process specific derived interfaces (say * {@code PropertiesBuilderParameters}, but not - * {@link org.apache.commons.configuration3.builder.fluent.XMLBuilderParameters XMLBuilderParameters}). This can be + * {@link org.apache.commons.configuration2.builder.fluent.XMLBuilderParameters XMLBuilderParameters}). This can be * achieved by passing in {@code PropertiesBuilderParameters} as start class. In this case, * {@code DefaultParametersManager} ensures that the handler is only called on parameter objects having both the start * class and the actual type supported by the handler as base interfaces. The passed in start class can be null; diff --git a/src/main/java/org/apache/commons/configuration3/builder/DefaultReloadingDetectorFactory.java b/src/main/java/org/apache/commons/configuration2/builder/DefaultReloadingDetectorFactory.java similarity index 85% rename from src/main/java/org/apache/commons/configuration3/builder/DefaultReloadingDetectorFactory.java rename to src/main/java/org/apache/commons/configuration2/builder/DefaultReloadingDetectorFactory.java index 09612e7d63..f0c736ddc3 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/DefaultReloadingDetectorFactory.java +++ b/src/main/java/org/apache/commons/configuration2/builder/DefaultReloadingDetectorFactory.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.FileHandler; -import org.apache.commons.configuration3.reloading.FileHandlerReloadingDetector; -import org.apache.commons.configuration3.reloading.ReloadingDetector; +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.ReloadingDetector; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/builder/EventListenerParameters.java b/src/main/java/org/apache/commons/configuration2/builder/EventListenerParameters.java similarity index 91% rename from src/main/java/org/apache/commons/configuration3/builder/EventListenerParameters.java rename to src/main/java/org/apache/commons/configuration2/builder/EventListenerParameters.java index 6b076ad885..950cb1233d 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/EventListenerParameters.java +++ b/src/main/java/org/apache/commons/configuration2/builder/EventListenerParameters.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import java.util.Collections; import java.util.Map; -import org.apache.commons.configuration3.event.Event; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.event.EventListenerList; -import org.apache.commons.configuration3.event.EventListenerRegistrationData; -import org.apache.commons.configuration3.event.EventType; +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.EventListenerRegistrationData; +import org.apache.commons.configuration2.event.EventType; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/builder/EventListenerProvider.java b/src/main/java/org/apache/commons/configuration2/builder/EventListenerProvider.java similarity index 94% rename from src/main/java/org/apache/commons/configuration3/builder/EventListenerProvider.java rename to src/main/java/org/apache/commons/configuration2/builder/EventListenerProvider.java index f1bb3efc88..8ef50f73ef 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/EventListenerProvider.java +++ b/src/main/java/org/apache/commons/configuration2/builder/EventListenerProvider.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; -import org.apache.commons.configuration3.event.EventListenerList; +import org.apache.commons.configuration2.event.EventListenerList; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/builder/FileBasedBuilderParametersImpl.java b/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/builder/FileBasedBuilderParametersImpl.java rename to src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl.java index b9c0071bdb..c5b872ace4 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/FileBasedBuilderParametersImpl.java +++ b/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import java.io.File; import java.net.URL; import java.util.Map; -import org.apache.commons.configuration3.io.FileHandler; -import org.apache.commons.configuration3.io.FileLocationStrategy; -import org.apache.commons.configuration3.io.FileSystem; -import org.apache.commons.configuration3.io.URLConnectionOptions; +import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration2.io.FileLocationStrategy; +import org.apache.commons.configuration2.io.FileSystem; +import org.apache.commons.configuration2.io.URLConnectionOptions; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/builder/FileBasedBuilderProperties.java b/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderProperties.java similarity index 94% rename from src/main/java/org/apache/commons/configuration3/builder/FileBasedBuilderProperties.java rename to src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderProperties.java index bec93cef28..9035660198 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/FileBasedBuilderProperties.java +++ b/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderProperties.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import java.io.File; import java.net.URL; -import org.apache.commons.configuration3.io.FileLocationStrategy; -import org.apache.commons.configuration3.io.FileSystem; -import org.apache.commons.configuration3.io.URLConnectionOptions; +import org.apache.commons.configuration2.io.FileLocationStrategy; +import org.apache.commons.configuration2.io.FileSystem; +import org.apache.commons.configuration2.io.URLConnectionOptions; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/builder/FileBasedConfigurationBuilder.java b/src/main/java/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/builder/FileBasedConfigurationBuilder.java rename to src/main/java/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.java index c57009ff83..fe6e471e12 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/FileBasedConfigurationBuilder.java +++ b/src/main/java/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.commons.configuration3.FileBasedConfiguration; -import org.apache.commons.configuration3.PropertiesConfiguration; -import org.apache.commons.configuration3.XMLPropertiesConfiguration; -import org.apache.commons.configuration3.event.ConfigurationEvent; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.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; diff --git a/src/main/java/org/apache/commons/configuration3/builder/HierarchicalBuilderParametersImpl.java b/src/main/java/org/apache/commons/configuration2/builder/HierarchicalBuilderParametersImpl.java similarity index 94% rename from src/main/java/org/apache/commons/configuration3/builder/HierarchicalBuilderParametersImpl.java rename to src/main/java/org/apache/commons/configuration2/builder/HierarchicalBuilderParametersImpl.java index 6f56f498f4..8fcfdad5d8 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/HierarchicalBuilderParametersImpl.java +++ b/src/main/java/org/apache/commons/configuration2/builder/HierarchicalBuilderParametersImpl.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import java.util.Map; -import org.apache.commons.configuration3.tree.ExpressionEngine; +import org.apache.commons.configuration2.tree.ExpressionEngine; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/builder/HierarchicalBuilderProperties.java b/src/main/java/org/apache/commons/configuration2/builder/HierarchicalBuilderProperties.java similarity index 93% rename from src/main/java/org/apache/commons/configuration3/builder/HierarchicalBuilderProperties.java rename to src/main/java/org/apache/commons/configuration2/builder/HierarchicalBuilderProperties.java index a4666cb275..8990b0f457 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/HierarchicalBuilderProperties.java +++ b/src/main/java/org/apache/commons/configuration2/builder/HierarchicalBuilderProperties.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; -import org.apache.commons.configuration3.tree.ExpressionEngine; +import org.apache.commons.configuration2.tree.ExpressionEngine; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/builder/INIBuilderParametersImpl.java b/src/main/java/org/apache/commons/configuration2/builder/INIBuilderParametersImpl.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/builder/INIBuilderParametersImpl.java rename to src/main/java/org/apache/commons/configuration2/builder/INIBuilderParametersImpl.java index 5bcfc86fc5..e1e8cfd044 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/INIBuilderParametersImpl.java +++ b/src/main/java/org/apache/commons/configuration2/builder/INIBuilderParametersImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import java.util.Map; diff --git a/src/main/java/org/apache/commons/configuration3/builder/INIBuilderProperties.java b/src/main/java/org/apache/commons/configuration2/builder/INIBuilderProperties.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/builder/INIBuilderProperties.java rename to src/main/java/org/apache/commons/configuration2/builder/INIBuilderProperties.java index edff7777b7..1fd9aa2541 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/INIBuilderProperties.java +++ b/src/main/java/org/apache/commons/configuration2/builder/INIBuilderProperties.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/builder/JndiBuilderParametersImpl.java b/src/main/java/org/apache/commons/configuration2/builder/JndiBuilderParametersImpl.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/builder/JndiBuilderParametersImpl.java rename to src/main/java/org/apache/commons/configuration2/builder/JndiBuilderParametersImpl.java index 2c2ee24fb7..c7782c5560 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/JndiBuilderParametersImpl.java +++ b/src/main/java/org/apache/commons/configuration2/builder/JndiBuilderParametersImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import javax.naming.Context; diff --git a/src/main/java/org/apache/commons/configuration3/builder/JndiBuilderProperties.java b/src/main/java/org/apache/commons/configuration2/builder/JndiBuilderProperties.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/builder/JndiBuilderProperties.java rename to src/main/java/org/apache/commons/configuration2/builder/JndiBuilderProperties.java index 50d78cfefa..654dfc1d01 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/JndiBuilderProperties.java +++ b/src/main/java/org/apache/commons/configuration2/builder/JndiBuilderProperties.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import javax.naming.Context; diff --git a/src/main/java/org/apache/commons/configuration3/builder/PropertiesBuilderParametersImpl.java b/src/main/java/org/apache/commons/configuration2/builder/PropertiesBuilderParametersImpl.java similarity index 91% rename from src/main/java/org/apache/commons/configuration3/builder/PropertiesBuilderParametersImpl.java rename to src/main/java/org/apache/commons/configuration2/builder/PropertiesBuilderParametersImpl.java index 7767a171c8..d4d2469612 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/PropertiesBuilderParametersImpl.java +++ b/src/main/java/org/apache/commons/configuration2/builder/PropertiesBuilderParametersImpl.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import java.util.Map; -import org.apache.commons.configuration3.ConfigurationConsumer; -import org.apache.commons.configuration3.PropertiesConfiguration.IOFactory; -import org.apache.commons.configuration3.PropertiesConfigurationLayout; -import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration2.ConfigurationConsumer; +import org.apache.commons.configuration2.PropertiesConfiguration.IOFactory; +import org.apache.commons.configuration2.PropertiesConfigurationLayout; +import org.apache.commons.configuration2.ex.ConfigurationException; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/builder/PropertiesBuilderProperties.java b/src/main/java/org/apache/commons/configuration2/builder/PropertiesBuilderProperties.java similarity index 91% rename from src/main/java/org/apache/commons/configuration3/builder/PropertiesBuilderProperties.java rename to src/main/java/org/apache/commons/configuration2/builder/PropertiesBuilderProperties.java index 7f9bff5347..b79ab4d39a 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/PropertiesBuilderProperties.java +++ b/src/main/java/org/apache/commons/configuration2/builder/PropertiesBuilderProperties.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; -import org.apache.commons.configuration3.ConfigurationConsumer; -import org.apache.commons.configuration3.PropertiesConfiguration.IOFactory; -import org.apache.commons.configuration3.PropertiesConfigurationLayout; -import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration2.ConfigurationConsumer; +import org.apache.commons.configuration2.PropertiesConfiguration.IOFactory; +import org.apache.commons.configuration2.PropertiesConfigurationLayout; +import org.apache.commons.configuration2.ex.ConfigurationException; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/builder/ReloadingBuilderSupportListener.java b/src/main/java/org/apache/commons/configuration2/builder/ReloadingBuilderSupportListener.java similarity index 92% rename from src/main/java/org/apache/commons/configuration3/builder/ReloadingBuilderSupportListener.java rename to src/main/java/org/apache/commons/configuration2/builder/ReloadingBuilderSupportListener.java index 2fa4c93ad0..925a5cd25f 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/ReloadingBuilderSupportListener.java +++ b/src/main/java/org/apache/commons/configuration2/builder/ReloadingBuilderSupportListener.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; -import org.apache.commons.configuration3.event.Event; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.reloading.ReloadingController; -import org.apache.commons.configuration3.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; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/builder/ReloadingDetectorFactory.java b/src/main/java/org/apache/commons/configuration2/builder/ReloadingDetectorFactory.java similarity index 89% rename from src/main/java/org/apache/commons/configuration3/builder/ReloadingDetectorFactory.java rename to src/main/java/org/apache/commons/configuration2/builder/ReloadingDetectorFactory.java index ad2bc67d19..c6b066c1cd 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/ReloadingDetectorFactory.java +++ b/src/main/java/org/apache/commons/configuration2/builder/ReloadingDetectorFactory.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.FileHandler; -import org.apache.commons.configuration3.reloading.ReloadingDetector; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration2.reloading.ReloadingDetector; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/builder/ReloadingFileBasedConfigurationBuilder.java b/src/main/java/org/apache/commons/configuration2/builder/ReloadingFileBasedConfigurationBuilder.java similarity index 95% rename from src/main/java/org/apache/commons/configuration3/builder/ReloadingFileBasedConfigurationBuilder.java rename to src/main/java/org/apache/commons/configuration2/builder/ReloadingFileBasedConfigurationBuilder.java index 253e9cb4a8..e25306a70a 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/ReloadingFileBasedConfigurationBuilder.java +++ b/src/main/java/org/apache/commons/configuration2/builder/ReloadingFileBasedConfigurationBuilder.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import java.util.Map; -import org.apache.commons.configuration3.FileBasedConfiguration; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.FileHandler; -import org.apache.commons.configuration3.reloading.ReloadingController; -import org.apache.commons.configuration3.reloading.ReloadingControllerSupport; -import org.apache.commons.configuration3.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.ReloadingController; +import org.apache.commons.configuration2.reloading.ReloadingControllerSupport; +import org.apache.commons.configuration2.reloading.ReloadingDetector; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/builder/XMLBuilderParametersImpl.java b/src/main/java/org/apache/commons/configuration2/builder/XMLBuilderParametersImpl.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/builder/XMLBuilderParametersImpl.java rename to src/main/java/org/apache/commons/configuration2/builder/XMLBuilderParametersImpl.java index 3436a0266b..1eea12857b 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/XMLBuilderParametersImpl.java +++ b/src/main/java/org/apache/commons/configuration2/builder/XMLBuilderParametersImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import java.util.Map; diff --git a/src/main/java/org/apache/commons/configuration3/builder/XMLBuilderProperties.java b/src/main/java/org/apache/commons/configuration2/builder/XMLBuilderProperties.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/builder/XMLBuilderProperties.java rename to src/main/java/org/apache/commons/configuration2/builder/XMLBuilderProperties.java index f61bc8f86c..a7bf485098 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/XMLBuilderProperties.java +++ b/src/main/java/org/apache/commons/configuration2/builder/XMLBuilderProperties.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import javax.xml.parsers.DocumentBuilder; diff --git a/src/main/java/org/apache/commons/configuration3/builder/combined/BaseConfigurationBuilderProvider.java b/src/main/java/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/builder/combined/BaseConfigurationBuilderProvider.java rename to src/main/java/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.java index 234bab2111..24c8a59399 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/combined/BaseConfigurationBuilderProvider.java +++ b/src/main/java/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.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.Collections; import java.util.Map; -import org.apache.commons.configuration3.Configuration; -import org.apache.commons.configuration3.ConfigurationUtils; -import org.apache.commons.configuration3.builder.BasicConfigurationBuilder; -import org.apache.commons.configuration3.builder.BuilderParameters; -import org.apache.commons.configuration3.builder.ConfigurationBuilder; -import org.apache.commons.configuration3.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; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/builder/combined/CombinedBuilderParametersImpl.java b/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/builder/combined/CombinedBuilderParametersImpl.java rename to src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.java index 376b3adcda..9a2d9ea5d9 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/combined/CombinedBuilderParametersImpl.java +++ b/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.combined; +package org.apache.commons.configuration2.builder.combined; import java.util.ArrayList; import java.util.Collection; @@ -23,13 +23,13 @@ import java.util.LinkedList; import java.util.Map; -import org.apache.commons.configuration3.ConfigurationUtils; -import org.apache.commons.configuration3.HierarchicalConfiguration; -import org.apache.commons.configuration3.builder.BasicBuilderParameters; -import org.apache.commons.configuration3.builder.BuilderParameters; -import org.apache.commons.configuration3.builder.ConfigurationBuilder; -import org.apache.commons.configuration3.builder.DefaultParametersHandler; -import org.apache.commons.configuration3.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; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/builder/combined/CombinedBuilderProperties.java b/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderProperties.java similarity index 95% rename from src/main/java/org/apache/commons/configuration3/builder/combined/CombinedBuilderProperties.java rename to src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderProperties.java index 7a29fe585f..a215f676bc 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/combined/CombinedBuilderProperties.java +++ b/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderProperties.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.combined; +package org.apache.commons.configuration2.builder.combined; -import org.apache.commons.configuration3.HierarchicalConfiguration; -import org.apache.commons.configuration3.builder.BuilderParameters; -import org.apache.commons.configuration3.builder.ConfigurationBuilder; -import org.apache.commons.configuration3.builder.DefaultParametersHandler; -import org.apache.commons.configuration3.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; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/builder/combined/CombinedConfigurationBuilder.java b/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java similarity index 94% rename from src/main/java/org/apache/commons/configuration3/builder/combined/CombinedConfigurationBuilder.java rename to src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java index c3b8c360ee..68c47262ee 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/combined/CombinedConfigurationBuilder.java +++ b/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.combined; +package org.apache.commons.configuration2.builder.combined; import java.net.URL; import java.util.ArrayList; @@ -28,35 +28,35 @@ import java.util.Set; import java.util.stream.Collectors; -import org.apache.commons.configuration3.CombinedConfiguration; -import org.apache.commons.configuration3.Configuration; -import org.apache.commons.configuration3.ConfigurationLookup; -import org.apache.commons.configuration3.HierarchicalConfiguration; -import org.apache.commons.configuration3.SystemConfiguration; -import org.apache.commons.configuration3.XMLConfiguration; -import org.apache.commons.configuration3.beanutils.BeanDeclaration; -import org.apache.commons.configuration3.beanutils.BeanHelper; -import org.apache.commons.configuration3.beanutils.CombinedBeanDeclaration; -import org.apache.commons.configuration3.beanutils.XMLBeanDeclaration; -import org.apache.commons.configuration3.builder.BasicBuilderParameters; -import org.apache.commons.configuration3.builder.BasicConfigurationBuilder; -import org.apache.commons.configuration3.builder.BuilderParameters; -import org.apache.commons.configuration3.builder.ConfigurationBuilder; -import org.apache.commons.configuration3.builder.ConfigurationBuilderEvent; -import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; -import org.apache.commons.configuration3.builder.FileBasedBuilderProperties; -import org.apache.commons.configuration3.builder.FileBasedConfigurationBuilder; -import org.apache.commons.configuration3.builder.XMLBuilderParametersImpl; -import org.apache.commons.configuration3.builder.XMLBuilderProperties; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration3.interpol.Lookup; -import org.apache.commons.configuration3.io.FileSystem; -import org.apache.commons.configuration3.resolver.CatalogResolver; -import org.apache.commons.configuration3.tree.DefaultExpressionEngineSymbols; -import org.apache.commons.configuration3.tree.OverrideCombiner; -import org.apache.commons.configuration3.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.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.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; /** @@ -69,7 +69,7 @@ * into a single configuration object. The sources to be loaded are defined in an XML document that can contain certain * tags representing the different supported configuration 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.configuration3.beanutils.XMLBeanDeclaration XMLBeanDeclaration} will be used to + * (namely {@link org.apache.commons.configuration2.beanutils.XMLBeanDeclaration XMLBeanDeclaration} will be used to * extract the configuration's initialization parameters, which allows for complex initialization scenarios). *

      *

      @@ -322,47 +322,47 @@ public class CombinedConfigurationBuilder extends BasicConfigurationBuilder @@ -38,19 +38,19 @@ */ public class CombinedConfigurationBuilderProvider extends BaseConfigurationBuilderProvider { /** Constant for the name of the supported builder class. */ - private static final String BUILDER_CLASS = "org.apache.commons.configuration3.builder.combined.CombinedConfigurationBuilder"; + private static final String BUILDER_CLASS = "org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder"; /** Constant for the name of the supported reloading builder class. */ - private static final String RELOADING_BUILDER_CLASS = "org.apache.commons.configuration3.builder.combined.ReloadingCombinedConfigurationBuilder"; + private static final String RELOADING_BUILDER_CLASS = "org.apache.commons.configuration2.builder.combined.ReloadingCombinedConfigurationBuilder"; /** Constant for the name of the supported configuration class. */ - private static final String CONFIGURATION_CLASS = "org.apache.commons.configuration3.CombinedConfiguration"; + private static final String CONFIGURATION_CLASS = "org.apache.commons.configuration2.CombinedConfiguration"; /** Constant for the combined configuration builder parameters class. */ - private static final String COMBINED_PARAMS = "org.apache.commons.configuration3.builder.combined.CombinedBuilderParametersImpl"; + private static final String COMBINED_PARAMS = "org.apache.commons.configuration2.builder.combined.CombinedBuilderParametersImpl"; /** Constant for the name of the file-based builder parameters class. */ - private static final String FILE_PARAMS = "org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl"; + private static final String FILE_PARAMS = "org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl"; /** * Creates a new instance of {@code CombinedConfigurationBuilderProvider}. diff --git a/src/main/java/org/apache/commons/configuration3/builder/combined/ConfigurationBuilderProvider.java b/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationBuilderProvider.java similarity index 88% rename from src/main/java/org/apache/commons/configuration3/builder/combined/ConfigurationBuilderProvider.java rename to src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationBuilderProvider.java index 603b1ca243..23a5adf5d1 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/combined/ConfigurationBuilderProvider.java +++ b/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationBuilderProvider.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.combined; +package org.apache.commons.configuration2.builder.combined; -import org.apache.commons.configuration3.Configuration; -import org.apache.commons.configuration3.builder.ConfigurationBuilder; -import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.builder.ConfigurationBuilder; +import org.apache.commons.configuration2.ex.ConfigurationException; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/builder/combined/ConfigurationDeclaration.java b/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/builder/combined/ConfigurationDeclaration.java rename to src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.java index af7940cf9c..e0d7cb5d83 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/combined/ConfigurationDeclaration.java +++ b/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.combined; +package org.apache.commons.configuration2.builder.combined; import java.util.Set; -import org.apache.commons.configuration3.HierarchicalConfiguration; -import org.apache.commons.configuration3.beanutils.XMLBeanDeclaration; +import org.apache.commons.configuration2.HierarchicalConfiguration; +import org.apache.commons.configuration2.beanutils.XMLBeanDeclaration; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/builder/combined/FileExtensionConfigurationBuilderProvider.java b/src/main/java/org/apache/commons/configuration2/builder/combined/FileExtensionConfigurationBuilderProvider.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/builder/combined/FileExtensionConfigurationBuilderProvider.java rename to src/main/java/org/apache/commons/configuration2/builder/combined/FileExtensionConfigurationBuilderProvider.java index 84285ec038..8b0d717240 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/combined/FileExtensionConfigurationBuilderProvider.java +++ b/src/main/java/org/apache/commons/configuration2/builder/combined/FileExtensionConfigurationBuilderProvider.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.combined; +package org.apache.commons.configuration2.builder.combined; import java.util.Collection; -import org.apache.commons.configuration3.builder.BuilderParameters; -import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; -import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration2.builder.BuilderParameters; +import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl; +import org.apache.commons.configuration2.ex.ConfigurationException; /** *

      diff --git a/src/main/java/org/apache/commons/configuration3/builder/combined/MultiFileBuilderParametersImpl.java b/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl.java similarity index 95% rename from src/main/java/org/apache/commons/configuration3/builder/combined/MultiFileBuilderParametersImpl.java rename to src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl.java index b7c7273561..948054a9d4 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/combined/MultiFileBuilderParametersImpl.java +++ b/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.combined; +package org.apache.commons.configuration2.builder.combined; import java.util.Map; -import org.apache.commons.configuration3.ConfigurationUtils; -import org.apache.commons.configuration3.builder.BasicBuilderParameters; -import org.apache.commons.configuration3.builder.BuilderParameters; +import org.apache.commons.configuration2.ConfigurationUtils; +import org.apache.commons.configuration2.builder.BasicBuilderParameters; +import org.apache.commons.configuration2.builder.BuilderParameters; /** *

      @@ -32,7 +32,7 @@ * builder for this purpose. Therefore, parameters inherited from the super class are treated differently: *

      *
        - *
      • The {@link org.apache.commons.configuration3.interpol.ConfigurationInterpolator ConfigurationInterpolator} is + *
      • The {@link org.apache.commons.configuration2.interpol.ConfigurationInterpolator ConfigurationInterpolator} is * needed by a {@code MultiFileConfigurationBuilder} to resolve the file pattern. It is expected to be set and will not * be passed to sub configurations created by the builder.
        • *
      • All other parameters are evaluated when creating sub configurations. However, it is preferred to use the diff --git a/src/main/java/org/apache/commons/configuration3/builder/combined/MultiFileBuilderProperties.java b/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileBuilderProperties.java similarity index 94% rename from src/main/java/org/apache/commons/configuration3/builder/combined/MultiFileBuilderProperties.java rename to src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileBuilderProperties.java index 797f127cba..786177094b 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/combined/MultiFileBuilderProperties.java +++ b/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileBuilderProperties.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.combined; +package org.apache.commons.configuration2.builder.combined; -import org.apache.commons.configuration3.builder.BuilderParameters; +import org.apache.commons.configuration2.builder.BuilderParameters; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/builder/combined/MultiFileConfigurationBuilder.java b/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.java similarity index 95% rename from src/main/java/org/apache/commons/configuration3/builder/combined/MultiFileConfigurationBuilder.java rename to src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.java index b5873b27cf..d61558147f 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/combined/MultiFileConfigurationBuilder.java +++ b/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.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.ConcurrentMap; import java.util.concurrent.atomic.AtomicReference; -import org.apache.commons.configuration3.ConfigurationUtils; -import org.apache.commons.configuration3.FileBasedConfiguration; -import org.apache.commons.configuration3.builder.BasicBuilderParameters; -import org.apache.commons.configuration3.builder.BasicConfigurationBuilder; -import org.apache.commons.configuration3.builder.BuilderParameters; -import org.apache.commons.configuration3.builder.ConfigurationBuilderEvent; -import org.apache.commons.configuration3.builder.ConfigurationBuilderResultCreatedEvent; -import org.apache.commons.configuration3.builder.FileBasedConfigurationBuilder; -import org.apache.commons.configuration3.event.Event; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.event.EventListenerList; -import org.apache.commons.configuration3.event.EventType; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration3.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; /** diff --git a/src/main/java/org/apache/commons/configuration3/builder/combined/MultiFileConfigurationBuilderProvider.java b/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilderProvider.java similarity index 89% rename from src/main/java/org/apache/commons/configuration3/builder/combined/MultiFileConfigurationBuilderProvider.java rename to src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilderProvider.java index 5c5685945e..8120512c5d 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/combined/MultiFileConfigurationBuilderProvider.java +++ b/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilderProvider.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.combined; +package org.apache.commons.configuration2.builder.combined; import java.util.Arrays; -import org.apache.commons.configuration3.Configuration; -import org.apache.commons.configuration3.ConfigurationUtils; -import org.apache.commons.configuration3.HierarchicalConfiguration; -import org.apache.commons.configuration3.builder.BuilderConfigurationWrapperFactory; -import org.apache.commons.configuration3.builder.BuilderConfigurationWrapperFactory.EventSourceSupport; -import org.apache.commons.configuration3.builder.ConfigurationBuilder; -import org.apache.commons.configuration3.event.Event; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.event.EventType; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.reloading.ReloadingController; -import org.apache.commons.configuration3.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; /** *

        @@ -50,13 +50,13 @@ */ public class MultiFileConfigurationBuilderProvider extends BaseConfigurationBuilderProvider { /** Constant for the name of the builder class. */ - private static final String BUILDER_CLASS = "org.apache.commons.configuration3.builder.combined.MultiFileConfigurationBuilder"; + private static final String BUILDER_CLASS = "org.apache.commons.configuration2.builder.combined.MultiFileConfigurationBuilder"; /** Constant for the name of the reloading builder class. */ - private static final String RELOADING_BUILDER_CLASS = "org.apache.commons.configuration3.builder.combined.ReloadingMultiFileConfigurationBuilder"; + private static final String RELOADING_BUILDER_CLASS = "org.apache.commons.configuration2.builder.combined.ReloadingMultiFileConfigurationBuilder"; /** Constant for the name of the parameters class. */ - private static final String PARAM_CLASS = "org.apache.commons.configuration3.builder.combined.MultiFileBuilderParametersImpl"; + private static final String PARAM_CLASS = "org.apache.commons.configuration2.builder.combined.MultiFileBuilderParametersImpl"; /** * Creates a new instance of {@code MultiFileConfigurationBuilderProvider} and sets the name of the configuration class diff --git a/src/main/java/org/apache/commons/configuration3/builder/combined/MultiWrapDynaBean.java b/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaBean.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/builder/combined/MultiWrapDynaBean.java rename to src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaBean.java index b3cbe67bdb..7e0b2dc064 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/combined/MultiWrapDynaBean.java +++ b/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaBean.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.combined; +package org.apache.commons.configuration2.builder.combined; import java.util.ArrayList; import java.util.Collection; @@ -24,7 +24,7 @@ import org.apache.commons.beanutils.DynaBean; import org.apache.commons.beanutils.DynaClass; import org.apache.commons.beanutils.DynaProperty; -import org.apache.commons.configuration3.beanutils.BeanHelper; +import org.apache.commons.configuration2.beanutils.BeanHelper; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/builder/combined/MultiWrapDynaClass.java b/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/builder/combined/MultiWrapDynaClass.java rename to src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java index b1724e65f7..c662bc0944 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/combined/MultiWrapDynaClass.java +++ b/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.combined; +package org.apache.commons.configuration2.builder.combined; import java.util.Collection; import java.util.HashMap; diff --git a/src/main/java/org/apache/commons/configuration3/builder/combined/ReloadingCombinedConfigurationBuilder.java b/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingCombinedConfigurationBuilder.java similarity index 91% rename from src/main/java/org/apache/commons/configuration3/builder/combined/ReloadingCombinedConfigurationBuilder.java rename to src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingCombinedConfigurationBuilder.java index 046b548c09..29d9f3e55b 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/combined/ReloadingCombinedConfigurationBuilder.java +++ b/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingCombinedConfigurationBuilder.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.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.configuration3.CombinedConfiguration; -import org.apache.commons.configuration3.HierarchicalConfiguration; -import org.apache.commons.configuration3.XMLConfiguration; -import org.apache.commons.configuration3.builder.BuilderParameters; -import org.apache.commons.configuration3.builder.ConfigurationBuilder; -import org.apache.commons.configuration3.builder.ReloadingFileBasedConfigurationBuilder; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.reloading.CombinedReloadingController; -import org.apache.commons.configuration3.reloading.ReloadingController; -import org.apache.commons.configuration3.reloading.ReloadingControllerSupport; +import org.apache.commons.configuration2.CombinedConfiguration; +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; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/builder/combined/ReloadingMultiFileConfigurationBuilder.java b/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.java similarity index 91% rename from src/main/java/org/apache/commons/configuration3/builder/combined/ReloadingMultiFileConfigurationBuilder.java rename to src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.java index 193747b226..89d692755c 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/combined/ReloadingMultiFileConfigurationBuilder.java +++ b/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.combined; +package org.apache.commons.configuration2.builder.combined; import java.util.Collection; import java.util.Collections; @@ -22,13 +22,13 @@ import java.util.Set; import java.util.stream.Collectors; -import org.apache.commons.configuration3.FileBasedConfiguration; -import org.apache.commons.configuration3.builder.FileBasedConfigurationBuilder; -import org.apache.commons.configuration3.builder.ReloadingFileBasedConfigurationBuilder; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.reloading.CombinedReloadingController; -import org.apache.commons.configuration3.reloading.ReloadingController; -import org.apache.commons.configuration3.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; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/builder/combined/package-info.java b/src/main/java/org/apache/commons/configuration2/builder/combined/package-info.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/builder/combined/package-info.java rename to src/main/java/org/apache/commons/configuration2/builder/combined/package-info.java index a6ae44e600..7ddf3120ba 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/combined/package-info.java +++ b/src/main/java/org/apache/commons/configuration2/builder/combined/package-info.java @@ -31,4 +31,4 @@ * production, etc. *

        */ -package org.apache.commons.configuration3.builder.combined; +package org.apache.commons.configuration2.builder.combined; diff --git a/src/main/java/org/apache/commons/configuration3/builder/fluent/CombinedBuilderParameters.java b/src/main/java/org/apache/commons/configuration2/builder/fluent/CombinedBuilderParameters.java similarity index 84% rename from src/main/java/org/apache/commons/configuration3/builder/fluent/CombinedBuilderParameters.java rename to src/main/java/org/apache/commons/configuration2/builder/fluent/CombinedBuilderParameters.java index e8788e81b2..454fc62832 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/fluent/CombinedBuilderParameters.java +++ b/src/main/java/org/apache/commons/configuration2/builder/fluent/CombinedBuilderParameters.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.fluent; +package org.apache.commons.configuration2.builder.fluent; -import org.apache.commons.configuration3.builder.BasicBuilderProperties; -import org.apache.commons.configuration3.builder.BuilderParameters; -import org.apache.commons.configuration3.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; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/builder/fluent/Configurations.java b/src/main/java/org/apache/commons/configuration2/builder/fluent/Configurations.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/builder/fluent/Configurations.java rename to src/main/java/org/apache/commons/configuration2/builder/fluent/Configurations.java index 20cb8a0bbd..61e6fff92d 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/fluent/Configurations.java +++ b/src/main/java/org/apache/commons/configuration2/builder/fluent/Configurations.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.fluent; +package org.apache.commons.configuration2.builder.fluent; import java.io.File; import java.net.URL; -import org.apache.commons.configuration3.CombinedConfiguration; -import org.apache.commons.configuration3.FileBasedConfiguration; -import org.apache.commons.configuration3.INIConfiguration; -import org.apache.commons.configuration3.PropertiesConfiguration; -import org.apache.commons.configuration3.XMLConfiguration; -import org.apache.commons.configuration3.builder.FileBasedConfigurationBuilder; -import org.apache.commons.configuration3.builder.combined.CombinedConfigurationBuilder; -import org.apache.commons.configuration3.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; //@formatter:off /** @@ -67,7 +67,7 @@ *

        * * @since 2.0 - * @see org.apache.commons.configuration3.builder.DefaultParametersManager + * @see org.apache.commons.configuration2.builder.DefaultParametersManager */ //@formatter:off public class Configurations { diff --git a/src/main/java/org/apache/commons/configuration3/builder/fluent/DatabaseBuilderParameters.java b/src/main/java/org/apache/commons/configuration2/builder/fluent/DatabaseBuilderParameters.java similarity index 84% rename from src/main/java/org/apache/commons/configuration3/builder/fluent/DatabaseBuilderParameters.java rename to src/main/java/org/apache/commons/configuration2/builder/fluent/DatabaseBuilderParameters.java index 0b804c4afe..a54543199c 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/fluent/DatabaseBuilderParameters.java +++ b/src/main/java/org/apache/commons/configuration2/builder/fluent/DatabaseBuilderParameters.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.fluent; +package org.apache.commons.configuration2.builder.fluent; -import org.apache.commons.configuration3.builder.BasicBuilderProperties; -import org.apache.commons.configuration3.builder.BuilderParameters; -import org.apache.commons.configuration3.builder.DatabaseBuilderProperties; +import org.apache.commons.configuration2.builder.BasicBuilderProperties; +import org.apache.commons.configuration2.builder.BuilderParameters; +import org.apache.commons.configuration2.builder.DatabaseBuilderProperties; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/builder/fluent/FileBasedBuilderParameters.java b/src/main/java/org/apache/commons/configuration2/builder/fluent/FileBasedBuilderParameters.java similarity index 84% rename from src/main/java/org/apache/commons/configuration3/builder/fluent/FileBasedBuilderParameters.java rename to src/main/java/org/apache/commons/configuration2/builder/fluent/FileBasedBuilderParameters.java index 3fdc8af4e2..99f09b6310 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/fluent/FileBasedBuilderParameters.java +++ b/src/main/java/org/apache/commons/configuration2/builder/fluent/FileBasedBuilderParameters.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.fluent; +package org.apache.commons.configuration2.builder.fluent; -import org.apache.commons.configuration3.builder.BasicBuilderProperties; -import org.apache.commons.configuration3.builder.BuilderParameters; -import org.apache.commons.configuration3.builder.FileBasedBuilderProperties; +import org.apache.commons.configuration2.builder.BasicBuilderProperties; +import org.apache.commons.configuration2.builder.BuilderParameters; +import org.apache.commons.configuration2.builder.FileBasedBuilderProperties; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/builder/fluent/HierarchicalBuilderParameters.java b/src/main/java/org/apache/commons/configuration2/builder/fluent/HierarchicalBuilderParameters.java similarity index 82% rename from src/main/java/org/apache/commons/configuration3/builder/fluent/HierarchicalBuilderParameters.java rename to src/main/java/org/apache/commons/configuration2/builder/fluent/HierarchicalBuilderParameters.java index 35810d14fb..f5638ea164 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/fluent/HierarchicalBuilderParameters.java +++ b/src/main/java/org/apache/commons/configuration2/builder/fluent/HierarchicalBuilderParameters.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.fluent; +package org.apache.commons.configuration2.builder.fluent; -import org.apache.commons.configuration3.builder.BasicBuilderProperties; -import org.apache.commons.configuration3.builder.BuilderParameters; -import org.apache.commons.configuration3.builder.FileBasedBuilderProperties; -import org.apache.commons.configuration3.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; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/builder/fluent/INIBuilderParameters.java b/src/main/java/org/apache/commons/configuration2/builder/fluent/INIBuilderParameters.java similarity index 79% rename from src/main/java/org/apache/commons/configuration3/builder/fluent/INIBuilderParameters.java rename to src/main/java/org/apache/commons/configuration2/builder/fluent/INIBuilderParameters.java index b5c6aa0661..691c1de7c6 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/fluent/INIBuilderParameters.java +++ b/src/main/java/org/apache/commons/configuration2/builder/fluent/INIBuilderParameters.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.fluent; +package org.apache.commons.configuration2.builder.fluent; -import org.apache.commons.configuration3.builder.BasicBuilderProperties; -import org.apache.commons.configuration3.builder.BuilderParameters; -import org.apache.commons.configuration3.builder.FileBasedBuilderProperties; -import org.apache.commons.configuration3.builder.HierarchicalBuilderProperties; -import org.apache.commons.configuration3.builder.INIBuilderProperties; +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.INIBuilderProperties; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/builder/fluent/JndiBuilderParameters.java b/src/main/java/org/apache/commons/configuration2/builder/fluent/JndiBuilderParameters.java similarity index 84% rename from src/main/java/org/apache/commons/configuration3/builder/fluent/JndiBuilderParameters.java rename to src/main/java/org/apache/commons/configuration2/builder/fluent/JndiBuilderParameters.java index 2fa70f6a03..957f842020 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/fluent/JndiBuilderParameters.java +++ b/src/main/java/org/apache/commons/configuration2/builder/fluent/JndiBuilderParameters.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.fluent; +package org.apache.commons.configuration2.builder.fluent; -import org.apache.commons.configuration3.builder.BasicBuilderProperties; -import org.apache.commons.configuration3.builder.BuilderParameters; -import org.apache.commons.configuration3.builder.JndiBuilderProperties; +import org.apache.commons.configuration2.builder.BasicBuilderProperties; +import org.apache.commons.configuration2.builder.BuilderParameters; +import org.apache.commons.configuration2.builder.JndiBuilderProperties; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/builder/fluent/MultiFileBuilderParameters.java b/src/main/java/org/apache/commons/configuration2/builder/fluent/MultiFileBuilderParameters.java similarity index 85% rename from src/main/java/org/apache/commons/configuration3/builder/fluent/MultiFileBuilderParameters.java rename to src/main/java/org/apache/commons/configuration2/builder/fluent/MultiFileBuilderParameters.java index ecf8b16ed0..cb6827fff1 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/fluent/MultiFileBuilderParameters.java +++ b/src/main/java/org/apache/commons/configuration2/builder/fluent/MultiFileBuilderParameters.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.fluent; +package org.apache.commons.configuration2.builder.fluent; -import org.apache.commons.configuration3.builder.BasicBuilderProperties; -import org.apache.commons.configuration3.builder.BuilderParameters; -import org.apache.commons.configuration3.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; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/builder/fluent/Parameters.java b/src/main/java/org/apache/commons/configuration2/builder/fluent/Parameters.java similarity index 93% rename from src/main/java/org/apache/commons/configuration3/builder/fluent/Parameters.java rename to src/main/java/org/apache/commons/configuration2/builder/fluent/Parameters.java index 41d2be3fc3..d8eb9ad6c1 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/fluent/Parameters.java +++ b/src/main/java/org/apache/commons/configuration2/builder/fluent/Parameters.java @@ -14,25 +14,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.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.configuration3.builder.BasicBuilderParameters; -import org.apache.commons.configuration3.builder.BuilderParameters; -import org.apache.commons.configuration3.builder.DatabaseBuilderParametersImpl; -import org.apache.commons.configuration3.builder.DefaultParametersHandler; -import org.apache.commons.configuration3.builder.DefaultParametersManager; -import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; -import org.apache.commons.configuration3.builder.HierarchicalBuilderParametersImpl; -import org.apache.commons.configuration3.builder.INIBuilderParametersImpl; -import org.apache.commons.configuration3.builder.JndiBuilderParametersImpl; -import org.apache.commons.configuration3.builder.PropertiesBuilderParametersImpl; -import org.apache.commons.configuration3.builder.XMLBuilderParametersImpl; -import org.apache.commons.configuration3.builder.combined.CombinedBuilderParametersImpl; -import org.apache.commons.configuration3.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.INIBuilderParametersImpl; +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; //@formatter:off /** diff --git a/src/main/java/org/apache/commons/configuration3/builder/fluent/PropertiesBuilderParameters.java b/src/main/java/org/apache/commons/configuration2/builder/fluent/PropertiesBuilderParameters.java similarity index 82% rename from src/main/java/org/apache/commons/configuration3/builder/fluent/PropertiesBuilderParameters.java rename to src/main/java/org/apache/commons/configuration2/builder/fluent/PropertiesBuilderParameters.java index 79c19b1662..2a947830f3 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/fluent/PropertiesBuilderParameters.java +++ b/src/main/java/org/apache/commons/configuration2/builder/fluent/PropertiesBuilderParameters.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.fluent; +package org.apache.commons.configuration2.builder.fluent; -import org.apache.commons.configuration3.builder.BasicBuilderProperties; -import org.apache.commons.configuration3.builder.BuilderParameters; -import org.apache.commons.configuration3.builder.FileBasedBuilderProperties; -import org.apache.commons.configuration3.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; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/builder/fluent/XMLBuilderParameters.java b/src/main/java/org/apache/commons/configuration2/builder/fluent/XMLBuilderParameters.java similarity index 79% rename from src/main/java/org/apache/commons/configuration3/builder/fluent/XMLBuilderParameters.java rename to src/main/java/org/apache/commons/configuration2/builder/fluent/XMLBuilderParameters.java index 3b7944c7cf..495c62f68f 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/fluent/XMLBuilderParameters.java +++ b/src/main/java/org/apache/commons/configuration2/builder/fluent/XMLBuilderParameters.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.fluent; +package org.apache.commons.configuration2.builder.fluent; -import org.apache.commons.configuration3.builder.BasicBuilderProperties; -import org.apache.commons.configuration3.builder.BuilderParameters; -import org.apache.commons.configuration3.builder.FileBasedBuilderProperties; -import org.apache.commons.configuration3.builder.HierarchicalBuilderProperties; -import org.apache.commons.configuration3.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; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/builder/fluent/package-info.java b/src/main/java/org/apache/commons/configuration2/builder/fluent/package-info.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/builder/fluent/package-info.java rename to src/main/java/org/apache/commons/configuration2/builder/fluent/package-info.java index 38b934591e..b417dae3b4 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/fluent/package-info.java +++ b/src/main/java/org/apache/commons/configuration2/builder/fluent/package-info.java @@ -32,4 +32,4 @@ * happen even in minor releases. *

        */ -package org.apache.commons.configuration3.builder.fluent; +package org.apache.commons.configuration2.builder.fluent; diff --git a/src/main/java/org/apache/commons/configuration3/builder/package-info.java b/src/main/java/org/apache/commons/configuration2/builder/package-info.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/builder/package-info.java rename to src/main/java/org/apache/commons/configuration2/builder/package-info.java index 5fe4cadfc9..4bb4fd26c7 100644 --- a/src/main/java/org/apache/commons/configuration3/builder/package-info.java +++ b/src/main/java/org/apache/commons/configuration2/builder/package-info.java @@ -35,4 +35,4 @@ * happen even in minor releases. *

        */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; diff --git a/src/main/java/org/apache/commons/configuration3/convert/AbstractListDelimiterHandler.java b/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/convert/AbstractListDelimiterHandler.java rename to src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java index 0140947b89..e4ab1554a6 100644 --- a/src/main/java/org/apache/commons/configuration3/convert/AbstractListDelimiterHandler.java +++ b/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.convert; +package org.apache.commons.configuration2.convert; import java.lang.reflect.Array; import java.nio.file.Path; diff --git a/src/main/java/org/apache/commons/configuration3/convert/ConversionHandler.java b/src/main/java/org/apache/commons/configuration2/convert/ConversionHandler.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/convert/ConversionHandler.java rename to src/main/java/org/apache/commons/configuration2/convert/ConversionHandler.java index d57b22c488..dd83f5cada 100644 --- a/src/main/java/org/apache/commons/configuration3/convert/ConversionHandler.java +++ b/src/main/java/org/apache/commons/configuration2/convert/ConversionHandler.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.convert; +package org.apache.commons.configuration2.convert; import java.util.Collection; -import org.apache.commons.configuration3.ex.ConversionException; -import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration2.ex.ConversionException; +import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/convert/DefaultConversionHandler.java b/src/main/java/org/apache/commons/configuration2/convert/DefaultConversionHandler.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/convert/DefaultConversionHandler.java rename to src/main/java/org/apache/commons/configuration2/convert/DefaultConversionHandler.java index edefc4919a..7f53a429ab 100644 --- a/src/main/java/org/apache/commons/configuration3/convert/DefaultConversionHandler.java +++ b/src/main/java/org/apache/commons/configuration2/convert/DefaultConversionHandler.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.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.configuration3.ex.ConversionException; -import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration2.ex.ConversionException; +import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; import org.apache.commons.lang3.ClassUtils; /** diff --git a/src/main/java/org/apache/commons/configuration3/convert/DefaultListDelimiterHandler.java b/src/main/java/org/apache/commons/configuration2/convert/DefaultListDelimiterHandler.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/convert/DefaultListDelimiterHandler.java rename to src/main/java/org/apache/commons/configuration2/convert/DefaultListDelimiterHandler.java index 2ae8d4251e..f7e7531253 100644 --- a/src/main/java/org/apache/commons/configuration3/convert/DefaultListDelimiterHandler.java +++ b/src/main/java/org/apache/commons/configuration2/convert/DefaultListDelimiterHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.convert; +package org.apache.commons.configuration2.convert; import java.util.Collection; import java.util.LinkedList; diff --git a/src/main/java/org/apache/commons/configuration3/convert/DisabledListDelimiterHandler.java b/src/main/java/org/apache/commons/configuration2/convert/DisabledListDelimiterHandler.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/convert/DisabledListDelimiterHandler.java rename to src/main/java/org/apache/commons/configuration2/convert/DisabledListDelimiterHandler.java index c2c34b8098..3a9afbe72f 100644 --- a/src/main/java/org/apache/commons/configuration3/convert/DisabledListDelimiterHandler.java +++ b/src/main/java/org/apache/commons/configuration2/convert/DisabledListDelimiterHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.convert; +package org.apache.commons.configuration2.convert; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/configuration3/convert/LegacyListDelimiterHandler.java b/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/convert/LegacyListDelimiterHandler.java rename to src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java index d12008edb6..7e0fbce0b4 100644 --- a/src/main/java/org/apache/commons/configuration3/convert/LegacyListDelimiterHandler.java +++ b/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.convert; +package org.apache.commons.configuration2.convert; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/configuration3/convert/ListDelimiterHandler.java b/src/main/java/org/apache/commons/configuration2/convert/ListDelimiterHandler.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/convert/ListDelimiterHandler.java rename to src/main/java/org/apache/commons/configuration2/convert/ListDelimiterHandler.java index bb1a81dad3..61b2407b9a 100644 --- a/src/main/java/org/apache/commons/configuration3/convert/ListDelimiterHandler.java +++ b/src/main/java/org/apache/commons/configuration2/convert/ListDelimiterHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.convert; +package org.apache.commons.configuration2.convert; import java.util.Collection; import java.util.Collections; @@ -26,9 +26,9 @@ * Definition of an interface that controls the handling of list delimiters in configuration properties. *

        *

        - * {@link org.apache.commons.configuration3.AbstractConfiguration AbstractConfiguration} supports list delimiters in + * {@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.configuration3.PropertiesConfiguration PropertiesConfiguration}: + * is useful for instance for {@link org.apache.commons.configuration2.PropertiesConfiguration PropertiesConfiguration}: * properties files that have to be compatible with the {@link java.util.Properties} class cannot have multiple * occurrences of a single property key, therefore a different storage scheme for multi-valued properties is needed. A * possible storage scheme could look as follows: diff --git a/src/main/java/org/apache/commons/configuration3/convert/PropertyConverter.java b/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/convert/PropertyConverter.java rename to src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java index c7f8861c1a..307d9de3e6 100644 --- a/src/main/java/org/apache/commons/configuration3/convert/PropertyConverter.java +++ b/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3.convert; +package org.apache.commons.configuration2.convert; import java.awt.Color; import java.io.File; @@ -41,7 +41,7 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import org.apache.commons.configuration3.ex.ConversionException; +import org.apache.commons.configuration2.ex.ConversionException; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/org/apache/commons/configuration3/convert/ValueTransformer.java b/src/main/java/org/apache/commons/configuration2/convert/ValueTransformer.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/convert/ValueTransformer.java rename to src/main/java/org/apache/commons/configuration2/convert/ValueTransformer.java index 23a52ae3be..ef9e351e63 100644 --- a/src/main/java/org/apache/commons/configuration3/convert/ValueTransformer.java +++ b/src/main/java/org/apache/commons/configuration2/convert/ValueTransformer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.convert; +package org.apache.commons.configuration2.convert; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/convert/package-info.java b/src/main/java/org/apache/commons/configuration2/convert/package-info.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/convert/package-info.java rename to src/main/java/org/apache/commons/configuration2/convert/package-info.java index 444f02eef4..39597d968e 100644 --- a/src/main/java/org/apache/commons/configuration3/convert/package-info.java +++ b/src/main/java/org/apache/commons/configuration2/convert/package-info.java @@ -31,4 +31,4 @@ * handling. Client code can choose the one which is most suitable for the current use case. *

        */ -package org.apache.commons.configuration3.convert; +package org.apache.commons.configuration2.convert; diff --git a/src/main/java/org/apache/commons/configuration3/event/BaseEventSource.java b/src/main/java/org/apache/commons/configuration2/event/BaseEventSource.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/event/BaseEventSource.java rename to src/main/java/org/apache/commons/configuration2/event/BaseEventSource.java index e921cc15b2..98b167af6b 100644 --- a/src/main/java/org/apache/commons/configuration3/event/BaseEventSource.java +++ b/src/main/java/org/apache/commons/configuration2/event/BaseEventSource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.event; +package org.apache.commons.configuration2.event; import java.util.Collection; import java.util.Collections; @@ -42,7 +42,7 @@ * listeners will receive property set events, property clear events, and property add events). If this mode is turned * off (which is the default), detail events are suppressed, so only property set events will be received. Note that the * number of received detail events may differ for different configuration implementations. - * {@link org.apache.commons.configuration3.BaseHierarchicalConfiguration BaseHierarchicalConfiguration} for instance + * {@link org.apache.commons.configuration2.BaseHierarchicalConfiguration BaseHierarchicalConfiguration} for instance * has a custom implementation of {@code setProperty()}, which does not generate any detail events. *

        *

        diff --git a/src/main/java/org/apache/commons/configuration3/event/ConfigurationErrorEvent.java b/src/main/java/org/apache/commons/configuration2/event/ConfigurationErrorEvent.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/event/ConfigurationErrorEvent.java rename to src/main/java/org/apache/commons/configuration2/event/ConfigurationErrorEvent.java index cbbb7c2307..b7ee96e11a 100644 --- a/src/main/java/org/apache/commons/configuration3/event/ConfigurationErrorEvent.java +++ b/src/main/java/org/apache/commons/configuration2/event/ConfigurationErrorEvent.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.event; +package org.apache.commons.configuration2.event; /** *

        * An event class that is used for reporting errors that occurred while processing configuration properties. *

        *

        - * Some configuration implementations (e.g. {@link org.apache.commons.configuration3.DatabaseConfiguration} or - * {@link org.apache.commons.configuration3.JNDIConfiguration} use an underlying storage that can throw an exception on + * Some configuration implementations (e.g. {@link org.apache.commons.configuration2.DatabaseConfiguration} or + * {@link org.apache.commons.configuration2.JNDIConfiguration} use an underlying storage that can throw an exception on * each property access. In earlier versions of this library such exceptions were logged and then silently ignored. This * makes it impossible for a client to find out that something went wrong. *

        diff --git a/src/main/java/org/apache/commons/configuration3/event/ConfigurationEvent.java b/src/main/java/org/apache/commons/configuration2/event/ConfigurationEvent.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/event/ConfigurationEvent.java rename to src/main/java/org/apache/commons/configuration2/event/ConfigurationEvent.java index 3884029ae7..f02ec93da7 100644 --- a/src/main/java/org/apache/commons/configuration3/event/ConfigurationEvent.java +++ b/src/main/java/org/apache/commons/configuration2/event/ConfigurationEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.event; +package org.apache.commons.configuration2.event; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/event/Event.java b/src/main/java/org/apache/commons/configuration2/event/Event.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/event/Event.java rename to src/main/java/org/apache/commons/configuration2/event/Event.java index 1f868bdb46..7dd0007373 100644 --- a/src/main/java/org/apache/commons/configuration3/event/Event.java +++ b/src/main/java/org/apache/commons/configuration2/event/Event.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.event; +package org.apache.commons.configuration2.event; import java.util.EventObject; diff --git a/src/main/java/org/apache/commons/configuration3/event/EventListener.java b/src/main/java/org/apache/commons/configuration2/event/EventListener.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/event/EventListener.java rename to src/main/java/org/apache/commons/configuration2/event/EventListener.java index bce9f48f4c..611c14b1e5 100644 --- a/src/main/java/org/apache/commons/configuration3/event/EventListener.java +++ b/src/main/java/org/apache/commons/configuration2/event/EventListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.event; +package org.apache.commons.configuration2.event; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/event/EventListenerList.java b/src/main/java/org/apache/commons/configuration2/event/EventListenerList.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/event/EventListenerList.java rename to src/main/java/org/apache/commons/configuration2/event/EventListenerList.java index c7e900e7a7..9a805e4291 100644 --- a/src/main/java/org/apache/commons/configuration3/event/EventListenerList.java +++ b/src/main/java/org/apache/commons/configuration2/event/EventListenerList.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.event; +package org.apache.commons.configuration2.event; import java.util.Collections; import java.util.HashMap; diff --git a/src/main/java/org/apache/commons/configuration3/event/EventListenerRegistrationData.java b/src/main/java/org/apache/commons/configuration2/event/EventListenerRegistrationData.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/event/EventListenerRegistrationData.java rename to src/main/java/org/apache/commons/configuration2/event/EventListenerRegistrationData.java index 115756f9a3..ae7e49a079 100644 --- a/src/main/java/org/apache/commons/configuration3/event/EventListenerRegistrationData.java +++ b/src/main/java/org/apache/commons/configuration2/event/EventListenerRegistrationData.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.event; +package org.apache.commons.configuration2.event; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/event/EventSource.java b/src/main/java/org/apache/commons/configuration2/event/EventSource.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/event/EventSource.java rename to src/main/java/org/apache/commons/configuration2/event/EventSource.java index 951edf1938..0b81f50009 100644 --- a/src/main/java/org/apache/commons/configuration3/event/EventSource.java +++ b/src/main/java/org/apache/commons/configuration2/event/EventSource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.event; +package org.apache.commons.configuration2.event; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/event/EventType.java b/src/main/java/org/apache/commons/configuration2/event/EventType.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/event/EventType.java rename to src/main/java/org/apache/commons/configuration2/event/EventType.java index 834ec14902..eae3f4b50b 100644 --- a/src/main/java/org/apache/commons/configuration3/event/EventType.java +++ b/src/main/java/org/apache/commons/configuration2/event/EventType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.event; +package org.apache.commons.configuration2.event; import java.io.Serializable; import java.util.HashSet; diff --git a/src/main/java/org/apache/commons/configuration3/event/package-info.java b/src/main/java/org/apache/commons/configuration2/event/package-info.java similarity index 95% rename from src/main/java/org/apache/commons/configuration3/event/package-info.java rename to src/main/java/org/apache/commons/configuration2/event/package-info.java index 1099f29f61..df403b5994 100644 --- a/src/main/java/org/apache/commons/configuration3/event/package-info.java +++ b/src/main/java/org/apache/commons/configuration2/event/package-info.java @@ -20,4 +20,4 @@ * This package contains interfaces and classes for receiving notifications about changes at configurations. *

        */ -package org.apache.commons.configuration3.event; +package org.apache.commons.configuration2.event; diff --git a/src/main/java/org/apache/commons/configuration3/ex/ConfigurationException.java b/src/main/java/org/apache/commons/configuration2/ex/ConfigurationException.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/ex/ConfigurationException.java rename to src/main/java/org/apache/commons/configuration2/ex/ConfigurationException.java index 3b41431fe5..e2833ae3b2 100644 --- a/src/main/java/org/apache/commons/configuration3/ex/ConfigurationException.java +++ b/src/main/java/org/apache/commons/configuration2/ex/ConfigurationException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3.ex; +package org.apache.commons.configuration2.ex; /** * Any exception that occurs while initializing a Configuration object. diff --git a/src/main/java/org/apache/commons/configuration3/ex/ConfigurationRuntimeException.java b/src/main/java/org/apache/commons/configuration2/ex/ConfigurationRuntimeException.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/ex/ConfigurationRuntimeException.java rename to src/main/java/org/apache/commons/configuration2/ex/ConfigurationRuntimeException.java index 9cb1c280d4..fc6c335514 100644 --- a/src/main/java/org/apache/commons/configuration3/ex/ConfigurationRuntimeException.java +++ b/src/main/java/org/apache/commons/configuration2/ex/ConfigurationRuntimeException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3.ex; +package org.apache.commons.configuration2.ex; /** * A configuration related runtime exception. diff --git a/src/main/java/org/apache/commons/configuration3/ex/ConversionException.java b/src/main/java/org/apache/commons/configuration2/ex/ConversionException.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/ex/ConversionException.java rename to src/main/java/org/apache/commons/configuration2/ex/ConversionException.java index 6b78f2bd66..53912b0e19 100644 --- a/src/main/java/org/apache/commons/configuration3/ex/ConversionException.java +++ b/src/main/java/org/apache/commons/configuration2/ex/ConversionException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3.ex; +package org.apache.commons.configuration2.ex; /** * Thrown when a property is incompatible with the type requested. diff --git a/src/main/java/org/apache/commons/configuration3/ex/package-info.java b/src/main/java/org/apache/commons/configuration2/ex/package-info.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/ex/package-info.java rename to src/main/java/org/apache/commons/configuration2/ex/package-info.java index fcdef4dd8c..26631b86e6 100644 --- a/src/main/java/org/apache/commons/configuration3/ex/package-info.java +++ b/src/main/java/org/apache/commons/configuration2/ex/package-info.java @@ -24,4 +24,4 @@ * multiple other packages, they are located in their own package to avoid cyclic dependencies. *

        */ -package org.apache.commons.configuration3.ex; +package org.apache.commons.configuration2.ex; diff --git a/src/main/java/org/apache/commons/configuration3/interpol/ConfigurationInterpolator.java b/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/interpol/ConfigurationInterpolator.java rename to src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java index f9d8fd4264..14f30d8832 100644 --- a/src/main/java/org/apache/commons/configuration3/interpol/ConfigurationInterpolator.java +++ b/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.interpol; +package org.apache.commons.configuration2.interpol; import java.lang.reflect.Array; import java.util.ArrayList; @@ -75,7 +75,7 @@ * {@link #setStringConverter(Function) string converter} to perform this conversion. The default implementation of this * function simply uses the value's {@code toString} method in the majority of cases. However, for maximum * consistency with - * {@link org.apache.commons.configuration3.convert.DefaultConversionHandler DefaultConversionHandler}, when a variable + * {@link org.apache.commons.configuration2.convert.DefaultConversionHandler DefaultConversionHandler}, when a variable * value is a container type (such as a collection or array), then only the first element of the container is converted * to a string instead of the container itself. For example, if the variable {@code x} resolves to the integer array * {@code [1, 2, 3]}, then the string "my value = ${x}" will by default be interpolated to @@ -98,7 +98,7 @@ public class ConfigurationInterpolator { * @since 2.8.0 */ public static final String DEFAULT_PREFIX_LOOKUPS_PROPERTY = - "org.apache.commons.configuration3.interpol.ConfigurationInterpolator.defaultPrefixLookups"; + "org.apache.commons.configuration2.interpol.ConfigurationInterpolator.defaultPrefixLookups"; /** Constant for the prefix separator. */ private static final char PREFIX_SEPARATOR = ':'; diff --git a/src/main/java/org/apache/commons/configuration3/interpol/ConstantLookup.java b/src/main/java/org/apache/commons/configuration2/interpol/ConstantLookup.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/interpol/ConstantLookup.java rename to src/main/java/org/apache/commons/configuration2/interpol/ConstantLookup.java index 6f7ceec72d..eb71bbe39c 100644 --- a/src/main/java/org/apache/commons/configuration3/interpol/ConstantLookup.java +++ b/src/main/java/org/apache/commons/configuration2/interpol/ConstantLookup.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.interpol; +package org.apache.commons.configuration2.interpol; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/org/apache/commons/configuration3/interpol/DefaultLookups.java b/src/main/java/org/apache/commons/configuration2/interpol/DefaultLookups.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/interpol/DefaultLookups.java rename to src/main/java/org/apache/commons/configuration2/interpol/DefaultLookups.java index 04505bfed4..13fdcdec96 100644 --- a/src/main/java/org/apache/commons/configuration3/interpol/DefaultLookups.java +++ b/src/main/java/org/apache/commons/configuration2/interpol/DefaultLookups.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.interpol; +package org.apache.commons.configuration2.interpol; import org.apache.commons.text.lookup.StringLookupFactory; diff --git a/src/main/java/org/apache/commons/configuration3/interpol/DummyLookup.java b/src/main/java/org/apache/commons/configuration2/interpol/DummyLookup.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/interpol/DummyLookup.java rename to src/main/java/org/apache/commons/configuration2/interpol/DummyLookup.java index 701016c510..479995b90d 100644 --- a/src/main/java/org/apache/commons/configuration3/interpol/DummyLookup.java +++ b/src/main/java/org/apache/commons/configuration2/interpol/DummyLookup.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.interpol; +package org.apache.commons.configuration2.interpol; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/interpol/EnvironmentLookup.java b/src/main/java/org/apache/commons/configuration2/interpol/EnvironmentLookup.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/interpol/EnvironmentLookup.java rename to src/main/java/org/apache/commons/configuration2/interpol/EnvironmentLookup.java index b5ec642efe..c664ea735e 100644 --- a/src/main/java/org/apache/commons/configuration3/interpol/EnvironmentLookup.java +++ b/src/main/java/org/apache/commons/configuration2/interpol/EnvironmentLookup.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.interpol; +package org.apache.commons.configuration2.interpol; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/interpol/ExprLookup.java b/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/interpol/ExprLookup.java rename to src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java index 9b4ce72490..6463fae2d3 100644 --- a/src/main/java/org/apache/commons/configuration3/interpol/ExprLookup.java +++ b/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.interpol; +package org.apache.commons.configuration2.interpol; import java.util.ArrayList; import java.util.Objects; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration3.io.ConfigurationLogger; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.io.ConfigurationLogger; import org.apache.commons.jexl2.Expression; import org.apache.commons.jexl2.JexlContext; import org.apache.commons.jexl2.JexlEngine; diff --git a/src/main/java/org/apache/commons/configuration3/interpol/InterpolatorSpecification.java b/src/main/java/org/apache/commons/configuration2/interpol/InterpolatorSpecification.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/interpol/InterpolatorSpecification.java rename to src/main/java/org/apache/commons/configuration2/interpol/InterpolatorSpecification.java index bc81b4f914..c06248ef29 100644 --- a/src/main/java/org/apache/commons/configuration3/interpol/InterpolatorSpecification.java +++ b/src/main/java/org/apache/commons/configuration2/interpol/InterpolatorSpecification.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.interpol; +package org.apache.commons.configuration2.interpol; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/configuration3/interpol/Lookup.java b/src/main/java/org/apache/commons/configuration2/interpol/Lookup.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/interpol/Lookup.java rename to src/main/java/org/apache/commons/configuration2/interpol/Lookup.java index de38e2e6cc..edb07059cb 100644 --- a/src/main/java/org/apache/commons/configuration3/interpol/Lookup.java +++ b/src/main/java/org/apache/commons/configuration2/interpol/Lookup.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.interpol; +package org.apache.commons.configuration2.interpol; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/interpol/StringLookupAdapter.java b/src/main/java/org/apache/commons/configuration2/interpol/StringLookupAdapter.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/interpol/StringLookupAdapter.java rename to src/main/java/org/apache/commons/configuration2/interpol/StringLookupAdapter.java index ffaec03fde..e659574c82 100644 --- a/src/main/java/org/apache/commons/configuration3/interpol/StringLookupAdapter.java +++ b/src/main/java/org/apache/commons/configuration2/interpol/StringLookupAdapter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.interpol; +package org.apache.commons.configuration2.interpol; import java.util.Objects; diff --git a/src/main/java/org/apache/commons/configuration3/interpol/SystemPropertiesLookup.java b/src/main/java/org/apache/commons/configuration2/interpol/SystemPropertiesLookup.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/interpol/SystemPropertiesLookup.java rename to src/main/java/org/apache/commons/configuration2/interpol/SystemPropertiesLookup.java index f47329a7d0..286bcbba98 100644 --- a/src/main/java/org/apache/commons/configuration3/interpol/SystemPropertiesLookup.java +++ b/src/main/java/org/apache/commons/configuration2/interpol/SystemPropertiesLookup.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.interpol; +package org.apache.commons.configuration2.interpol; import org.apache.commons.text.lookup.StringLookupFactory; diff --git a/src/main/java/org/apache/commons/configuration3/interpol/package-info.java b/src/main/java/org/apache/commons/configuration2/interpol/package-info.java similarity index 94% rename from src/main/java/org/apache/commons/configuration3/interpol/package-info.java rename to src/main/java/org/apache/commons/configuration2/interpol/package-info.java index e7a8bfabec..ab99a5e240 100644 --- a/src/main/java/org/apache/commons/configuration3/interpol/package-info.java +++ b/src/main/java/org/apache/commons/configuration2/interpol/package-info.java @@ -20,4 +20,4 @@ * A package with helper classes used for interpolation (variable substitution). *

        */ -package org.apache.commons.configuration3.interpol; +package org.apache.commons.configuration2.interpol; diff --git a/src/main/java/org/apache/commons/configuration3/io/AbsoluteNameLocationStrategy.java b/src/main/java/org/apache/commons/configuration2/io/AbsoluteNameLocationStrategy.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/io/AbsoluteNameLocationStrategy.java rename to src/main/java/org/apache/commons/configuration2/io/AbsoluteNameLocationStrategy.java index 6e935353ed..ce01c127c0 100644 --- a/src/main/java/org/apache/commons/configuration3/io/AbsoluteNameLocationStrategy.java +++ b/src/main/java/org/apache/commons/configuration2/io/AbsoluteNameLocationStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; import java.io.File; import java.net.URL; diff --git a/src/main/java/org/apache/commons/configuration3/io/BasePathLocationStrategy.java b/src/main/java/org/apache/commons/configuration2/io/BasePathLocationStrategy.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/io/BasePathLocationStrategy.java rename to src/main/java/org/apache/commons/configuration2/io/BasePathLocationStrategy.java index 19013ee674..de09d24015 100644 --- a/src/main/java/org/apache/commons/configuration3/io/BasePathLocationStrategy.java +++ b/src/main/java/org/apache/commons/configuration2/io/BasePathLocationStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; import java.io.File; import java.net.URL; diff --git a/src/main/java/org/apache/commons/configuration3/io/ClasspathLocationStrategy.java b/src/main/java/org/apache/commons/configuration2/io/ClasspathLocationStrategy.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/io/ClasspathLocationStrategy.java rename to src/main/java/org/apache/commons/configuration2/io/ClasspathLocationStrategy.java index f468b33842..a0e8071631 100644 --- a/src/main/java/org/apache/commons/configuration3/io/ClasspathLocationStrategy.java +++ b/src/main/java/org/apache/commons/configuration2/io/ClasspathLocationStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; import java.net.URL; diff --git a/src/main/java/org/apache/commons/configuration3/io/CombinedLocationStrategy.java b/src/main/java/org/apache/commons/configuration2/io/CombinedLocationStrategy.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/io/CombinedLocationStrategy.java rename to src/main/java/org/apache/commons/configuration2/io/CombinedLocationStrategy.java index 340dea93d3..3414396182 100644 --- a/src/main/java/org/apache/commons/configuration3/io/CombinedLocationStrategy.java +++ b/src/main/java/org/apache/commons/configuration2/io/CombinedLocationStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; import java.net.URL; import java.util.ArrayList; diff --git a/src/main/java/org/apache/commons/configuration3/io/ConfigurationLogger.java b/src/main/java/org/apache/commons/configuration2/io/ConfigurationLogger.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/io/ConfigurationLogger.java rename to src/main/java/org/apache/commons/configuration2/io/ConfigurationLogger.java index 9545f575f7..6aa1447e26 100644 --- a/src/main/java/org/apache/commons/configuration3/io/ConfigurationLogger.java +++ b/src/main/java/org/apache/commons/configuration2/io/ConfigurationLogger.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -29,7 +29,7 @@ * When reading configuration files in complex scenarios having log output is useful for diagnostic purposes. Therefore, * Commons Configuration produces some logging output. As concrete projects have different requirements on the * amount and detail of logging, there is a way of configuring logging: All classes derived from - * {@link org.apache.commons.configuration3.AbstractConfiguration} can be assigned a logger which is then used for all + * {@link org.apache.commons.configuration2.AbstractConfiguration} can be assigned a logger which is then used for all * log statements generated. *

        *

        diff --git a/src/main/java/org/apache/commons/configuration3/io/DefaultFileSystem.java b/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/io/DefaultFileSystem.java rename to src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java index 6d7ccf426e..75c46e4334 100644 --- a/src/main/java/org/apache/commons/configuration3/io/DefaultFileSystem.java +++ b/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; import java.io.File; import java.io.FileNotFoundException; @@ -27,7 +27,7 @@ import java.net.URL; import java.net.URLConnection; -import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationException; /** * FileSystem that uses java.io.File or HttpClient. diff --git a/src/main/java/org/apache/commons/configuration3/io/FileBased.java b/src/main/java/org/apache/commons/configuration2/io/FileBased.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/io/FileBased.java rename to src/main/java/org/apache/commons/configuration2/io/FileBased.java index e3f8de2d4d..65c3da6892 100644 --- a/src/main/java/org/apache/commons/configuration3/io/FileBased.java +++ b/src/main/java/org/apache/commons/configuration2/io/FileBased.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; import java.io.IOException; import java.io.Reader; import java.io.Writer; -import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationException; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/io/FileHandler.java b/src/main/java/org/apache/commons/configuration2/io/FileHandler.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/io/FileHandler.java rename to src/main/java/org/apache/commons/configuration2/io/FileHandler.java index 7bef3faf5c..fa2af7850d 100644 --- a/src/main/java/org/apache/commons/configuration3/io/FileHandler.java +++ b/src/main/java/org/apache/commons/configuration2/io/FileHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; import java.io.Closeable; import java.io.File; @@ -33,12 +33,12 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicReference; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.FileLocator.FileLocatorBuilder; -import org.apache.commons.configuration3.sync.LockMode; -import org.apache.commons.configuration3.sync.NoOpSynchronizer; -import org.apache.commons.configuration3.sync.Synchronizer; -import org.apache.commons.configuration3.sync.SynchronizerSupport; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.FileLocator.FileLocatorBuilder; +import org.apache.commons.configuration2.sync.LockMode; +import org.apache.commons.configuration2.sync.NoOpSynchronizer; +import org.apache.commons.configuration2.sync.Synchronizer; +import org.apache.commons.configuration2.sync.SynchronizerSupport; import org.apache.commons.logging.LogFactory; /** diff --git a/src/main/java/org/apache/commons/configuration3/io/FileHandlerListener.java b/src/main/java/org/apache/commons/configuration2/io/FileHandlerListener.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/io/FileHandlerListener.java rename to src/main/java/org/apache/commons/configuration2/io/FileHandlerListener.java index 908b607867..91ee3ab068 100644 --- a/src/main/java/org/apache/commons/configuration3/io/FileHandlerListener.java +++ b/src/main/java/org/apache/commons/configuration2/io/FileHandlerListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/io/FileHandlerListenerAdapter.java b/src/main/java/org/apache/commons/configuration2/io/FileHandlerListenerAdapter.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/io/FileHandlerListenerAdapter.java rename to src/main/java/org/apache/commons/configuration2/io/FileHandlerListenerAdapter.java index 20ddad538d..4d1320c7d5 100644 --- a/src/main/java/org/apache/commons/configuration3/io/FileHandlerListenerAdapter.java +++ b/src/main/java/org/apache/commons/configuration2/io/FileHandlerListenerAdapter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/io/FileLocationStrategy.java b/src/main/java/org/apache/commons/configuration2/io/FileLocationStrategy.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/io/FileLocationStrategy.java rename to src/main/java/org/apache/commons/configuration2/io/FileLocationStrategy.java index 1b1d60b238..cdc5076df8 100644 --- a/src/main/java/org/apache/commons/configuration3/io/FileLocationStrategy.java +++ b/src/main/java/org/apache/commons/configuration2/io/FileLocationStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; import java.net.URL; diff --git a/src/main/java/org/apache/commons/configuration3/io/FileLocator.java b/src/main/java/org/apache/commons/configuration2/io/FileLocator.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/io/FileLocator.java rename to src/main/java/org/apache/commons/configuration2/io/FileLocator.java index 240661cc9f..e5868aaf33 100644 --- a/src/main/java/org/apache/commons/configuration3/io/FileLocator.java +++ b/src/main/java/org/apache/commons/configuration2/io/FileLocator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; import java.net.URL; import java.util.Objects; diff --git a/src/main/java/org/apache/commons/configuration3/io/FileLocatorAware.java b/src/main/java/org/apache/commons/configuration2/io/FileLocatorAware.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/io/FileLocatorAware.java rename to src/main/java/org/apache/commons/configuration2/io/FileLocatorAware.java index 9753414337..af756f34ca 100644 --- a/src/main/java/org/apache/commons/configuration3/io/FileLocatorAware.java +++ b/src/main/java/org/apache/commons/configuration2/io/FileLocatorAware.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/io/FileLocatorUtils.java b/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/io/FileLocatorUtils.java rename to src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java index 78f277af57..f40a79ee33 100644 --- a/src/main/java/org/apache/commons/configuration3/io/FileLocatorUtils.java +++ b/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; import java.io.File; import java.net.MalformedURLException; @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.Map; -import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; diff --git a/src/main/java/org/apache/commons/configuration3/io/FileOptionsProvider.java b/src/main/java/org/apache/commons/configuration2/io/FileOptionsProvider.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/io/FileOptionsProvider.java rename to src/main/java/org/apache/commons/configuration2/io/FileOptionsProvider.java index e69ef28e96..83f6702a0e 100644 --- a/src/main/java/org/apache/commons/configuration3/io/FileOptionsProvider.java +++ b/src/main/java/org/apache/commons/configuration2/io/FileOptionsProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; import java.util.Map; diff --git a/src/main/java/org/apache/commons/configuration3/io/FileSystem.java b/src/main/java/org/apache/commons/configuration2/io/FileSystem.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/io/FileSystem.java rename to src/main/java/org/apache/commons/configuration2/io/FileSystem.java index 405efb0e2b..745ec26e3b 100644 --- a/src/main/java/org/apache/commons/configuration3/io/FileSystem.java +++ b/src/main/java/org/apache/commons/configuration2/io/FileSystem.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; import java.io.File; import java.io.InputStream; @@ -22,7 +22,7 @@ import java.net.MalformedURLException; import java.net.URL; -import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationException; /** * Abstract layer to allow various types of file systems. diff --git a/src/main/java/org/apache/commons/configuration3/io/FileSystemLocationStrategy.java b/src/main/java/org/apache/commons/configuration2/io/FileSystemLocationStrategy.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/io/FileSystemLocationStrategy.java rename to src/main/java/org/apache/commons/configuration2/io/FileSystemLocationStrategy.java index 34139a3bbb..144661df09 100644 --- a/src/main/java/org/apache/commons/configuration3/io/FileSystemLocationStrategy.java +++ b/src/main/java/org/apache/commons/configuration2/io/FileSystemLocationStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; import java.net.URL; diff --git a/src/main/java/org/apache/commons/configuration3/io/FileUtils.java b/src/main/java/org/apache/commons/configuration2/io/FileUtils.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/io/FileUtils.java rename to src/main/java/org/apache/commons/configuration2/io/FileUtils.java index 8b6faad4df..df2fc74844 100644 --- a/src/main/java/org/apache/commons/configuration3/io/FileUtils.java +++ b/src/main/java/org/apache/commons/configuration2/io/FileUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; import java.io.File; import java.net.URL; diff --git a/src/main/java/org/apache/commons/configuration3/io/HomeDirectoryLocationStrategy.java b/src/main/java/org/apache/commons/configuration2/io/HomeDirectoryLocationStrategy.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/io/HomeDirectoryLocationStrategy.java rename to src/main/java/org/apache/commons/configuration2/io/HomeDirectoryLocationStrategy.java index 56b7eac070..f2cca561d4 100644 --- a/src/main/java/org/apache/commons/configuration3/io/HomeDirectoryLocationStrategy.java +++ b/src/main/java/org/apache/commons/configuration2/io/HomeDirectoryLocationStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; import java.io.File; import java.net.URL; diff --git a/src/main/java/org/apache/commons/configuration3/io/InputStreamSupport.java b/src/main/java/org/apache/commons/configuration2/io/InputStreamSupport.java similarity index 94% rename from src/main/java/org/apache/commons/configuration3/io/InputStreamSupport.java rename to src/main/java/org/apache/commons/configuration2/io/InputStreamSupport.java index 6197fac7df..ffcac4ea07 100644 --- a/src/main/java/org/apache/commons/configuration3/io/InputStreamSupport.java +++ b/src/main/java/org/apache/commons/configuration2/io/InputStreamSupport.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; import java.io.IOException; import java.io.InputStream; -import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationException; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/io/ProvidedURLLocationStrategy.java b/src/main/java/org/apache/commons/configuration2/io/ProvidedURLLocationStrategy.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/io/ProvidedURLLocationStrategy.java rename to src/main/java/org/apache/commons/configuration2/io/ProvidedURLLocationStrategy.java index 2a898f75e6..ea1428da06 100644 --- a/src/main/java/org/apache/commons/configuration3/io/ProvidedURLLocationStrategy.java +++ b/src/main/java/org/apache/commons/configuration2/io/ProvidedURLLocationStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; import java.net.URL; diff --git a/src/main/java/org/apache/commons/configuration3/io/URLConnectionOptions.java b/src/main/java/org/apache/commons/configuration2/io/URLConnectionOptions.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/io/URLConnectionOptions.java rename to src/main/java/org/apache/commons/configuration2/io/URLConnectionOptions.java index 8932f13221..6a45943f4f 100644 --- a/src/main/java/org/apache/commons/configuration3/io/URLConnectionOptions.java +++ b/src/main/java/org/apache/commons/configuration2/io/URLConnectionOptions.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; import java.io.IOException; import java.net.URL; diff --git a/src/main/java/org/apache/commons/configuration3/io/VFSFileSystem.java b/src/main/java/org/apache/commons/configuration2/io/VFSFileSystem.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/io/VFSFileSystem.java rename to src/main/java/org/apache/commons/configuration2/io/VFSFileSystem.java index a49eecd9de..f815c82d94 100644 --- a/src/main/java/org/apache/commons/configuration3/io/VFSFileSystem.java +++ b/src/main/java/org/apache/commons/configuration2/io/VFSFileSystem.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; import java.io.File; import java.io.IOException; @@ -27,8 +27,8 @@ import java.net.URLStreamHandler; import java.util.Map; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.vfs2.FileContent; diff --git a/src/main/java/org/apache/commons/configuration3/io/VerifiableOutputStream.java b/src/main/java/org/apache/commons/configuration2/io/VerifiableOutputStream.java similarity index 95% rename from src/main/java/org/apache/commons/configuration3/io/VerifiableOutputStream.java rename to src/main/java/org/apache/commons/configuration2/io/VerifiableOutputStream.java index 91fc781ac8..64249f920e 100644 --- a/src/main/java/org/apache/commons/configuration3/io/VerifiableOutputStream.java +++ b/src/main/java/org/apache/commons/configuration2/io/VerifiableOutputStream.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/org/apache/commons/configuration3/io/package-info.java b/src/main/java/org/apache/commons/configuration2/io/package-info.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/io/package-info.java rename to src/main/java/org/apache/commons/configuration2/io/package-info.java index 95045705d0..99c9849f7d 100644 --- a/src/main/java/org/apache/commons/configuration3/io/package-info.java +++ b/src/main/java/org/apache/commons/configuration2/io/package-info.java @@ -26,4 +26,4 @@ * for the configuration sources of a specific application. *

        */ -package org.apache.commons.configuration3.io; +package org.apache.commons.configuration2.io; diff --git a/src/main/java/org/apache/commons/configuration3/package-info.java b/src/main/java/org/apache/commons/configuration2/package-info.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/package-info.java rename to src/main/java/org/apache/commons/configuration2/package-info.java index 5e83ddb473..a812aaffff 100644 --- a/src/main/java/org/apache/commons/configuration3/package-info.java +++ b/src/main/java/org/apache/commons/configuration2/package-info.java @@ -22,4 +22,4 @@ * {@code XMLConfiguration} that can load XML documents. *

        */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; diff --git a/src/main/java/org/apache/commons/configuration3/plist/PropertyListConfiguration.java b/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/plist/PropertyListConfiguration.java rename to src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java index 431833b887..fa038a9a11 100644 --- a/src/main/java/org/apache/commons/configuration3/plist/PropertyListConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3.plist; +package org.apache.commons.configuration2.plist; import java.io.PrintWriter; import java.io.Reader; @@ -30,16 +30,16 @@ import java.util.TimeZone; import org.apache.commons.codec.binary.Hex; -import org.apache.commons.configuration3.BaseHierarchicalConfiguration; -import org.apache.commons.configuration3.Configuration; -import org.apache.commons.configuration3.FileBasedConfiguration; -import org.apache.commons.configuration3.HierarchicalConfiguration; -import org.apache.commons.configuration3.ImmutableConfiguration; -import org.apache.commons.configuration3.MapConfiguration; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.tree.ImmutableNode; -import org.apache.commons.configuration3.tree.InMemoryNodeModel; -import org.apache.commons.configuration3.tree.NodeHandler; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.FileBasedConfiguration; +import org.apache.commons.configuration2.HierarchicalConfiguration; +import org.apache.commons.configuration2.ImmutableConfiguration; +import org.apache.commons.configuration2.MapConfiguration; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.InMemoryNodeModel; +import org.apache.commons.configuration2.tree.NodeHandler; import org.apache.commons.lang3.StringUtils; /** diff --git a/src/main/java/org/apache/commons/configuration3/plist/XMLPropertyListConfiguration.java b/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/plist/XMLPropertyListConfiguration.java rename to src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java index 085a8da9d5..462100fbb4 100644 --- a/src/main/java/org/apache/commons/configuration3/plist/XMLPropertyListConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3.plist; +package org.apache.commons.configuration2.plist; import java.io.PrintWriter; import java.io.Reader; @@ -43,17 +43,17 @@ import javax.xml.parsers.SAXParserFactory; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.configuration3.BaseHierarchicalConfiguration; -import org.apache.commons.configuration3.FileBasedConfiguration; -import org.apache.commons.configuration3.HierarchicalConfiguration; -import org.apache.commons.configuration3.ImmutableConfiguration; -import org.apache.commons.configuration3.MapConfiguration; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration3.io.FileLocator; -import org.apache.commons.configuration3.io.FileLocatorAware; -import org.apache.commons.configuration3.tree.ImmutableNode; -import org.apache.commons.configuration3.tree.InMemoryNodeModel; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; +import org.apache.commons.configuration2.FileBasedConfiguration; +import org.apache.commons.configuration2.HierarchicalConfiguration; +import org.apache.commons.configuration2.ImmutableConfiguration; +import org.apache.commons.configuration2.MapConfiguration; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.io.FileLocator; +import org.apache.commons.configuration2.io.FileLocatorAware; +import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.InMemoryNodeModel; import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.StringEscapeUtils; import org.xml.sax.Attributes; diff --git a/src/main/java/org/apache/commons/configuration3/plist/package-info.java b/src/main/java/org/apache/commons/configuration2/plist/package-info.java similarity index 94% rename from src/main/java/org/apache/commons/configuration3/plist/package-info.java rename to src/main/java/org/apache/commons/configuration2/plist/package-info.java index baba238072..54d8e1fd76 100644 --- a/src/main/java/org/apache/commons/configuration3/plist/package-info.java +++ b/src/main/java/org/apache/commons/configuration2/plist/package-info.java @@ -20,4 +20,4 @@ * Configuration classes supporting NeXT / OpenStep /GNUStep style configuration. *

        */ -package org.apache.commons.configuration3.plist; +package org.apache.commons.configuration2.plist; diff --git a/src/main/java/org/apache/commons/configuration3/reloading/CombinedReloadingController.java b/src/main/java/org/apache/commons/configuration2/reloading/CombinedReloadingController.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/reloading/CombinedReloadingController.java rename to src/main/java/org/apache/commons/configuration2/reloading/CombinedReloadingController.java index 51e046262d..b26bff46f1 100644 --- a/src/main/java/org/apache/commons/configuration3/reloading/CombinedReloadingController.java +++ b/src/main/java/org/apache/commons/configuration2/reloading/CombinedReloadingController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.reloading; +package org.apache.commons.configuration2.reloading; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/configuration3/reloading/FileHandlerReloadingDetector.java b/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/reloading/FileHandlerReloadingDetector.java rename to src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java index f8bc747258..08d9509702 100644 --- a/src/main/java/org/apache/commons/configuration3/reloading/FileHandlerReloadingDetector.java +++ b/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.reloading; +package org.apache.commons.configuration2.reloading; import java.io.File; import java.net.MalformedURLException; import java.net.URL; -import org.apache.commons.configuration3.io.FileHandler; -import org.apache.commons.configuration3.io.FileLocatorUtils; +import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration2.io.FileLocatorUtils; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/reloading/ManagedReloadingDetector.java b/src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingDetector.java similarity index 94% rename from src/main/java/org/apache/commons/configuration3/reloading/ManagedReloadingDetector.java rename to src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingDetector.java index f1a1336fe8..00a052ab70 100644 --- a/src/main/java/org/apache/commons/configuration3/reloading/ManagedReloadingDetector.java +++ b/src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingDetector.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3.reloading; +package org.apache.commons.configuration2.reloading; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -53,7 +53,7 @@ public boolean isReloadingRequired() { * Tells this strategy that the monitored configuration file should be refreshed. This method will typically be called * from outside (through an exposed MBean) on behalf of an administrator. * - * @see org.apache.commons.configuration3.reloading.ManagedReloadingDetectorMBean#refresh() + * @see org.apache.commons.configuration2.reloading.ManagedReloadingDetectorMBean#refresh() */ @Override public void refresh() { diff --git a/src/main/java/org/apache/commons/configuration3/reloading/ManagedReloadingDetectorMBean.java b/src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingDetectorMBean.java similarity index 95% rename from src/main/java/org/apache/commons/configuration3/reloading/ManagedReloadingDetectorMBean.java rename to src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingDetectorMBean.java index 14d19c96c6..e9f4f47db2 100644 --- a/src/main/java/org/apache/commons/configuration3/reloading/ManagedReloadingDetectorMBean.java +++ b/src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingDetectorMBean.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3.reloading; +package org.apache.commons.configuration2.reloading; /** * MBean definition for managing configuration reload. diff --git a/src/main/java/org/apache/commons/configuration3/reloading/PeriodicReloadingTrigger.java b/src/main/java/org/apache/commons/configuration2/reloading/PeriodicReloadingTrigger.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/reloading/PeriodicReloadingTrigger.java rename to src/main/java/org/apache/commons/configuration2/reloading/PeriodicReloadingTrigger.java index 0ef10a610d..020792a79c 100644 --- a/src/main/java/org/apache/commons/configuration3/reloading/PeriodicReloadingTrigger.java +++ b/src/main/java/org/apache/commons/configuration2/reloading/PeriodicReloadingTrigger.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.reloading; +package org.apache.commons.configuration2.reloading; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; diff --git a/src/main/java/org/apache/commons/configuration3/reloading/ReloadingController.java b/src/main/java/org/apache/commons/configuration2/reloading/ReloadingController.java similarity index 95% rename from src/main/java/org/apache/commons/configuration3/reloading/ReloadingController.java rename to src/main/java/org/apache/commons/configuration2/reloading/ReloadingController.java index b0c59d2f94..3704b04d13 100644 --- a/src/main/java/org/apache/commons/configuration3/reloading/ReloadingController.java +++ b/src/main/java/org/apache/commons/configuration2/reloading/ReloadingController.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.reloading; +package org.apache.commons.configuration2.reloading; -import org.apache.commons.configuration3.event.Event; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.event.EventListenerList; -import org.apache.commons.configuration3.event.EventSource; -import org.apache.commons.configuration3.event.EventType; +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.EventSource; +import org.apache.commons.configuration2.event.EventType; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/reloading/ReloadingControllerSupport.java b/src/main/java/org/apache/commons/configuration2/reloading/ReloadingControllerSupport.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/reloading/ReloadingControllerSupport.java rename to src/main/java/org/apache/commons/configuration2/reloading/ReloadingControllerSupport.java index 3a9f42c2d4..710f2ac2d9 100644 --- a/src/main/java/org/apache/commons/configuration3/reloading/ReloadingControllerSupport.java +++ b/src/main/java/org/apache/commons/configuration2/reloading/ReloadingControllerSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.reloading; +package org.apache.commons.configuration2.reloading; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/reloading/ReloadingDetector.java b/src/main/java/org/apache/commons/configuration2/reloading/ReloadingDetector.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/reloading/ReloadingDetector.java rename to src/main/java/org/apache/commons/configuration2/reloading/ReloadingDetector.java index 4d7a5caa7c..5b5753f102 100644 --- a/src/main/java/org/apache/commons/configuration3/reloading/ReloadingDetector.java +++ b/src/main/java/org/apache/commons/configuration2/reloading/ReloadingDetector.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.reloading; +package org.apache.commons.configuration2.reloading; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/reloading/ReloadingEvent.java b/src/main/java/org/apache/commons/configuration2/reloading/ReloadingEvent.java similarity index 94% rename from src/main/java/org/apache/commons/configuration3/reloading/ReloadingEvent.java rename to src/main/java/org/apache/commons/configuration2/reloading/ReloadingEvent.java index 823d690ae0..9eac131a9e 100644 --- a/src/main/java/org/apache/commons/configuration3/reloading/ReloadingEvent.java +++ b/src/main/java/org/apache/commons/configuration2/reloading/ReloadingEvent.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.reloading; +package org.apache.commons.configuration2.reloading; -import org.apache.commons.configuration3.event.Event; -import org.apache.commons.configuration3.event.EventType; +import org.apache.commons.configuration2.event.Event; +import org.apache.commons.configuration2.event.EventType; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/reloading/VFSFileHandlerReloadingDetector.java b/src/main/java/org/apache/commons/configuration2/reloading/VFSFileHandlerReloadingDetector.java similarity index 95% rename from src/main/java/org/apache/commons/configuration3/reloading/VFSFileHandlerReloadingDetector.java rename to src/main/java/org/apache/commons/configuration2/reloading/VFSFileHandlerReloadingDetector.java index 18e9e3ec4c..e5969b9d68 100644 --- a/src/main/java/org/apache/commons/configuration3/reloading/VFSFileHandlerReloadingDetector.java +++ b/src/main/java/org/apache/commons/configuration2/reloading/VFSFileHandlerReloadingDetector.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.configuration3.reloading; +package org.apache.commons.configuration2.reloading; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration3.io.FileHandler; -import org.apache.commons.configuration3.io.FileSystem; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration2.io.FileSystem; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.vfs2.FileObject; diff --git a/src/main/java/org/apache/commons/configuration3/reloading/package-info.java b/src/main/java/org/apache/commons/configuration2/reloading/package-info.java similarity index 95% rename from src/main/java/org/apache/commons/configuration3/reloading/package-info.java rename to src/main/java/org/apache/commons/configuration2/reloading/package-info.java index dc1c8e0e43..8a0ef453e2 100644 --- a/src/main/java/org/apache/commons/configuration3/reloading/package-info.java +++ b/src/main/java/org/apache/commons/configuration2/reloading/package-info.java @@ -25,4 +25,4 @@ * in background. *

        */ -package org.apache.commons.configuration3.reloading; +package org.apache.commons.configuration2.reloading; diff --git a/src/main/java/org/apache/commons/configuration3/resolver/CatalogResolver.java b/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/resolver/CatalogResolver.java rename to src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java index ed0d730cec..d08cc68ea0 100644 --- a/src/main/java/org/apache/commons/configuration3/resolver/CatalogResolver.java +++ b/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.resolver; +package org.apache.commons.configuration2.resolver; import java.io.IOException; import java.io.InputStream; @@ -23,11 +23,11 @@ import java.net.URLConnection; import java.util.Vector; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration3.io.ConfigurationLogger; -import org.apache.commons.configuration3.io.FileLocatorUtils; -import org.apache.commons.configuration3.io.FileSystem; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration2.io.ConfigurationLogger; +import org.apache.commons.configuration2.io.FileLocatorUtils; +import org.apache.commons.configuration2.io.FileSystem; import org.apache.xml.resolver.CatalogException; import org.apache.xml.resolver.readers.CatalogReader; import org.xml.sax.EntityResolver; diff --git a/src/main/java/org/apache/commons/configuration3/resolver/DefaultEntityResolver.java b/src/main/java/org/apache/commons/configuration2/resolver/DefaultEntityResolver.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/resolver/DefaultEntityResolver.java rename to src/main/java/org/apache/commons/configuration2/resolver/DefaultEntityResolver.java index 1fb7d7c19e..3a560fe958 100644 --- a/src/main/java/org/apache/commons/configuration3/resolver/DefaultEntityResolver.java +++ b/src/main/java/org/apache/commons/configuration2/resolver/DefaultEntityResolver.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.resolver; +package org.apache.commons.configuration2.resolver; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/apache/commons/configuration3/resolver/EntityRegistry.java b/src/main/java/org/apache/commons/configuration2/resolver/EntityRegistry.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/resolver/EntityRegistry.java rename to src/main/java/org/apache/commons/configuration2/resolver/EntityRegistry.java index 23bff434a7..f744acf497 100644 --- a/src/main/java/org/apache/commons/configuration3/resolver/EntityRegistry.java +++ b/src/main/java/org/apache/commons/configuration2/resolver/EntityRegistry.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.resolver; +package org.apache.commons.configuration2.resolver; import java.net.URL; import java.util.Map; diff --git a/src/main/java/org/apache/commons/configuration3/resolver/EntityResolverSupport.java b/src/main/java/org/apache/commons/configuration2/resolver/EntityResolverSupport.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/resolver/EntityResolverSupport.java rename to src/main/java/org/apache/commons/configuration2/resolver/EntityResolverSupport.java index ff552f231e..5d12b8811e 100644 --- a/src/main/java/org/apache/commons/configuration3/resolver/EntityResolverSupport.java +++ b/src/main/java/org/apache/commons/configuration2/resolver/EntityResolverSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.resolver; +package org.apache.commons.configuration2.resolver; import org.xml.sax.EntityResolver; diff --git a/src/main/java/org/apache/commons/configuration3/resolver/package-info.java b/src/main/java/org/apache/commons/configuration2/resolver/package-info.java similarity index 94% rename from src/main/java/org/apache/commons/configuration3/resolver/package-info.java rename to src/main/java/org/apache/commons/configuration2/resolver/package-info.java index 7e09649746..c0ed98c070 100644 --- a/src/main/java/org/apache/commons/configuration3/resolver/package-info.java +++ b/src/main/java/org/apache/commons/configuration2/resolver/package-info.java @@ -20,4 +20,4 @@ * A package containing EntityResolvers. *

        */ -package org.apache.commons.configuration3.resolver; +package org.apache.commons.configuration2.resolver; diff --git a/src/main/java/org/apache/commons/configuration3/spring/ConfigurationPropertiesFactoryBean.java b/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertiesFactoryBean.java similarity index 93% rename from src/main/java/org/apache/commons/configuration3/spring/ConfigurationPropertiesFactoryBean.java rename to src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertiesFactoryBean.java index 76238ff8f6..d8e523cfac 100644 --- a/src/main/java/org/apache/commons/configuration3/spring/ConfigurationPropertiesFactoryBean.java +++ b/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertiesFactoryBean.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.commons.configuration3.spring; +package org.apache.commons.configuration2.spring; import java.util.Properties; import java.util.stream.Stream; -import org.apache.commons.configuration3.CompositeConfiguration; -import org.apache.commons.configuration3.Configuration; -import org.apache.commons.configuration3.ConfigurationConverter; -import org.apache.commons.configuration3.builder.fluent.Configurations; +import org.apache.commons.configuration2.CompositeConfiguration; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.ConfigurationConverter; +import org.apache.commons.configuration2.builder.fluent.Configurations; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; @@ -55,7 +55,7 @@ public class ConfigurationPropertiesFactoryBean implements InitializingBean, Fac /** Spring resources for loading configurations **/ private Resource[] locations; - /** @see org.apache.commons.configuration3.AbstractConfiguration#throwExceptionOnMissing **/ + /** @see org.apache.commons.configuration2.AbstractConfiguration#throwExceptionOnMissing **/ private boolean throwExceptionOnMissing = true; public ConfigurationPropertiesFactoryBean() { @@ -150,7 +150,7 @@ public boolean isThrowExceptionOnMissing() { /** * Sets the underlying Commons CompositeConfiguration throwExceptionOnMissing flag. * - * @see org.apache.commons.configuration3.AbstractConfiguration#setThrowExceptionOnMissing(boolean) + * @see org.apache.commons.configuration2.AbstractConfiguration#setThrowExceptionOnMissing(boolean) * @param throwExceptionOnMissing The new value for the property */ public void setThrowExceptionOnMissing(final boolean throwExceptionOnMissing) { diff --git a/src/main/java/org/apache/commons/configuration3/spring/ConfigurationPropertySource.java b/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertySource.java similarity index 94% rename from src/main/java/org/apache/commons/configuration3/spring/ConfigurationPropertySource.java rename to src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertySource.java index 733495db5f..f19ef8d945 100644 --- a/src/main/java/org/apache/commons/configuration3/spring/ConfigurationPropertySource.java +++ b/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertySource.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.configuration3.spring; +package org.apache.commons.configuration2.spring; import java.util.ArrayList; import java.util.List; -import org.apache.commons.configuration3.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.ArrayUtils; import org.springframework.core.env.EnumerablePropertySource; diff --git a/src/main/java/org/apache/commons/configuration3/spring/package-info.java b/src/main/java/org/apache/commons/configuration2/spring/package-info.java similarity index 94% rename from src/main/java/org/apache/commons/configuration3/spring/package-info.java rename to src/main/java/org/apache/commons/configuration2/spring/package-info.java index bcb94e8626..4150a90e19 100644 --- a/src/main/java/org/apache/commons/configuration3/spring/package-info.java +++ b/src/main/java/org/apache/commons/configuration2/spring/package-info.java @@ -20,4 +20,4 @@ * A package containing integrations for the Spring Framework. *

        */ -package org.apache.commons.configuration3.spring; +package org.apache.commons.configuration2.spring; diff --git a/src/main/java/org/apache/commons/configuration3/sync/LockMode.java b/src/main/java/org/apache/commons/configuration2/sync/LockMode.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/sync/LockMode.java rename to src/main/java/org/apache/commons/configuration2/sync/LockMode.java index c75f477e3d..189c7853d7 100644 --- a/src/main/java/org/apache/commons/configuration3/sync/LockMode.java +++ b/src/main/java/org/apache/commons/configuration2/sync/LockMode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.sync; +package org.apache.commons.configuration2.sync; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/sync/NoOpSynchronizer.java b/src/main/java/org/apache/commons/configuration2/sync/NoOpSynchronizer.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/sync/NoOpSynchronizer.java rename to src/main/java/org/apache/commons/configuration2/sync/NoOpSynchronizer.java index 8039907264..e80c617f7f 100644 --- a/src/main/java/org/apache/commons/configuration3/sync/NoOpSynchronizer.java +++ b/src/main/java/org/apache/commons/configuration2/sync/NoOpSynchronizer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.sync; +package org.apache.commons.configuration2.sync; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/sync/ReadWriteSynchronizer.java b/src/main/java/org/apache/commons/configuration2/sync/ReadWriteSynchronizer.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/sync/ReadWriteSynchronizer.java rename to src/main/java/org/apache/commons/configuration2/sync/ReadWriteSynchronizer.java index bb9772ed7b..be6e0439c0 100644 --- a/src/main/java/org/apache/commons/configuration3/sync/ReadWriteSynchronizer.java +++ b/src/main/java/org/apache/commons/configuration2/sync/ReadWriteSynchronizer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.sync; +package org.apache.commons.configuration2.sync; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; diff --git a/src/main/java/org/apache/commons/configuration3/sync/Synchronizer.java b/src/main/java/org/apache/commons/configuration2/sync/Synchronizer.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/sync/Synchronizer.java rename to src/main/java/org/apache/commons/configuration2/sync/Synchronizer.java index deb44c43c1..2ee9161171 100644 --- a/src/main/java/org/apache/commons/configuration3/sync/Synchronizer.java +++ b/src/main/java/org/apache/commons/configuration2/sync/Synchronizer.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.sync; +package org.apache.commons.configuration2.sync; /** *

        * An interface controlling synchronization of configuration instances. *

        *

        - * Each {@code Configuration} object derived from {@link org.apache.commons.configuration3.AbstractConfiguration + * Each {@code Configuration} object derived from {@link org.apache.commons.configuration2.AbstractConfiguration * AbstractConfiguration} has an associated {@code Synchronizer} object. Before an operation on the configuration is * performed (e.g. a property read or an update), the {@code Synchronizer} is invoked. Depending on the concrete * implementation of the {@code Synchronizer} used, the configuration can be made thread-safe. diff --git a/src/main/java/org/apache/commons/configuration3/sync/SynchronizerSupport.java b/src/main/java/org/apache/commons/configuration2/sync/SynchronizerSupport.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/sync/SynchronizerSupport.java rename to src/main/java/org/apache/commons/configuration2/sync/SynchronizerSupport.java index 924df31533..450847dd59 100644 --- a/src/main/java/org/apache/commons/configuration3/sync/SynchronizerSupport.java +++ b/src/main/java/org/apache/commons/configuration2/sync/SynchronizerSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.sync; +package org.apache.commons.configuration2.sync; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/sync/package-info.java b/src/main/java/org/apache/commons/configuration2/sync/package-info.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/sync/package-info.java rename to src/main/java/org/apache/commons/configuration2/sync/package-info.java index 8804a57768..6be7eeca11 100644 --- a/src/main/java/org/apache/commons/configuration3/sync/package-info.java +++ b/src/main/java/org/apache/commons/configuration2/sync/package-info.java @@ -28,4 +28,4 @@ * implementation has to be set. *

        */ -package org.apache.commons.configuration3.sync; +package org.apache.commons.configuration2.sync; diff --git a/src/main/java/org/apache/commons/configuration3/tree/AbstractImmutableNodeHandler.java b/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/tree/AbstractImmutableNodeHandler.java rename to src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java index ad5cfa4a66..40ec23c3c1 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/AbstractImmutableNodeHandler.java +++ b/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import java.util.Collections; import java.util.List; diff --git a/src/main/java/org/apache/commons/configuration3/tree/ConfigurationNodeVisitor.java b/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitor.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/tree/ConfigurationNodeVisitor.java rename to src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitor.java index 1769a3edda..32d0008e4c 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/ConfigurationNodeVisitor.java +++ b/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/tree/ConfigurationNodeVisitorAdapter.java b/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitorAdapter.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/tree/ConfigurationNodeVisitorAdapter.java rename to src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitorAdapter.java index 2fd998e0f3..6883cf6dca 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/ConfigurationNodeVisitorAdapter.java +++ b/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitorAdapter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/tree/DefaultConfigurationKey.java b/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/tree/DefaultConfigurationKey.java rename to src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java index 42538638f9..52aad028e2 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/DefaultConfigurationKey.java +++ b/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/src/main/java/org/apache/commons/configuration3/tree/DefaultExpressionEngine.java b/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/tree/DefaultExpressionEngine.java rename to src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java index dacd6b770c..1cde082ba2 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/DefaultExpressionEngine.java +++ b/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import java.util.Collection; import java.util.LinkedList; diff --git a/src/main/java/org/apache/commons/configuration3/tree/DefaultExpressionEngineSymbols.java b/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngineSymbols.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/tree/DefaultExpressionEngineSymbols.java rename to src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngineSymbols.java index 0afb2ee307..f4fc3eff0c 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/DefaultExpressionEngineSymbols.java +++ b/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngineSymbols.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/src/main/java/org/apache/commons/configuration3/tree/ExpressionEngine.java b/src/main/java/org/apache/commons/configuration2/tree/ExpressionEngine.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/tree/ExpressionEngine.java rename to src/main/java/org/apache/commons/configuration2/tree/ExpressionEngine.java index b5914be985..fc4087fe63 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/ExpressionEngine.java +++ b/src/main/java/org/apache/commons/configuration2/tree/ExpressionEngine.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import java.util.List; @@ -70,7 +70,7 @@ public interface ExpressionEngine { /** * Returns the key for the specified node in the expression language supported by an implementation. This method is * called whenever a property key for a node has to be constructed, e.g. by the - * {@link org.apache.commons.configuration3.Configuration#getKeys() getKeys()} method. + * {@link org.apache.commons.configuration2.Configuration#getKeys() getKeys()} method. * * @param the type of the node to be processed * @param node the node, for which the key must be constructed diff --git a/src/main/java/org/apache/commons/configuration3/tree/ImmutableNode.java b/src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/tree/ImmutableNode.java rename to src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java index 0a6f8f1f9f..4981427959 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/ImmutableNode.java +++ b/src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/configuration3/tree/InMemoryNodeModel.java b/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/tree/InMemoryNodeModel.java rename to src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java index 871dedeaf1..4e0c4126f7 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/InMemoryNodeModel.java +++ b/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import java.util.ArrayList; import java.util.Collection; @@ -26,7 +26,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicReference; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; import org.apache.commons.lang3.mutable.Mutable; import org.apache.commons.lang3.mutable.MutableObject; diff --git a/src/main/java/org/apache/commons/configuration3/tree/InMemoryNodeModelSupport.java b/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModelSupport.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/tree/InMemoryNodeModelSupport.java rename to src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModelSupport.java index d77557ebce..15f8e88dc0 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/InMemoryNodeModelSupport.java +++ b/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModelSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/tree/MergeCombiner.java b/src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/tree/MergeCombiner.java rename to src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.java index 9ba0b488ee..f55069a944 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/MergeCombiner.java +++ b/src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/org/apache/commons/configuration3/tree/ModelTransaction.java b/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/tree/ModelTransaction.java rename to src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java index e5ad9043f0..4c6a14a826 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/ModelTransaction.java +++ b/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/configuration3/tree/NodeAddData.java b/src/main/java/org/apache/commons/configuration2/tree/NodeAddData.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/tree/NodeAddData.java rename to src/main/java/org/apache/commons/configuration2/tree/NodeAddData.java index 9c2ca720db..27936a4768 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/NodeAddData.java +++ b/src/main/java/org/apache/commons/configuration2/tree/NodeAddData.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/configuration3/tree/NodeCombiner.java b/src/main/java/org/apache/commons/configuration2/tree/NodeCombiner.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/tree/NodeCombiner.java rename to src/main/java/org/apache/commons/configuration2/tree/NodeCombiner.java index 5be809c8fd..a051b4ded1 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/NodeCombiner.java +++ b/src/main/java/org/apache/commons/configuration2/tree/NodeCombiner.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import java.util.Collections; import java.util.HashSet; diff --git a/src/main/java/org/apache/commons/configuration3/tree/NodeHandler.java b/src/main/java/org/apache/commons/configuration2/tree/NodeHandler.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/tree/NodeHandler.java rename to src/main/java/org/apache/commons/configuration2/tree/NodeHandler.java index e1de6b20b7..7398d0c5ba 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/NodeHandler.java +++ b/src/main/java/org/apache/commons/configuration2/tree/NodeHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import java.util.List; import java.util.Set; diff --git a/src/main/java/org/apache/commons/configuration3/tree/NodeHandlerDecorator.java b/src/main/java/org/apache/commons/configuration2/tree/NodeHandlerDecorator.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/tree/NodeHandlerDecorator.java rename to src/main/java/org/apache/commons/configuration2/tree/NodeHandlerDecorator.java index dbadb8526d..6ea38401f4 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/NodeHandlerDecorator.java +++ b/src/main/java/org/apache/commons/configuration2/tree/NodeHandlerDecorator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import java.util.List; import java.util.Set; diff --git a/src/main/java/org/apache/commons/configuration3/tree/NodeKeyResolver.java b/src/main/java/org/apache/commons/configuration2/tree/NodeKeyResolver.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/tree/NodeKeyResolver.java rename to src/main/java/org/apache/commons/configuration2/tree/NodeKeyResolver.java index 51a71646cf..acab18954d 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/NodeKeyResolver.java +++ b/src/main/java/org/apache/commons/configuration2/tree/NodeKeyResolver.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/apache/commons/configuration3/tree/NodeMatcher.java b/src/main/java/org/apache/commons/configuration2/tree/NodeMatcher.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/tree/NodeMatcher.java rename to src/main/java/org/apache/commons/configuration2/tree/NodeMatcher.java index 6d555ef843..22283a2e62 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/NodeMatcher.java +++ b/src/main/java/org/apache/commons/configuration2/tree/NodeMatcher.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/tree/NodeModel.java b/src/main/java/org/apache/commons/configuration2/tree/NodeModel.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/tree/NodeModel.java rename to src/main/java/org/apache/commons/configuration2/tree/NodeModel.java index 63af9bf63b..6dce72235f 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/NodeModel.java +++ b/src/main/java/org/apache/commons/configuration2/tree/NodeModel.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/configuration3/tree/NodeModelSupport.java b/src/main/java/org/apache/commons/configuration2/tree/NodeModelSupport.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/tree/NodeModelSupport.java rename to src/main/java/org/apache/commons/configuration2/tree/NodeModelSupport.java index 8820248055..603340beac 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/NodeModelSupport.java +++ b/src/main/java/org/apache/commons/configuration2/tree/NodeModelSupport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/tree/NodeNameMatchers.java b/src/main/java/org/apache/commons/configuration2/tree/NodeNameMatchers.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/tree/NodeNameMatchers.java rename to src/main/java/org/apache/commons/configuration2/tree/NodeNameMatchers.java index af983dc4a4..28a70e9330 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/NodeNameMatchers.java +++ b/src/main/java/org/apache/commons/configuration2/tree/NodeNameMatchers.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/org/apache/commons/configuration3/tree/NodeSelector.java b/src/main/java/org/apache/commons/configuration2/tree/NodeSelector.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/tree/NodeSelector.java rename to src/main/java/org/apache/commons/configuration2/tree/NodeSelector.java index 8616770795..c46832c376 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/NodeSelector.java +++ b/src/main/java/org/apache/commons/configuration2/tree/NodeSelector.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/org/apache/commons/configuration3/tree/NodeTracker.java b/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/tree/NodeTracker.java rename to src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java index c7b9377fca..5ae348ddeb 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/NodeTracker.java +++ b/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import java.util.Collection; import java.util.Collections; @@ -23,7 +23,7 @@ import java.util.Map; import java.util.stream.Collectors; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/tree/NodeTreeWalker.java b/src/main/java/org/apache/commons/configuration2/tree/NodeTreeWalker.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/tree/NodeTreeWalker.java rename to src/main/java/org/apache/commons/configuration2/tree/NodeTreeWalker.java index c3ef83e0b1..5d091850f7 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/NodeTreeWalker.java +++ b/src/main/java/org/apache/commons/configuration2/tree/NodeTreeWalker.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/org/apache/commons/configuration3/tree/NodeUpdateData.java b/src/main/java/org/apache/commons/configuration2/tree/NodeUpdateData.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/tree/NodeUpdateData.java rename to src/main/java/org/apache/commons/configuration2/tree/NodeUpdateData.java index ff046d0af5..359b3abc25 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/NodeUpdateData.java +++ b/src/main/java/org/apache/commons/configuration2/tree/NodeUpdateData.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/configuration3/tree/OverrideCombiner.java b/src/main/java/org/apache/commons/configuration2/tree/OverrideCombiner.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/tree/OverrideCombiner.java rename to src/main/java/org/apache/commons/configuration2/tree/OverrideCombiner.java index a0cecdcc26..84c1ce3c15 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/OverrideCombiner.java +++ b/src/main/java/org/apache/commons/configuration2/tree/OverrideCombiner.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/tree/QueryResult.java b/src/main/java/org/apache/commons/configuration2/tree/QueryResult.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/tree/QueryResult.java rename to src/main/java/org/apache/commons/configuration2/tree/QueryResult.java index 6943b32784..a25dc669a2 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/QueryResult.java +++ b/src/main/java/org/apache/commons/configuration2/tree/QueryResult.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/src/main/java/org/apache/commons/configuration3/tree/ReferenceNodeHandler.java b/src/main/java/org/apache/commons/configuration2/tree/ReferenceNodeHandler.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/tree/ReferenceNodeHandler.java rename to src/main/java/org/apache/commons/configuration2/tree/ReferenceNodeHandler.java index c8193ed584..a4621eaa18 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/ReferenceNodeHandler.java +++ b/src/main/java/org/apache/commons/configuration2/tree/ReferenceNodeHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import java.util.List; diff --git a/src/main/java/org/apache/commons/configuration3/tree/ReferenceTracker.java b/src/main/java/org/apache/commons/configuration2/tree/ReferenceTracker.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/tree/ReferenceTracker.java rename to src/main/java/org/apache/commons/configuration2/tree/ReferenceTracker.java index 90ed3261d0..b3f8cceb54 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/ReferenceTracker.java +++ b/src/main/java/org/apache/commons/configuration2/tree/ReferenceTracker.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import java.util.Collection; import java.util.Collections; diff --git a/src/main/java/org/apache/commons/configuration3/tree/TrackedNodeHandler.java b/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeHandler.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/tree/TrackedNodeHandler.java rename to src/main/java/org/apache/commons/configuration2/tree/TrackedNodeHandler.java index 8e4872b969..c9843f6674 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/TrackedNodeHandler.java +++ b/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/tree/TrackedNodeModel.java b/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeModel.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/tree/TrackedNodeModel.java rename to src/main/java/org/apache/commons/configuration2/tree/TrackedNodeModel.java index 54bb340189..38a911dab6 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/TrackedNodeModel.java +++ b/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeModel.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import java.util.Collection; import java.util.List; diff --git a/src/main/java/org/apache/commons/configuration3/tree/TreeData.java b/src/main/java/org/apache/commons/configuration2/tree/TreeData.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/tree/TreeData.java rename to src/main/java/org/apache/commons/configuration2/tree/TreeData.java index e652106df3..34801678b0 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/TreeData.java +++ b/src/main/java/org/apache/commons/configuration2/tree/TreeData.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/org/apache/commons/configuration3/tree/TreeUtils.java b/src/main/java/org/apache/commons/configuration2/tree/TreeUtils.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/tree/TreeUtils.java rename to src/main/java/org/apache/commons/configuration2/tree/TreeUtils.java index 455396c473..25ad7bd363 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/TreeUtils.java +++ b/src/main/java/org/apache/commons/configuration2/tree/TreeUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import java.io.PrintStream; diff --git a/src/main/java/org/apache/commons/configuration3/tree/UnionCombiner.java b/src/main/java/org/apache/commons/configuration2/tree/UnionCombiner.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/tree/UnionCombiner.java rename to src/main/java/org/apache/commons/configuration2/tree/UnionCombiner.java index e747644ffe..e427aac5f4 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/UnionCombiner.java +++ b/src/main/java/org/apache/commons/configuration2/tree/UnionCombiner.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/org/apache/commons/configuration3/tree/package-info.java b/src/main/java/org/apache/commons/configuration2/tree/package-info.java similarity index 94% rename from src/main/java/org/apache/commons/configuration3/tree/package-info.java rename to src/main/java/org/apache/commons/configuration2/tree/package-info.java index cd2e6fcc70..8d70b589e5 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/package-info.java +++ b/src/main/java/org/apache/commons/configuration2/tree/package-info.java @@ -20,4 +20,4 @@ * A package with helper and utility classes used by hierarchical configurations. *

        */ -package org.apache.commons.configuration3.tree; +package org.apache.commons.configuration2.tree; diff --git a/src/main/java/org/apache/commons/configuration3/tree/xpath/AbstractConfigurationNodeIterator.java b/src/main/java/org/apache/commons/configuration2/tree/xpath/AbstractConfigurationNodeIterator.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/tree/xpath/AbstractConfigurationNodeIterator.java rename to src/main/java/org/apache/commons/configuration2/tree/xpath/AbstractConfigurationNodeIterator.java index 4ea3f18369..38d0ba3139 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/xpath/AbstractConfigurationNodeIterator.java +++ b/src/main/java/org/apache/commons/configuration2/tree/xpath/AbstractConfigurationNodeIterator.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree.xpath; +package org.apache.commons.configuration2.tree.xpath; -import org.apache.commons.configuration3.tree.NodeHandler; +import org.apache.commons.configuration2.tree.NodeHandler; import org.apache.commons.jxpath.ri.QName; import org.apache.commons.jxpath.ri.model.NodeIterator; import org.apache.commons.jxpath.ri.model.NodePointer; diff --git a/src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationAttributePointer.java b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationAttributePointer.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationAttributePointer.java rename to src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationAttributePointer.java index 5b60e7e62e..6d1e172f13 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationAttributePointer.java +++ b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationAttributePointer.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree.xpath; +package org.apache.commons.configuration2.tree.xpath; -import org.apache.commons.configuration3.tree.NodeHandler; -import org.apache.commons.configuration3.tree.QueryResult; +import org.apache.commons.configuration2.tree.NodeHandler; +import org.apache.commons.configuration2.tree.QueryResult; import org.apache.commons.jxpath.ri.Compiler; import org.apache.commons.jxpath.ri.QName; import org.apache.commons.jxpath.ri.compiler.NodeTest; diff --git a/src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationNodeIteratorAttribute.java b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationNodeIteratorAttribute.java rename to src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java index b19d5706c5..dde987a590 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationNodeIteratorAttribute.java +++ b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree.xpath; +package org.apache.commons.configuration2.tree.xpath; import java.util.ArrayList; import java.util.LinkedHashSet; diff --git a/src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationNodeIteratorChildren.java b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java similarity index 99% rename from src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationNodeIteratorChildren.java rename to src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java index 9d5f8d2b42..32e46be011 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationNodeIteratorChildren.java +++ b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree.xpath; +package org.apache.commons.configuration2.tree.xpath; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationNodePointer.java b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointer.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationNodePointer.java rename to src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointer.java index 428b3e7fd7..6f24428f4c 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationNodePointer.java +++ b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointer.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree.xpath; +package org.apache.commons.configuration2.tree.xpath; import java.util.Locale; -import org.apache.commons.configuration3.tree.NodeHandler; +import org.apache.commons.configuration2.tree.NodeHandler; import org.apache.commons.jxpath.ri.Compiler; import org.apache.commons.jxpath.ri.QName; import org.apache.commons.jxpath.ri.compiler.NodeTest; diff --git a/src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationNodePointerFactory.java b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationNodePointerFactory.java rename to src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java index ba53753e15..54d1b16143 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/xpath/ConfigurationNodePointerFactory.java +++ b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree.xpath; +package org.apache.commons.configuration2.tree.xpath; import java.util.Locale; -import org.apache.commons.configuration3.tree.NodeHandler; +import org.apache.commons.configuration2.tree.NodeHandler; import org.apache.commons.jxpath.ri.QName; import org.apache.commons.jxpath.ri.model.NodePointer; import org.apache.commons.jxpath.ri.model.NodePointerFactory; diff --git a/src/main/java/org/apache/commons/configuration3/tree/xpath/XPathContextFactory.java b/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathContextFactory.java similarity index 93% rename from src/main/java/org/apache/commons/configuration3/tree/xpath/XPathContextFactory.java rename to src/main/java/org/apache/commons/configuration2/tree/xpath/XPathContextFactory.java index 29e407081a..29f36a516d 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/xpath/XPathContextFactory.java +++ b/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathContextFactory.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree.xpath; +package org.apache.commons.configuration2.tree.xpath; -import org.apache.commons.configuration3.tree.NodeHandler; +import org.apache.commons.configuration2.tree.NodeHandler; import org.apache.commons.jxpath.JXPathContext; /** diff --git a/src/main/java/org/apache/commons/configuration3/tree/xpath/XPathExpressionEngine.java b/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/tree/xpath/XPathExpressionEngine.java rename to src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java index 1bf18a2bab..a6dfb130f6 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/xpath/XPathExpressionEngine.java +++ b/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.tree.xpath; +package org.apache.commons.configuration2.tree.xpath; import java.util.Collections; import java.util.LinkedList; @@ -22,10 +22,10 @@ import java.util.StringTokenizer; import java.util.stream.Collectors; -import org.apache.commons.configuration3.tree.ExpressionEngine; -import org.apache.commons.configuration3.tree.NodeAddData; -import org.apache.commons.configuration3.tree.NodeHandler; -import org.apache.commons.configuration3.tree.QueryResult; +import org.apache.commons.configuration2.tree.ExpressionEngine; +import org.apache.commons.configuration2.tree.NodeAddData; +import org.apache.commons.configuration2.tree.NodeHandler; +import org.apache.commons.configuration2.tree.QueryResult; import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl; import org.apache.commons.lang3.StringUtils; @@ -182,7 +182,7 @@ public List> query(final T root, final String key, final Node /** * {@inheritDoc} This implementation creates an XPATH expression that selects the given node (under the assumption that * the passed in parent key is valid). As the {@code nodeKey()} implementation of - * {@link org.apache.commons.configuration3.tree.DefaultExpressionEngine DefaultExpressionEngine} this method does not + * {@link org.apache.commons.configuration2.tree.DefaultExpressionEngine DefaultExpressionEngine} this method does not * return indices for nodes. So all child nodes of a given parent with the same name have the same key. */ @Override diff --git a/src/main/java/org/apache/commons/configuration3/tree/xpath/package-info.java b/src/main/java/org/apache/commons/configuration2/tree/xpath/package-info.java similarity index 94% rename from src/main/java/org/apache/commons/configuration3/tree/xpath/package-info.java rename to src/main/java/org/apache/commons/configuration2/tree/xpath/package-info.java index 295b089249..5b94d345b5 100644 --- a/src/main/java/org/apache/commons/configuration3/tree/xpath/package-info.java +++ b/src/main/java/org/apache/commons/configuration2/tree/xpath/package-info.java @@ -21,4 +21,4 @@ * properties. *

        */ -package org.apache.commons.configuration3.tree.xpath; +package org.apache.commons.configuration2.tree.xpath; diff --git a/src/main/java/org/apache/commons/configuration3/web/AppletConfiguration.java b/src/main/java/org/apache/commons/configuration2/web/AppletConfiguration.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/web/AppletConfiguration.java rename to src/main/java/org/apache/commons/configuration2/web/AppletConfiguration.java index a71029beac..511bb6467b 100644 --- a/src/main/java/org/apache/commons/configuration3/web/AppletConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/web/AppletConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3.web; +package org.apache.commons.configuration2.web; import java.applet.Applet; import java.util.Arrays; diff --git a/src/main/java/org/apache/commons/configuration3/web/BaseWebConfiguration.java b/src/main/java/org/apache/commons/configuration2/web/BaseWebConfiguration.java similarity index 96% rename from src/main/java/org/apache/commons/configuration3/web/BaseWebConfiguration.java rename to src/main/java/org/apache/commons/configuration2/web/BaseWebConfiguration.java index f066ea9e76..9834e90554 100644 --- a/src/main/java/org/apache/commons/configuration3/web/BaseWebConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/web/BaseWebConfiguration.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.web; +package org.apache.commons.configuration2.web; import java.util.Collection; -import org.apache.commons.configuration3.AbstractConfiguration; +import org.apache.commons.configuration2.AbstractConfiguration; /** *

        diff --git a/src/main/java/org/apache/commons/configuration3/web/ServletConfiguration.java b/src/main/java/org/apache/commons/configuration2/web/ServletConfiguration.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/web/ServletConfiguration.java rename to src/main/java/org/apache/commons/configuration2/web/ServletConfiguration.java index b20b69e18e..188054b205 100644 --- a/src/main/java/org/apache/commons/configuration3/web/ServletConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/web/ServletConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3.web; +package org.apache.commons.configuration2.web; import java.util.Collections; import java.util.Enumeration; diff --git a/src/main/java/org/apache/commons/configuration3/web/ServletContextConfiguration.java b/src/main/java/org/apache/commons/configuration2/web/ServletContextConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/web/ServletContextConfiguration.java rename to src/main/java/org/apache/commons/configuration2/web/ServletContextConfiguration.java index 4fb2ae5ac0..16fff0d90e 100644 --- a/src/main/java/org/apache/commons/configuration3/web/ServletContextConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/web/ServletContextConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3.web; +package org.apache.commons.configuration2.web; import java.util.Collections; import java.util.Enumeration; diff --git a/src/main/java/org/apache/commons/configuration3/web/ServletFilterConfiguration.java b/src/main/java/org/apache/commons/configuration2/web/ServletFilterConfiguration.java similarity index 97% rename from src/main/java/org/apache/commons/configuration3/web/ServletFilterConfiguration.java rename to src/main/java/org/apache/commons/configuration2/web/ServletFilterConfiguration.java index e37517263f..06d4499f34 100644 --- a/src/main/java/org/apache/commons/configuration3/web/ServletFilterConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/web/ServletFilterConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3.web; +package org.apache.commons.configuration2.web; import java.util.Collections; import java.util.Enumeration; diff --git a/src/main/java/org/apache/commons/configuration3/web/ServletRequestConfiguration.java b/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/configuration3/web/ServletRequestConfiguration.java rename to src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java index 108443fa5d..3efcf18620 100644 --- a/src/main/java/org/apache/commons/configuration3/web/ServletRequestConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3.web; +package org.apache.commons.configuration2.web; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/configuration3/web/package-info.java b/src/main/java/org/apache/commons/configuration2/web/package-info.java similarity index 95% rename from src/main/java/org/apache/commons/configuration3/web/package-info.java rename to src/main/java/org/apache/commons/configuration2/web/package-info.java index 1e2a25d0cd..7cbbb7a266 100644 --- a/src/main/java/org/apache/commons/configuration3/web/package-info.java +++ b/src/main/java/org/apache/commons/configuration2/web/package-info.java @@ -21,4 +21,4 @@ * environments. *

        */ -package org.apache.commons.configuration3.web; +package org.apache.commons.configuration2.web; diff --git a/src/main/javacc/PropertyListParser.jj b/src/main/javacc/PropertyListParser.jj index c3c6de2155..317cdf14bb 100644 --- a/src/main/javacc/PropertyListParser.jj +++ b/src/main/javacc/PropertyListParser.jj @@ -22,14 +22,14 @@ options { PARSER_BEGIN(PropertyListParser) -package org.apache.commons.configuration3.plist; +package org.apache.commons.configuration2.plist; import java.util.Date; import java.util.List; import java.util.ArrayList; -import org.apache.commons.configuration3.HierarchicalConfiguration; -import org.apache.commons.configuration3.tree.ImmutableNode; +import org.apache.commons.configuration2.HierarchicalConfiguration; +import org.apache.commons.configuration2.tree.ImmutableNode; import org.apache.commons.codec.binary.Hex; diff --git a/src/site/xdoc/userguide/howto_basicfeatures.xml b/src/site/xdoc/userguide/howto_basicfeatures.xml index cb2fe79216..ad06d64960 100644 --- a/src/site/xdoc/userguide/howto_basicfeatures.xml +++ b/src/site/xdoc/userguide/howto_basicfeatures.xml @@ -280,14 +280,14 @@ java.home = ${env:JAVA_HOME} 2.8.0, this map was constant. However, starting in version 2.8.0, the lookups included in this map can be optionally configured via system property, allowing users greater control over the types of interpolation performed in their applications. The system property in question is named - org.apache.commons.configuration3.interpol.ConfigurationInterpolator.defaultPrefixLookups + org.apache.commons.configuration2.interpol.ConfigurationInterpolator.defaultPrefixLookups and is expected to contain a comma-separated list of names from the DefaultLookups enum. For example, launching an application with the system property given below will only enable the sys and env lookups.

        It is also important to note that starting in version 2.8.0, several previously enabled @@ -331,7 +331,7 @@ org.apache.commons.configuration3.interpol.ConfigurationInterpolator.defaultPref for the variable passed in:

        + config-class="org.apache.commons.configuration2.interpol.ExprLookup"> @@ -451,7 +451,7 @@ user.file = ${expr:System.getProperty("user.home")}/settings.xml + config-class="org.apache.commons.configuration2.interpol.ExprLookup"> diff --git a/src/site/xdoc/userguide/howto_builders.xml b/src/site/xdoc/userguide/howto_builders.xml index 6e0a87749c..8667be13dd 100644 --- a/src/site/xdoc/userguide/howto_builders.xml +++ b/src/site/xdoc/userguide/howto_builders.xml @@ -140,7 +140,7 @@ PropertiesConfiguration config = builder.getConfiguration(); Basically, initialization parameters are defined by POJOs (plain old Java objects) with properties corresponding to the special properties supported by the configuration object to be created. In the package - org.apache.commons.configuration3.builder.fluent a number + org.apache.commons.configuration2.builder.fluent a number of interfaces is contained defining the possible initialization parameters for the standard Configuration implementations shipped with Commons Configuration. These interfaces form a diff --git a/src/site/xdoc/userguide/howto_combinedbuilder.xml b/src/site/xdoc/userguide/howto_combinedbuilder.xml index f2cf9fe2a1..5bbedf4b67 100644 --- a/src/site/xdoc/userguide/howto_combinedbuilder.xml +++ b/src/site/xdoc/userguide/howto_combinedbuilder.xml @@ -684,7 +684,7 @@ CombinedConfigurationBuilder builder = configs.combinedBuilder("path/to/definiti config-class="com.foo.MyReloadingDetector" strict=true"/> - + ]]>

        @@ -831,8 +831,8 @@ CombinedConfigurationBuilder builder = configs.combinedBuilder("path/to/definiti - - + + @@ -878,7 +878,7 @@ CombinedConfigurationBuilder builder = configs.combinedBuilder("path/to/definiti

        + config-class="org.apache.commons.configuration2.io.VFSFileSystem"/>
        @@ -1010,9 +1010,9 @@ CombinedConfigurationBuilder builder = configs.combinedBuilder("path/to/definiti
        - + + config-class="org.apache.commons.configuration2.convert.DefaultListDelimiterHandler"> @@ -1196,9 +1196,9 @@ trigger.start(); { diff --git a/src/site/xdoc/userguide/howto_filebased.xml b/src/site/xdoc/userguide/howto_filebased.xml index ea60791c9c..e7ad160bcf 100644 --- a/src/site/xdoc/userguide/howto_filebased.xml +++ b/src/site/xdoc/userguide/howto_filebased.xml @@ -452,11 +452,11 @@ handler.save(out);
        - +
        - + diff --git a/src/site/xdoc/userguide/howto_multitenant.xml b/src/site/xdoc/userguide/howto_multitenant.xml index 09c7f80dd4..7a4bf690b8 100644 --- a/src/site/xdoc/userguide/howto_multitenant.xml +++ b/src/site/xdoc/userguide/howto_multitenant.xml @@ -105,11 +105,11 @@
        - + + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/>
        @@ -118,12 +118,12 @@ config-forceCreate="true" schemaValidation="true"> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/>         @@ -241,9 +241,9 @@ XMLConfiguration config = builder.getConfiguration();

        + class="org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder"> + value="org.apache.commons.configuration2.XMLConfiguration"/> @@ -258,7 +258,7 @@ XMLConfiguration config = builder.getConfiguration(); factory-method="getConfiguration"> diff --git a/src/site/xdoc/userguide/howto_utilities.xml b/src/site/xdoc/userguide/howto_utilities.xml index ecd6083f28..1719bf1e33 100644 --- a/src/site/xdoc/userguide/howto_utilities.xml +++ b/src/site/xdoc/userguide/howto_utilities.xml @@ -380,7 +380,7 @@ Configuration config = wrapperFactory.createBuilderConfigurationWrapper( - + diff --git a/src/site/xdoc/userguide/upgradeto2_0.xml b/src/site/xdoc/userguide/upgradeto2_0.xml index 0d2d74faea..cac2ebb80f 100644 --- a/src/site/xdoc/userguide/upgradeto2_0.xml +++ b/src/site/xdoc/userguide/upgradeto2_0.xml @@ -80,7 +80,7 @@

        The most obvious change you will notice at the very beginning is that - the root package was renamed to org.apache.commons.configuration3 + the root package was renamed to org.apache.commons.configuration2 - the major version is now part of the package name. This certainly makes migration harder, but it is the only possibility to avoid jar hell. Imagine for a moment that we had kept the old package name. This diff --git a/src/site/xdoc/userguide/upgradeto2_x.xml b/src/site/xdoc/userguide/upgradeto2_x.xml index d6494559d1..8f3a9154b1 100644 --- a/src/site/xdoc/userguide/upgradeto2_x.xml +++ b/src/site/xdoc/userguide/upgradeto2_x.xml @@ -47,7 +47,7 @@ programmatically or through a system property. If the behavior of previous versions must be maintained exactly without changes to the code, then the following system property can be used: - org.apache.commons.configuration3.interpol.ConfigurationInterpolator.defaultPrefixLookups=BASE64_DECODER,BASE64_ENCODER,CONST,DATE,DNS,ENVIRONMENT,FILE,JAVA,LOCAL_HOST,PROPERTIES,RESOURCE_BUNDLE,SCRIPT,SYSTEM_PROPERTIES,URL,URL_DECODER,URL_ENCODER,XML +org.apache.commons.configuration2.interpol.ConfigurationInterpolator.defaultPrefixLookups=BASE64_DECODER,BASE64_ENCODER,CONST,DATE,DNS,ENVIRONMENT,FILE,JAVA,LOCAL_HOST,PROPERTIES,RESOURCE_BUNDLE,SCRIPT,SYSTEM_PROPERTIES,URL,URL_DECODER,URL_ENCODER,XML If the disabled lookups listed above are not used by the target application, then no changes are required.

        diff --git a/src/test/java/org/apache/commons/configuration3/BaseNonStringProperties.java b/src/test/java/org/apache/commons/configuration2/BaseNonStringProperties.java similarity index 99% rename from src/test/java/org/apache/commons/configuration3/BaseNonStringProperties.java rename to src/test/java/org/apache/commons/configuration2/BaseNonStringProperties.java index 662f9f1594..f43a733592 100644 --- a/src/test/java/org/apache/commons/configuration3/BaseNonStringProperties.java +++ b/src/test/java/org/apache/commons/configuration2/BaseNonStringProperties.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/org/apache/commons/configuration3/ConfigurationAssert.java b/src/test/java/org/apache/commons/configuration2/ConfigurationAssert.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/ConfigurationAssert.java rename to src/test/java/org/apache/commons/configuration2/ConfigurationAssert.java index fcbc491100..0f3caaa9ff 100644 --- a/src/test/java/org/apache/commons/configuration3/ConfigurationAssert.java +++ b/src/test/java/org/apache/commons/configuration2/ConfigurationAssert.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -30,7 +30,7 @@ import java.util.List; import java.util.Set; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; /** * Assertions on configurations for the unit tests. This class also provides access to test files. diff --git a/src/test/java/org/apache/commons/configuration3/DatabaseConfigurationTestHelper.java b/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java similarity index 95% rename from src/test/java/org/apache/commons/configuration3/DatabaseConfigurationTestHelper.java rename to src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java index 4da8457ae1..7ae9f866f3 100644 --- a/src/test/java/org/apache/commons/configuration3/DatabaseConfigurationTestHelper.java +++ b/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.io.File; import java.io.FileInputStream; @@ -22,12 +22,12 @@ import javax.sql.DataSource; -import org.apache.commons.configuration3.builder.BasicConfigurationBuilder; -import org.apache.commons.configuration3.builder.fluent.DatabaseBuilderParameters; -import org.apache.commons.configuration3.builder.fluent.Parameters; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration3.test.HsqlDB; +import org.apache.commons.configuration2.builder.BasicConfigurationBuilder; +import org.apache.commons.configuration2.builder.fluent.DatabaseBuilderParameters; +import org.apache.commons.configuration2.builder.fluent.Parameters; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.test.HsqlDB; import org.apache.commons.dbcp2.BasicDataSource; import org.dbunit.database.DatabaseConnection; import org.dbunit.database.IDatabaseConnection; diff --git a/src/test/java/org/apache/commons/configuration3/EnumFixture.java b/src/test/java/org/apache/commons/configuration2/EnumFixture.java similarity index 95% rename from src/test/java/org/apache/commons/configuration3/EnumFixture.java rename to src/test/java/org/apache/commons/configuration2/EnumFixture.java index 11b029ed08..8d0688a136 100644 --- a/src/test/java/org/apache/commons/configuration3/EnumFixture.java +++ b/src/test/java/org/apache/commons/configuration2/EnumFixture.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; public enum EnumFixture { diff --git a/src/test/java/org/apache/commons/configuration3/FileURLStreamHandler.java b/src/test/java/org/apache/commons/configuration2/FileURLStreamHandler.java similarity index 97% rename from src/test/java/org/apache/commons/configuration3/FileURLStreamHandler.java rename to src/test/java/org/apache/commons/configuration2/FileURLStreamHandler.java index 878c5af27d..2c3fee5459 100644 --- a/src/test/java/org/apache/commons/configuration3/FileURLStreamHandler.java +++ b/src/test/java/org/apache/commons/configuration2/FileURLStreamHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.io.File; import java.io.FileInputStream; diff --git a/src/test/java/org/apache/commons/configuration3/InterpolationTestHelper.java b/src/test/java/org/apache/commons/configuration2/InterpolationTestHelper.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/InterpolationTestHelper.java rename to src/test/java/org/apache/commons/configuration2/InterpolationTestHelper.java index dc0f2d7d0e..e350f59631 100644 --- a/src/test/java/org/apache/commons/configuration3/InterpolationTestHelper.java +++ b/src/test/java/org/apache/commons/configuration2/InterpolationTestHelper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; /** * A helper class that defines a bunch of tests related to variable interpolation. It can be used for running these diff --git a/src/test/java/org/apache/commons/configuration3/Logging.java b/src/test/java/org/apache/commons/configuration2/Logging.java similarity index 99% rename from src/test/java/org/apache/commons/configuration3/Logging.java rename to src/test/java/org/apache/commons/configuration2/Logging.java index 164c256c05..7dd600bd8d 100644 --- a/src/test/java/org/apache/commons/configuration3/Logging.java +++ b/src/test/java/org/apache/commons/configuration2/Logging.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import org.apache.commons.logging.impl.Log4JLogger; import org.apache.log4j.Appender; diff --git a/src/test/java/org/apache/commons/configuration3/MockInitialContextFactory.java b/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java similarity index 99% rename from src/test/java/org/apache/commons/configuration3/MockInitialContextFactory.java rename to src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java index 25c5f107c0..622c6afe48 100644 --- a/src/test/java/org/apache/commons/configuration3/MockInitialContextFactory.java +++ b/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import javax.naming.*; import javax.naming.spi.InitialContextFactory; diff --git a/src/test/java/org/apache/commons/configuration3/NonCloneableConfiguration.java b/src/test/java/org/apache/commons/configuration2/NonCloneableConfiguration.java similarity index 97% rename from src/test/java/org/apache/commons/configuration3/NonCloneableConfiguration.java rename to src/test/java/org/apache/commons/configuration2/NonCloneableConfiguration.java index 6b206ac6f1..33e611865b 100644 --- a/src/test/java/org/apache/commons/configuration3/NonCloneableConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/NonCloneableConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.util.Iterator; diff --git a/src/test/java/org/apache/commons/configuration3/NonStringTestHolder.java b/src/test/java/org/apache/commons/configuration2/NonStringTestHolder.java similarity index 99% rename from src/test/java/org/apache/commons/configuration3/NonStringTestHolder.java rename to src/test/java/org/apache/commons/configuration2/NonStringTestHolder.java index 5ccd668def..2755c5d14b 100644 --- a/src/test/java/org/apache/commons/configuration3/NonStringTestHolder.java +++ b/src/test/java/org/apache/commons/configuration2/NonStringTestHolder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/src/test/java/org/apache/commons/configuration3/SynchronizerTestImpl.java b/src/test/java/org/apache/commons/configuration2/SynchronizerTestImpl.java similarity index 97% rename from src/test/java/org/apache/commons/configuration3/SynchronizerTestImpl.java rename to src/test/java/org/apache/commons/configuration2/SynchronizerTestImpl.java index 387aa73b12..1d6fc51268 100644 --- a/src/test/java/org/apache/commons/configuration3/SynchronizerTestImpl.java +++ b/src/test/java/org/apache/commons/configuration2/SynchronizerTestImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -22,7 +22,7 @@ import static org.hamcrest.Matchers.startsWith; import static org.junit.jupiter.api.Assertions.assertEquals; -import org.apache.commons.configuration3.sync.Synchronizer; +import org.apache.commons.configuration2.sync.Synchronizer; /** * A test implementation of Synchronizer which allows keeping track about the methods called by the configuration. diff --git a/src/test/java/org/apache/commons/configuration3/TempDirUtils.java b/src/test/java/org/apache/commons/configuration2/TempDirUtils.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/TempDirUtils.java rename to src/test/java/org/apache/commons/configuration2/TempDirUtils.java index ac7742c278..71c2273c2b 100644 --- a/src/test/java/org/apache/commons/configuration3/TempDirUtils.java +++ b/src/test/java/org/apache/commons/configuration2/TempDirUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import java.io.File; import java.io.IOException; diff --git a/src/test/java/org/apache/commons/configuration3/TestAbstractConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java similarity index 97% rename from src/test/java/org/apache/commons/configuration3/TestAbstractConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java index e1b90c3004..b3e3ba24a8 100644 --- a/src/test/java/org/apache/commons/configuration3/TestAbstractConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; @@ -34,8 +34,8 @@ import java.util.Iterator; import java.util.List; -import org.apache.commons.configuration3.ex.ConversionException; -import org.apache.commons.configuration3.io.ConfigurationLogger; +import org.apache.commons.configuration2.ex.ConversionException; +import org.apache.commons.configuration2.io.ConfigurationLogger; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration3/TestAbstractConfigurationBasicFeatures.java b/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/TestAbstractConfigurationBasicFeatures.java rename to src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java index 0457edcdcb..1af273ed27 100644 --- a/src/test/java/org/apache/commons/configuration3/TestAbstractConfigurationBasicFeatures.java +++ b/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -36,15 +36,15 @@ import java.util.Map; import java.util.NoSuchElementException; -import org.apache.commons.configuration3.convert.ConversionHandler; -import org.apache.commons.configuration3.convert.DefaultConversionHandler; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration3.convert.DisabledListDelimiterHandler; -import org.apache.commons.configuration3.event.ConfigurationEvent; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.event.EventType; -import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration3.interpol.Lookup; +import org.apache.commons.configuration2.convert.ConversionHandler; +import org.apache.commons.configuration2.convert.DefaultConversionHandler; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler; +import org.apache.commons.configuration2.event.ConfigurationEvent; +import org.apache.commons.configuration2.event.EventListener; +import org.apache.commons.configuration2.event.EventType; +import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration2.interpol.Lookup; import org.apache.commons.lang3.ArrayUtils; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestAbstractConfigurationSynchronization.java b/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationSynchronization.java similarity index 96% rename from src/test/java/org/apache/commons/configuration3/TestAbstractConfigurationSynchronization.java rename to src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationSynchronization.java index f399e66384..223044303f 100644 --- a/src/test/java/org/apache/commons/configuration3/TestAbstractConfigurationSynchronization.java +++ b/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationSynchronization.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -28,10 +28,10 @@ import java.util.Collections; -import org.apache.commons.configuration3.SynchronizerTestImpl.Methods; -import org.apache.commons.configuration3.io.FileHandler; -import org.apache.commons.configuration3.sync.LockMode; -import org.apache.commons.configuration3.sync.NoOpSynchronizer; +import org.apache.commons.configuration2.SynchronizerTestImpl.Methods; +import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration2.sync.LockMode; +import org.apache.commons.configuration2.sync.NoOpSynchronizer; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestAbstractHierarchicalConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java similarity index 97% rename from src/test/java/org/apache/commons/configuration3/TestAbstractHierarchicalConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java index bb257d329b..247a74bc77 100644 --- a/src/test/java/org/apache/commons/configuration3/TestAbstractHierarchicalConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -37,19 +37,19 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration3.event.ConfigurationEvent; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.event.EventListenerTestImpl; -import org.apache.commons.configuration3.tree.DefaultConfigurationKey; -import org.apache.commons.configuration3.tree.DefaultExpressionEngine; -import org.apache.commons.configuration3.tree.DefaultExpressionEngineSymbols; -import org.apache.commons.configuration3.tree.ExpressionEngine; -import org.apache.commons.configuration3.tree.ImmutableNode; -import org.apache.commons.configuration3.tree.InMemoryNodeModel; -import org.apache.commons.configuration3.tree.NodeHandler; -import org.apache.commons.configuration3.tree.NodeModel; -import org.apache.commons.configuration3.tree.NodeStructureHelper; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.event.ConfigurationEvent; +import org.apache.commons.configuration2.event.EventListener; +import org.apache.commons.configuration2.event.EventListenerTestImpl; +import org.apache.commons.configuration2.tree.DefaultConfigurationKey; +import org.apache.commons.configuration2.tree.DefaultExpressionEngine; +import org.apache.commons.configuration2.tree.DefaultExpressionEngineSymbols; +import org.apache.commons.configuration2.tree.ExpressionEngine; +import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.InMemoryNodeModel; +import org.apache.commons.configuration2.tree.NodeHandler; +import org.apache.commons.configuration2.tree.NodeModel; +import org.apache.commons.configuration2.tree.NodeStructureHelper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestBaseConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/TestBaseConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java index c46339fe57..c974e8ab65 100644 --- a/src/test/java/org/apache/commons/configuration3/TestBaseConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -40,13 +40,13 @@ import java.util.Properties; import java.util.StringTokenizer; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration3.event.ConfigurationEvent; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.event.EventListenerTestImpl; -import org.apache.commons.configuration3.ex.ConversionException; -import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration3.interpol.Lookup; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.event.ConfigurationEvent; +import org.apache.commons.configuration2.event.EventListener; +import org.apache.commons.configuration2.event.EventListenerTestImpl; +import org.apache.commons.configuration2.ex.ConversionException; +import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration2.interpol.Lookup; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestBaseConfigurationXMLReader.java b/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java similarity index 99% rename from src/test/java/org/apache/commons/configuration3/TestBaseConfigurationXMLReader.java rename to src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java index 7e7967a2ac..245e9a0196 100644 --- a/src/test/java/org/apache/commons/configuration3/TestBaseConfigurationXMLReader.java +++ b/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/src/test/java/org/apache/commons/configuration3/TestBaseHierarchicalConfigurationSynchronization.java b/src/test/java/org/apache/commons/configuration2/TestBaseHierarchicalConfigurationSynchronization.java similarity index 95% rename from src/test/java/org/apache/commons/configuration3/TestBaseHierarchicalConfigurationSynchronization.java rename to src/test/java/org/apache/commons/configuration2/TestBaseHierarchicalConfigurationSynchronization.java index f45da82b0e..7355dea676 100644 --- a/src/test/java/org/apache/commons/configuration3/TestBaseHierarchicalConfigurationSynchronization.java +++ b/src/test/java/org/apache/commons/configuration2/TestBaseHierarchicalConfigurationSynchronization.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -31,14 +31,14 @@ import java.util.List; import java.util.concurrent.CountDownLatch; -import org.apache.commons.configuration3.SynchronizerTestImpl.Methods; -import org.apache.commons.configuration3.builder.FileBasedConfigurationBuilder; -import org.apache.commons.configuration3.builder.fluent.Parameters; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.FileHandler; -import org.apache.commons.configuration3.tree.ImmutableNode; -import org.apache.commons.configuration3.tree.InMemoryNodeModel; -import org.apache.commons.configuration3.tree.NodeStructureHelper; +import org.apache.commons.configuration2.SynchronizerTestImpl.Methods; +import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder; +import org.apache.commons.configuration2.builder.fluent.Parameters; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.InMemoryNodeModel; +import org.apache.commons.configuration2.tree.NodeStructureHelper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestBaseNullConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/TestBaseNullConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java index 3178ce6101..3eaa61d02d 100644 --- a/src/test/java/org/apache/commons/configuration3/TestBaseNullConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -30,8 +30,8 @@ import java.util.NoSuchElementException; import java.util.Properties; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration3.ex.ConversionException; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.ex.ConversionException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestCatalogResolver.java b/src/test/java/org/apache/commons/configuration2/TestCatalogResolver.java similarity index 91% rename from src/test/java/org/apache/commons/configuration3/TestCatalogResolver.java rename to src/test/java/org/apache/commons/configuration2/TestCatalogResolver.java index b2b137a471..cc5387f591 100644 --- a/src/test/java/org/apache/commons/configuration3/TestCatalogResolver.java +++ b/src/test/java/org/apache/commons/configuration2/TestCatalogResolver.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertSame; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.ConfigurationLogger; -import org.apache.commons.configuration3.io.FileHandler; -import org.apache.commons.configuration3.resolver.CatalogResolver; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.ConfigurationLogger; +import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration2.resolver.CatalogResolver; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestCombinedConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java similarity index 97% rename from src/test/java/org/apache/commons/configuration3/TestCombinedConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java index ba51dca5cd..9c161f3e31 100644 --- a/src/test/java/org/apache/commons/configuration3/TestCombinedConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -38,23 +38,23 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.commons.configuration3.SynchronizerTestImpl.Methods; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration3.event.ConfigurationEvent; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration3.io.FileHandler; -import org.apache.commons.configuration3.sync.LockMode; -import org.apache.commons.configuration3.sync.ReadWriteSynchronizer; -import org.apache.commons.configuration3.sync.Synchronizer; -import org.apache.commons.configuration3.tree.DefaultExpressionEngine; -import org.apache.commons.configuration3.tree.DefaultExpressionEngineSymbols; -import org.apache.commons.configuration3.tree.ImmutableNode; -import org.apache.commons.configuration3.tree.NodeCombiner; -import org.apache.commons.configuration3.tree.NodeModel; -import org.apache.commons.configuration3.tree.OverrideCombiner; -import org.apache.commons.configuration3.tree.UnionCombiner; +import org.apache.commons.configuration2.SynchronizerTestImpl.Methods; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.event.ConfigurationEvent; +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.io.FileHandler; +import org.apache.commons.configuration2.sync.LockMode; +import org.apache.commons.configuration2.sync.ReadWriteSynchronizer; +import org.apache.commons.configuration2.sync.Synchronizer; +import org.apache.commons.configuration2.tree.DefaultExpressionEngine; +import org.apache.commons.configuration2.tree.DefaultExpressionEngineSymbols; +import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.NodeCombiner; +import org.apache.commons.configuration2.tree.NodeModel; +import org.apache.commons.configuration2.tree.OverrideCombiner; +import org.apache.commons.configuration2.tree.UnionCombiner; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestCompositeConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/TestCompositeConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java index e27ea0f133..9d605e5367 100644 --- a/src/test/java/org/apache/commons/configuration3/TestCompositeConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; @@ -37,14 +37,14 @@ import java.util.List; import java.util.NoSuchElementException; -import org.apache.commons.configuration3.SynchronizerTestImpl.Methods; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration3.convert.LegacyListDelimiterHandler; -import org.apache.commons.configuration3.convert.ListDelimiterHandler; -import org.apache.commons.configuration3.event.ConfigurationEvent; -import org.apache.commons.configuration3.event.EventListenerTestImpl; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration2.SynchronizerTestImpl.Methods; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.convert.LegacyListDelimiterHandler; +import org.apache.commons.configuration2.convert.ListDelimiterHandler; +import org.apache.commons.configuration2.event.ConfigurationEvent; +import org.apache.commons.configuration2.event.EventListenerTestImpl; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.io.FileHandler; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestCompositeConfigurationNonStringProperties.java b/src/test/java/org/apache/commons/configuration2/TestCompositeConfigurationNonStringProperties.java similarity index 94% rename from src/test/java/org/apache/commons/configuration3/TestCompositeConfigurationNonStringProperties.java rename to src/test/java/org/apache/commons/configuration2/TestCompositeConfigurationNonStringProperties.java index f84ea7daf5..3450491c6c 100644 --- a/src/test/java/org/apache/commons/configuration3/TestCompositeConfigurationNonStringProperties.java +++ b/src/test/java/org/apache/commons/configuration2/TestCompositeConfigurationNonStringProperties.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; -import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration2.io.FileHandler; import org.junit.jupiter.api.BeforeEach; /** diff --git a/src/test/java/org/apache/commons/configuration3/TestConfigurationConverter.java b/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/TestConfigurationConverter.java rename to src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java index bdc49a46c6..f2f2fa8205 100644 --- a/src/test/java/org/apache/commons/configuration3/TestConfigurationConverter.java +++ b/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -27,7 +27,7 @@ import java.util.Map; import java.util.Properties; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration3/TestConfigurationLookup.java b/src/test/java/org/apache/commons/configuration2/TestConfigurationLookup.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/TestConfigurationLookup.java rename to src/test/java/org/apache/commons/configuration2/TestConfigurationLookup.java index 479b9e411f..a49082fb03 100644 --- a/src/test/java/org/apache/commons/configuration3/TestConfigurationLookup.java +++ b/src/test/java/org/apache/commons/configuration2/TestConfigurationLookup.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertIterableEquals; diff --git a/src/test/java/org/apache/commons/configuration3/TestConfigurationMap.java b/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/TestConfigurationMap.java rename to src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java index fb32458a3c..21f7bd53fb 100644 --- a/src/test/java/org/apache/commons/configuration3/TestConfigurationMap.java +++ b/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/org/apache/commons/configuration3/TestConfigurationSet.java b/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/TestConfigurationSet.java rename to src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java index 3d2ce092e6..630795011e 100644 --- a/src/test/java/org/apache/commons/configuration3/TestConfigurationSet.java +++ b/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/org/apache/commons/configuration3/TestConfigurationUtils.java b/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java similarity index 95% rename from src/test/java/org/apache/commons/configuration3/TestConfigurationUtils.java rename to src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java index 3185c68bb3..6147ebb246 100644 --- a/src/test/java/org/apache/commons/configuration3/TestConfigurationUtils.java +++ b/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -32,18 +32,18 @@ import java.util.List; import java.util.Map; -import org.apache.commons.configuration3.builder.XMLBuilderParametersImpl; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration3.event.ConfigurationErrorEvent; -import org.apache.commons.configuration3.event.ConfigurationEvent; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.event.EventSource; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration3.sync.NoOpSynchronizer; -import org.apache.commons.configuration3.tree.DefaultExpressionEngine; -import org.apache.commons.configuration3.tree.DefaultExpressionEngineSymbols; -import org.apache.commons.configuration3.tree.ExpressionEngine; -import org.apache.commons.configuration3.tree.ImmutableNode; +import org.apache.commons.configuration2.builder.XMLBuilderParametersImpl; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.event.ConfigurationErrorEvent; +import org.apache.commons.configuration2.event.ConfigurationEvent; +import org.apache.commons.configuration2.event.EventListener; +import org.apache.commons.configuration2.event.EventSource; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.sync.NoOpSynchronizer; +import org.apache.commons.configuration2.tree.DefaultExpressionEngine; +import org.apache.commons.configuration2.tree.DefaultExpressionEngineSymbols; +import org.apache.commons.configuration2.tree.ExpressionEngine; +import org.apache.commons.configuration2.tree.ImmutableNode; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -90,7 +90,7 @@ private static class NonCloneableSynchronizer extends SynchronizerTestImpl { } /** Constant for the name of a class to be loaded. */ - private static final String CLS_NAME = "org.apache.commons.configuration3.PropertiesConfiguration"; + private static final String CLS_NAME = "org.apache.commons.configuration2.PropertiesConfiguration"; /** Stores the CCL. */ private ClassLoader ccl; diff --git a/src/test/java/org/apache/commons/configuration3/TestDataConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestDataConfiguration.java similarity index 99% rename from src/test/java/org/apache/commons/configuration3/TestDataConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestDataConfiguration.java index fb6cbdc328..c3d3a84f61 100644 --- a/src/test/java/org/apache/commons/configuration3/TestDataConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestDataConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -46,9 +46,9 @@ import java.util.Locale; import java.util.NoSuchElementException; -import org.apache.commons.configuration3.convert.DefaultConversionHandler; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration3.ex.ConversionException; +import org.apache.commons.configuration2.convert.DefaultConversionHandler; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.ex.ConversionException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestDatabaseConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestDatabaseConfiguration.java similarity index 97% rename from src/test/java/org/apache/commons/configuration3/TestDatabaseConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestDatabaseConfiguration.java index 7df76ba6a7..74de7b6f1d 100644 --- a/src/test/java/org/apache/commons/configuration3/TestDatabaseConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestDatabaseConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; @@ -38,13 +38,13 @@ import javax.sql.DataSource; -import org.apache.commons.configuration3.builder.fluent.DatabaseBuilderParameters; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration3.event.ConfigurationErrorEvent; -import org.apache.commons.configuration3.event.ConfigurationEvent; -import org.apache.commons.configuration3.event.ErrorListenerTestImpl; -import org.apache.commons.configuration3.event.EventType; -import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration2.builder.fluent.DatabaseBuilderParameters; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.event.ConfigurationErrorEvent; +import org.apache.commons.configuration2.event.ConfigurationEvent; +import org.apache.commons.configuration2.event.ErrorListenerTestImpl; +import org.apache.commons.configuration2.event.EventType; +import org.apache.commons.configuration2.ex.ConfigurationException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestDefaultImmutableConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestDefaultImmutableConfiguration.java similarity index 99% rename from src/test/java/org/apache/commons/configuration3/TestDefaultImmutableConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestDefaultImmutableConfiguration.java index 7515e6a3e6..d16162bc50 100644 --- a/src/test/java/org/apache/commons/configuration3/TestDefaultImmutableConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestDefaultImmutableConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -32,7 +32,7 @@ import java.util.Objects; import java.util.Properties; -import org.apache.commons.configuration3.ex.ConversionException; +import org.apache.commons.configuration2.ex.ConversionException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestDynamicCombinedConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java similarity index 93% rename from src/test/java/org/apache/commons/configuration3/TestDynamicCombinedConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java index bc6d7aa100..f4b3666834 100644 --- a/src/test/java/org/apache/commons/configuration3/TestDynamicCombinedConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; -import static org.apache.commons.configuration3.TempDirUtils.newFile; +import static org.apache.commons.configuration2.TempDirUtils.newFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -30,24 +30,24 @@ import java.nio.file.StandardCopyOption; import java.util.Random; -import org.apache.commons.configuration3.SynchronizerTestImpl.Methods; -import org.apache.commons.configuration3.builder.BuilderConfigurationWrapperFactory; -import org.apache.commons.configuration3.builder.ConfigurationBuilder; -import org.apache.commons.configuration3.builder.CopyObjectDefaultHandler; -import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; -import org.apache.commons.configuration3.builder.FileBasedBuilderProperties; -import org.apache.commons.configuration3.builder.combined.CombinedConfigurationBuilder; -import org.apache.commons.configuration3.builder.combined.MultiFileConfigurationBuilder; -import org.apache.commons.configuration3.builder.combined.ReloadingCombinedConfigurationBuilder; -import org.apache.commons.configuration3.builder.fluent.Parameters; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration3.interpol.Lookup; -import org.apache.commons.configuration3.io.FileHandler; -import org.apache.commons.configuration3.sync.LockMode; -import org.apache.commons.configuration3.sync.ReadWriteSynchronizer; -import org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine; +import org.apache.commons.configuration2.SynchronizerTestImpl.Methods; +import org.apache.commons.configuration2.builder.BuilderConfigurationWrapperFactory; +import org.apache.commons.configuration2.builder.ConfigurationBuilder; +import org.apache.commons.configuration2.builder.CopyObjectDefaultHandler; +import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl; +import org.apache.commons.configuration2.builder.FileBasedBuilderProperties; +import org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder; +import org.apache.commons.configuration2.builder.combined.MultiFileConfigurationBuilder; +import org.apache.commons.configuration2.builder.combined.ReloadingCombinedConfigurationBuilder; +import org.apache.commons.configuration2.builder.fluent.Parameters; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration2.interpol.Lookup; +import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration2.sync.LockMode; +import org.apache.commons.configuration2.sync.ReadWriteSynchronizer; +import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestEnvironmentConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestEnvironmentConfiguration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/TestEnvironmentConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestEnvironmentConfiguration.java index 6a0b858ee6..bf1d8bca7d 100644 --- a/src/test/java/org/apache/commons/configuration3/TestEnvironmentConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestEnvironmentConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/org/apache/commons/configuration3/TestEqualBehavior.java b/src/test/java/org/apache/commons/configuration2/TestEqualBehavior.java similarity index 96% rename from src/test/java/org/apache/commons/configuration3/TestEqualBehavior.java rename to src/test/java/org/apache/commons/configuration2/TestEqualBehavior.java index 98cdd3d0e0..29c573fbab 100644 --- a/src/test/java/org/apache/commons/configuration3/TestEqualBehavior.java +++ b/src/test/java/org/apache/commons/configuration2/TestEqualBehavior.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -26,10 +26,10 @@ import java.util.Iterator; import java.util.List; -import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; -import org.apache.commons.configuration3.builder.combined.CombinedConfigurationBuilder; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl; +import org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.FileHandler; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration3/TestEqualsProperty.java b/src/test/java/org/apache/commons/configuration2/TestEqualsProperty.java similarity index 93% rename from src/test/java/org/apache/commons/configuration3/TestEqualsProperty.java rename to src/test/java/org/apache/commons/configuration2/TestEqualsProperty.java index 312883f40e..1d3b5fc039 100644 --- a/src/test/java/org/apache/commons/configuration3/TestEqualsProperty.java +++ b/src/test/java/org/apache/commons/configuration2/TestEqualsProperty.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; -import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration2.io.FileHandler; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration3/TestHierarchicalConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfiguration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/TestHierarchicalConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestHierarchicalConfiguration.java index 6dfdffc7f7..0f07c7a22b 100644 --- a/src/test/java/org/apache/commons/configuration3/TestHierarchicalConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; @@ -26,12 +26,12 @@ import java.util.Collection; import java.util.List; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration3.tree.DefaultConfigurationKey; -import org.apache.commons.configuration3.tree.DefaultExpressionEngine; -import org.apache.commons.configuration3.tree.ImmutableNode; -import org.apache.commons.configuration3.tree.NodeStructureHelper; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.tree.DefaultConfigurationKey; +import org.apache.commons.configuration2.tree.DefaultExpressionEngine; +import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.NodeStructureHelper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestHierarchicalConfigurationXMLReader.java b/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfigurationXMLReader.java similarity index 94% rename from src/test/java/org/apache/commons/configuration3/TestHierarchicalConfigurationXMLReader.java rename to src/test/java/org/apache/commons/configuration2/TestHierarchicalConfigurationXMLReader.java index 8df13de97a..07c86a94e5 100644 --- a/src/test/java/org/apache/commons/configuration3/TestHierarchicalConfigurationXMLReader.java +++ b/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfigurationXMLReader.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -24,8 +24,8 @@ import javax.xml.transform.dom.DOMResult; import javax.xml.transform.sax.SAXSource; -import org.apache.commons.configuration3.io.FileHandler; -import org.apache.commons.configuration3.tree.ImmutableNode; +import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration2.tree.ImmutableNode; import org.apache.commons.jxpath.JXPathContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestHierarchicalXMLConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestHierarchicalXMLConfiguration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/TestHierarchicalXMLConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestHierarchicalXMLConfiguration.java index a92510bfad..3a81a6f78c 100644 --- a/src/test/java/org/apache/commons/configuration3/TestHierarchicalXMLConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestHierarchicalXMLConfiguration.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; -import static org.apache.commons.configuration3.TempDirUtils.newFile; +import static org.apache.commons.configuration2.TempDirUtils.newFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertInstanceOf; @@ -28,7 +28,7 @@ import java.util.Collection; import java.util.Iterator; -import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration2.io.FileHandler; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/src/test/java/org/apache/commons/configuration3/TestINIConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/TestINIConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java index c0e007d02f..f9b1976457 100644 --- a/src/test/java/org/apache/commons/configuration3/TestINIConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java @@ -15,9 +15,9 @@ * the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; -import static org.apache.commons.configuration3.TempDirUtils.newFile; +import static org.apache.commons.configuration2.TempDirUtils.newFile; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -43,18 +43,18 @@ import java.util.Set; import java.util.stream.Stream; -import org.apache.commons.configuration3.SynchronizerTestImpl.Methods; -import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; -import org.apache.commons.configuration3.builder.FileBasedConfigurationBuilder; -import org.apache.commons.configuration3.builder.fluent.Parameters; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.sync.ReadWriteSynchronizer; -import org.apache.commons.configuration3.tree.DefaultExpressionEngine; -import org.apache.commons.configuration3.tree.DefaultExpressionEngineSymbols; -import org.apache.commons.configuration3.tree.ImmutableNode; -import org.apache.commons.configuration3.tree.NodeHandler; -import org.apache.commons.configuration3.tree.NodeNameMatchers; +import org.apache.commons.configuration2.SynchronizerTestImpl.Methods; +import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl; +import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder; +import org.apache.commons.configuration2.builder.fluent.Parameters; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.sync.ReadWriteSynchronizer; +import org.apache.commons.configuration2.tree.DefaultExpressionEngine; +import org.apache.commons.configuration2.tree.DefaultExpressionEngineSymbols; +import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.NodeHandler; +import org.apache.commons.configuration2.tree.NodeNameMatchers; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/org/apache/commons/configuration3/TestImmutableConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestImmutableConfiguration.java similarity index 97% rename from src/test/java/org/apache/commons/configuration3/TestImmutableConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestImmutableConfiguration.java index 5bf596ad69..fc527a2607 100644 --- a/src/test/java/org/apache/commons/configuration3/TestImmutableConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestImmutableConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; @@ -28,9 +28,9 @@ import java.util.NoSuchElementException; import java.util.Set; -import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; -import org.apache.commons.configuration3.builder.FileBasedConfigurationBuilder; -import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl; +import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder; +import org.apache.commons.configuration2.ex.ConfigurationException; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration3/TestJNDIConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestJNDIConfiguration.java similarity index 97% rename from src/test/java/org/apache/commons/configuration3/TestJNDIConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestJNDIConfiguration.java index fb6d346bd6..1c0ddf062e 100644 --- a/src/test/java/org/apache/commons/configuration3/TestJNDIConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestJNDIConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -34,10 +34,10 @@ import javax.naming.NameNotFoundException; import javax.naming.NamingException; -import org.apache.commons.configuration3.event.ConfigurationErrorEvent; -import org.apache.commons.configuration3.event.ErrorListenerTestImpl; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.event.EventType; +import org.apache.commons.configuration2.event.ConfigurationErrorEvent; +import org.apache.commons.configuration2.event.ErrorListenerTestImpl; +import org.apache.commons.configuration2.event.EventListener; +import org.apache.commons.configuration2.event.EventType; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestJNDIEnvironmentValues.java b/src/test/java/org/apache/commons/configuration2/TestJNDIEnvironmentValues.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/TestJNDIEnvironmentValues.java rename to src/test/java/org/apache/commons/configuration2/TestJNDIEnvironmentValues.java index 88120108a8..3f0160ddfa 100644 --- a/src/test/java/org/apache/commons/configuration3/TestJNDIEnvironmentValues.java +++ b/src/test/java/org/apache/commons/configuration2/TestJNDIEnvironmentValues.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/src/test/java/org/apache/commons/configuration3/TestJSONConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestJSONConfiguration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/TestJSONConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestJSONConfiguration.java index b33f46c4b2..7fd70b12e2 100644 --- a/src/test/java/org/apache/commons/configuration3/TestJSONConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestJSONConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestMapConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestMapConfiguration.java similarity index 94% rename from src/test/java/org/apache/commons/configuration3/TestMapConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestMapConfiguration.java index 669f4d52ed..c447e6545b 100644 --- a/src/test/java/org/apache/commons/configuration3/TestMapConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestMapConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -25,10 +25,10 @@ import java.util.List; import java.util.Map; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration3.convert.DisabledListDelimiterHandler; -import org.apache.commons.configuration3.event.ConfigurationEvent; -import org.apache.commons.configuration3.event.EventListenerTestImpl; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler; +import org.apache.commons.configuration2.event.ConfigurationEvent; +import org.apache.commons.configuration2.event.EventListenerTestImpl; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration3/TestNonStringProperties.java b/src/test/java/org/apache/commons/configuration2/TestNonStringProperties.java similarity index 93% rename from src/test/java/org/apache/commons/configuration3/TestNonStringProperties.java rename to src/test/java/org/apache/commons/configuration2/TestNonStringProperties.java index 7d9dbf2b6d..021d4f1ef6 100644 --- a/src/test/java/org/apache/commons/configuration3/TestNonStringProperties.java +++ b/src/test/java/org/apache/commons/configuration2/TestNonStringProperties.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; -import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration2.io.FileHandler; import org.junit.jupiter.api.BeforeEach; /** diff --git a/src/test/java/org/apache/commons/configuration3/TestNullCompositeConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/TestNullCompositeConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java index 1b8cc8ede0..0c5b65bed8 100644 --- a/src/test/java/org/apache/commons/configuration3/TestNullCompositeConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -30,9 +30,9 @@ import java.util.Iterator; import java.util.List; -import org.apache.commons.configuration3.convert.LegacyListDelimiterHandler; -import org.apache.commons.configuration3.convert.ListDelimiterHandler; -import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration2.convert.LegacyListDelimiterHandler; +import org.apache.commons.configuration2.convert.ListDelimiterHandler; +import org.apache.commons.configuration2.io.FileHandler; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestNullJNDIEnvironmentValues.java b/src/test/java/org/apache/commons/configuration2/TestNullJNDIEnvironmentValues.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/TestNullJNDIEnvironmentValues.java rename to src/test/java/org/apache/commons/configuration2/TestNullJNDIEnvironmentValues.java index ba7a01a91e..c45647f063 100644 --- a/src/test/java/org/apache/commons/configuration3/TestNullJNDIEnvironmentValues.java +++ b/src/test/java/org/apache/commons/configuration2/TestNullJNDIEnvironmentValues.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/src/test/java/org/apache/commons/configuration3/TestPatternSubtreeConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfiguration.java similarity index 91% rename from src/test/java/org/apache/commons/configuration3/TestPatternSubtreeConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfiguration.java index 9e17e9b91f..6217719d3f 100644 --- a/src/test/java/org/apache/commons/configuration3/TestPatternSubtreeConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -23,10 +23,10 @@ import java.io.File; import java.io.StringWriter; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.FileHandler; -import org.apache.commons.configuration3.tree.ImmutableNode; -import org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestPatternSubtreeConfigurationWrapper.java b/src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfigurationWrapper.java similarity index 96% rename from src/test/java/org/apache/commons/configuration3/TestPatternSubtreeConfigurationWrapper.java rename to src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfigurationWrapper.java index 04aa7102c0..b938939bec 100644 --- a/src/test/java/org/apache/commons/configuration3/TestPatternSubtreeConfigurationWrapper.java +++ b/src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfigurationWrapper.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/src/test/java/org/apache/commons/configuration3/TestPropertiesConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/TestPropertiesConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java index e6364ef528..da85e4bb36 100644 --- a/src/test/java/org/apache/commons/configuration3/TestPropertiesConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; -import static org.apache.commons.configuration3.TempDirUtils.newFile; +import static org.apache.commons.configuration2.TempDirUtils.newFile; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; @@ -69,20 +69,20 @@ import java.util.Set; import org.apache.commons.collections.IteratorUtils; -import org.apache.commons.configuration3.SynchronizerTestImpl.Methods; -import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; -import org.apache.commons.configuration3.builder.FileBasedConfigurationBuilder; -import org.apache.commons.configuration3.builder.combined.CombinedConfigurationBuilder; -import org.apache.commons.configuration3.builder.fluent.Parameters; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration3.convert.DisabledListDelimiterHandler; -import org.apache.commons.configuration3.convert.LegacyListDelimiterHandler; -import org.apache.commons.configuration3.convert.ListDelimiterHandler; -import org.apache.commons.configuration3.event.ConfigurationEvent; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.DefaultFileSystem; -import org.apache.commons.configuration3.io.FileHandler; -import org.apache.commons.configuration3.io.FileSystem; +import org.apache.commons.configuration2.SynchronizerTestImpl.Methods; +import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl; +import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder; +import org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder; +import org.apache.commons.configuration2.builder.fluent.Parameters; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler; +import org.apache.commons.configuration2.convert.LegacyListDelimiterHandler; +import org.apache.commons.configuration2.convert.ListDelimiterHandler; +import org.apache.commons.configuration2.event.ConfigurationEvent; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.DefaultFileSystem; +import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration2.io.FileSystem; import org.apache.commons.lang3.mutable.MutableObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestPropertiesConfigurationLayout.java b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/TestPropertiesConfigurationLayout.java rename to src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java index 05ee184bad..ee9669d5e5 100644 --- a/src/test/java/org/apache/commons/configuration3/TestPropertiesConfigurationLayout.java +++ b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -32,11 +32,11 @@ import java.util.Deque; import java.util.Iterator; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration3.convert.LegacyListDelimiterHandler; -import org.apache.commons.configuration3.event.ConfigurationEvent; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.convert.LegacyListDelimiterHandler; +import org.apache.commons.configuration2.event.ConfigurationEvent; +import org.apache.commons.configuration2.event.EventListener; +import org.apache.commons.configuration2.ex.ConfigurationException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestPropertiesSequence.java b/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java similarity index 96% rename from src/test/java/org/apache/commons/configuration3/TestPropertiesSequence.java rename to src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java index e05bf7ea36..db5957d0ea 100644 --- a/src/test/java/org/apache/commons/configuration3/TestPropertiesSequence.java +++ b/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -23,9 +23,9 @@ import java.util.Iterator; import java.util.List; -import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; -import org.apache.commons.configuration3.builder.combined.CombinedConfigurationBuilder; -import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl; +import org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder; +import org.apache.commons.configuration2.io.FileHandler; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestStrictConfigurationComparator.java b/src/test/java/org/apache/commons/configuration2/TestStrictConfigurationComparator.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/TestStrictConfigurationComparator.java rename to src/test/java/org/apache/commons/configuration2/TestStrictConfigurationComparator.java index 42f45edb25..aff189050c 100644 --- a/src/test/java/org/apache/commons/configuration3/TestStrictConfigurationComparator.java +++ b/src/test/java/org/apache/commons/configuration2/TestStrictConfigurationComparator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/org/apache/commons/configuration3/TestSubnodeConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java similarity index 96% rename from src/test/java/org/apache/commons/configuration3/TestSubnodeConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java index 85ba206dde..8eec56bd08 100644 --- a/src/test/java/org/apache/commons/configuration3/TestSubnodeConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; @@ -35,16 +35,16 @@ import java.util.NoSuchElementException; import java.util.Set; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration3.convert.DisabledListDelimiterHandler; -import org.apache.commons.configuration3.convert.ListDelimiterHandler; -import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration3.tree.ImmutableNode; -import org.apache.commons.configuration3.tree.InMemoryNodeModel; -import org.apache.commons.configuration3.tree.NodeSelector; -import org.apache.commons.configuration3.tree.NodeStructureHelper; -import org.apache.commons.configuration3.tree.TrackedNodeModel; -import org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler; +import org.apache.commons.configuration2.convert.ListDelimiterHandler; +import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.InMemoryNodeModel; +import org.apache.commons.configuration2.tree.NodeSelector; +import org.apache.commons.configuration2.tree.NodeStructureHelper; +import org.apache.commons.configuration2.tree.TrackedNodeModel; +import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestSubsetConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestSubsetConfiguration.java similarity index 97% rename from src/test/java/org/apache/commons/configuration3/TestSubsetConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestSubsetConfiguration.java index 0a44f4f070..4ba245641a 100644 --- a/src/test/java/org/apache/commons/configuration3/TestSubsetConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestSubsetConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -33,11 +33,11 @@ import java.util.NoSuchElementException; import java.util.Set; -import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; -import org.apache.commons.configuration3.builder.combined.CombinedConfigurationBuilder; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration3.convert.ListDelimiterHandler; -import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl; +import org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.convert.ListDelimiterHandler; +import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; import org.junit.jupiter.api.Test; /** @@ -343,7 +343,7 @@ protected Iterator getKeysInternal() { Class subsetIteratorClass; try { subsetIteratorClass = Class - .forName("org.apache.commons.configuration3.SubsetConfiguration$SubsetIterator"); + .forName("org.apache.commons.configuration2.SubsetConfiguration$SubsetIterator"); final Constructor ctor = subsetIteratorClass.getDeclaredConstructor(SubsetConfiguration.class, Iterator.class); ctor.setAccessible(true); diff --git a/src/test/java/org/apache/commons/configuration3/TestSystemConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestSystemConfiguration.java similarity index 95% rename from src/test/java/org/apache/commons/configuration3/TestSystemConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestSystemConfiguration.java index 0339ecd850..93fb9687a8 100644 --- a/src/test/java/org/apache/commons/configuration3/TestSystemConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestSystemConfiguration.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; -import static org.apache.commons.configuration3.TempDirUtils.newFile; +import static org.apache.commons.configuration2.TempDirUtils.newFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -27,8 +27,8 @@ import java.util.Properties; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.FileHandler; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/src/test/java/org/apache/commons/configuration3/TestThreesomeConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestThreesomeConfiguration.java similarity index 91% rename from src/test/java/org/apache/commons/configuration3/TestThreesomeConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestThreesomeConfiguration.java index 6c273446c0..335354c9b7 100644 --- a/src/test/java/org/apache/commons/configuration3/TestThreesomeConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestThreesomeConfiguration.java @@ -15,19 +15,19 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import org.apache.commons.configuration3.convert.LegacyListDelimiterHandler; -import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration2.convert.LegacyListDelimiterHandler; +import org.apache.commons.configuration2.io.FileHandler; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; /** - * A base class for testing {@link org.apache.commons.configuration3.BaseHierarchicalConfiguration} extensions. + * A base class for testing {@link org.apache.commons.configuration2.BaseHierarchicalConfiguration} extensions. */ public class TestThreesomeConfiguration { protected Configuration conf; diff --git a/src/test/java/org/apache/commons/configuration3/TestXMLConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/TestXMLConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java index 857e84d74e..01ba754de7 100644 --- a/src/test/java/org/apache/commons/configuration3/TestXMLConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; -import static org.apache.commons.configuration3.TempDirUtils.newFile; +import static org.apache.commons.configuration2.TempDirUtils.newFile; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -46,17 +46,17 @@ import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactoryConfigurationError; -import org.apache.commons.configuration3.SynchronizerTestImpl.Methods; -import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; -import org.apache.commons.configuration3.builder.FileBasedConfigurationBuilder; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration3.convert.DisabledListDelimiterHandler; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.FileHandler; -import org.apache.commons.configuration3.resolver.CatalogResolver; -import org.apache.commons.configuration3.tree.ImmutableNode; -import org.apache.commons.configuration3.tree.NodeStructureHelper; -import org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine; +import org.apache.commons.configuration2.SynchronizerTestImpl.Methods; +import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl; +import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration2.resolver.CatalogResolver; +import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.NodeStructureHelper; +import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestXMLConfiguration_605.java b/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration_605.java similarity index 93% rename from src/test/java/org/apache/commons/configuration3/TestXMLConfiguration_605.java rename to src/test/java/org/apache/commons/configuration2/TestXMLConfiguration_605.java index e0d4c59759..6c08b39ab3 100644 --- a/src/test/java/org/apache/commons/configuration3/TestXMLConfiguration_605.java +++ b/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration_605.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.StringReader; -import org.apache.commons.configuration3.convert.DisabledListDelimiterHandler; -import org.apache.commons.configuration3.convert.LegacyListDelimiterHandler; -import org.apache.commons.configuration3.convert.ListDelimiterHandler; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler; +import org.apache.commons.configuration2.convert.LegacyListDelimiterHandler; +import org.apache.commons.configuration2.convert.ListDelimiterHandler; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.FileHandler; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration3/TestXMLDocumentHelper.java b/src/test/java/org/apache/commons/configuration2/TestXMLDocumentHelper.java similarity index 99% rename from src/test/java/org/apache/commons/configuration3/TestXMLDocumentHelper.java rename to src/test/java/org/apache/commons/configuration2/TestXMLDocumentHelper.java index 0aa20bc036..abd4738c0c 100644 --- a/src/test/java/org/apache/commons/configuration3/TestXMLDocumentHelper.java +++ b/src/test/java/org/apache/commons/configuration2/TestXMLDocumentHelper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -44,7 +44,7 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationException; import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/src/test/java/org/apache/commons/configuration3/TestXMLListHandling.java b/src/test/java/org/apache/commons/configuration2/TestXMLListHandling.java similarity index 94% rename from src/test/java/org/apache/commons/configuration3/TestXMLListHandling.java rename to src/test/java/org/apache/commons/configuration2/TestXMLListHandling.java index 69bc2c05d9..07492af4ad 100644 --- a/src/test/java/org/apache/commons/configuration3/TestXMLListHandling.java +++ b/src/test/java/org/apache/commons/configuration2/TestXMLListHandling.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; @@ -26,11 +26,11 @@ import java.util.Arrays; import java.util.List; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration3.convert.DisabledListDelimiterHandler; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.io.FileHandler; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/TestXMLPropertiesConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestXMLPropertiesConfiguration.java similarity index 96% rename from src/test/java/org/apache/commons/configuration3/TestXMLPropertiesConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestXMLPropertiesConfiguration.java index f8ce273c39..4cbeed0732 100644 --- a/src/test/java/org/apache/commons/configuration3/TestXMLPropertiesConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestXMLPropertiesConfiguration.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; -import static org.apache.commons.configuration3.TempDirUtils.newFile; +import static org.apache.commons.configuration2.TempDirUtils.newFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -32,8 +32,8 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.FileHandler; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import org.w3c.dom.Document; diff --git a/src/test/java/org/apache/commons/configuration3/TestYAMLConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestYAMLConfiguration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/TestYAMLConfiguration.java rename to src/test/java/org/apache/commons/configuration2/TestYAMLConfiguration.java index f7e4cfa92e..fca46f2481 100644 --- a/src/test/java/org/apache/commons/configuration3/TestYAMLConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/TestYAMLConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3; +package org.apache.commons.configuration2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -33,7 +33,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/src/test/java/org/apache/commons/configuration3/beanutils/BeanCreationTestBean.java b/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestBean.java similarity index 96% rename from src/test/java/org/apache/commons/configuration3/beanutils/BeanCreationTestBean.java rename to src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestBean.java index 6f14b4fb8b..5e0690e9b3 100644 --- a/src/test/java/org/apache/commons/configuration3/beanutils/BeanCreationTestBean.java +++ b/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestBean.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.beanutils; +package org.apache.commons.configuration2.beanutils; /** * A simple bean class used for testing bean creation operations. diff --git a/src/test/java/org/apache/commons/configuration3/beanutils/BeanCreationTestBeanWithListChild.java b/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestBeanWithListChild.java similarity index 97% rename from src/test/java/org/apache/commons/configuration3/beanutils/BeanCreationTestBeanWithListChild.java rename to src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestBeanWithListChild.java index 53dec639b4..2cdb350f15 100644 --- a/src/test/java/org/apache/commons/configuration3/beanutils/BeanCreationTestBeanWithListChild.java +++ b/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestBeanWithListChild.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.beanutils; +package org.apache.commons.configuration2.beanutils; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/org/apache/commons/configuration3/beanutils/BeanCreationTestCtorBean.java b/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestCtorBean.java similarity index 96% rename from src/test/java/org/apache/commons/configuration3/beanutils/BeanCreationTestCtorBean.java rename to src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestCtorBean.java index 658388a1b1..ed0c6b415d 100644 --- a/src/test/java/org/apache/commons/configuration3/beanutils/BeanCreationTestCtorBean.java +++ b/src/test/java/org/apache/commons/configuration2/beanutils/BeanCreationTestCtorBean.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.beanutils; +package org.apache.commons.configuration2.beanutils; /** * Another test bean class for bean creation operations which defines some constructors. diff --git a/src/test/java/org/apache/commons/configuration3/beanutils/BeanDeclarationTestImpl.java b/src/test/java/org/apache/commons/configuration2/beanutils/BeanDeclarationTestImpl.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/beanutils/BeanDeclarationTestImpl.java rename to src/test/java/org/apache/commons/configuration2/beanutils/BeanDeclarationTestImpl.java index 8bb4a7d3b3..4f2a781054 100644 --- a/src/test/java/org/apache/commons/configuration3/beanutils/BeanDeclarationTestImpl.java +++ b/src/test/java/org/apache/commons/configuration2/beanutils/BeanDeclarationTestImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.beanutils; +package org.apache.commons.configuration2.beanutils; import java.util.Collection; import java.util.Map; diff --git a/src/test/java/org/apache/commons/configuration3/beanutils/TestBeanHelper.java b/src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java similarity index 99% rename from src/test/java/org/apache/commons/configuration3/beanutils/TestBeanHelper.java rename to src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java index df8bf8d0ff..6f09b11e4e 100644 --- a/src/test/java/org/apache/commons/configuration3/beanutils/TestBeanHelper.java +++ b/src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.beanutils; +package org.apache.commons.configuration2.beanutils; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -32,8 +32,8 @@ import org.apache.commons.beanutils.DynaBean; import org.apache.commons.beanutils.LazyDynaBean; -import org.apache.commons.configuration3.PropertiesConfiguration; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.PropertiesConfiguration; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/beanutils/TestCombinedBeanDeclaration.java b/src/test/java/org/apache/commons/configuration2/beanutils/TestCombinedBeanDeclaration.java similarity index 99% rename from src/test/java/org/apache/commons/configuration3/beanutils/TestCombinedBeanDeclaration.java rename to src/test/java/org/apache/commons/configuration2/beanutils/TestCombinedBeanDeclaration.java index 8d42b177c0..c22bcd97c4 100644 --- a/src/test/java/org/apache/commons/configuration3/beanutils/TestCombinedBeanDeclaration.java +++ b/src/test/java/org/apache/commons/configuration2/beanutils/TestCombinedBeanDeclaration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.beanutils; +package org.apache.commons.configuration2.beanutils; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/src/test/java/org/apache/commons/configuration3/beanutils/TestConfigurationDynaBean.java b/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/beanutils/TestConfigurationDynaBean.java rename to src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java index af3c6f8478..ff8bb9da57 100644 --- a/src/test/java/org/apache/commons/configuration3/beanutils/TestConfigurationDynaBean.java +++ b/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration3.beanutils; +package org.apache.commons.configuration2.beanutils; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -30,9 +30,9 @@ import java.util.List; import org.apache.commons.beanutils.DynaProperty; -import org.apache.commons.configuration3.BaseConfiguration; -import org.apache.commons.configuration3.Configuration; -import org.apache.commons.configuration3.MapConfiguration; +import org.apache.commons.configuration2.BaseConfiguration; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.MapConfiguration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/beanutils/TestConfigurationDynaBeanXMLConfig.java b/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBeanXMLConfig.java similarity index 89% rename from src/test/java/org/apache/commons/configuration3/beanutils/TestConfigurationDynaBeanXMLConfig.java rename to src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBeanXMLConfig.java index 64750772ac..fd1ce84623 100644 --- a/src/test/java/org/apache/commons/configuration3/beanutils/TestConfigurationDynaBeanXMLConfig.java +++ b/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBeanXMLConfig.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.beanutils; +package org.apache.commons.configuration2.beanutils; -import org.apache.commons.configuration3.Configuration; -import org.apache.commons.configuration3.XMLConfiguration; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.XMLConfiguration; /** * An additional test class for ConfigurationDynaBean. This test class performs the same tests as the default test diff --git a/src/test/java/org/apache/commons/configuration3/beanutils/TestConstructorArg.java b/src/test/java/org/apache/commons/configuration2/beanutils/TestConstructorArg.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/beanutils/TestConstructorArg.java rename to src/test/java/org/apache/commons/configuration2/beanutils/TestConstructorArg.java index f98f598f4e..bf36c2f981 100644 --- a/src/test/java/org/apache/commons/configuration3/beanutils/TestConstructorArg.java +++ b/src/test/java/org/apache/commons/configuration2/beanutils/TestConstructorArg.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.beanutils; +package org.apache.commons.configuration2.beanutils; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/src/test/java/org/apache/commons/configuration3/beanutils/TestDefaultBeanFactory.java b/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java similarity index 97% rename from src/test/java/org/apache/commons/configuration3/beanutils/TestDefaultBeanFactory.java rename to src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java index 391e9e836b..4709142741 100644 --- a/src/test/java/org/apache/commons/configuration3/beanutils/TestDefaultBeanFactory.java +++ b/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.beanutils; +package org.apache.commons.configuration2.beanutils; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -34,10 +34,10 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.configuration3.PropertiesConfiguration; -import org.apache.commons.configuration3.convert.ConversionHandler; -import org.apache.commons.configuration3.convert.DefaultConversionHandler; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.PropertiesConfiguration; +import org.apache.commons.configuration2.convert.ConversionHandler; +import org.apache.commons.configuration2.convert.DefaultConversionHandler; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/beanutils/TestXMLBeanDeclaration.java b/src/test/java/org/apache/commons/configuration2/beanutils/TestXMLBeanDeclaration.java similarity index 98% rename from src/test/java/org/apache/commons/configuration3/beanutils/TestXMLBeanDeclaration.java rename to src/test/java/org/apache/commons/configuration2/beanutils/TestXMLBeanDeclaration.java index b7d6553a7d..883b0e15e7 100644 --- a/src/test/java/org/apache/commons/configuration3/beanutils/TestXMLBeanDeclaration.java +++ b/src/test/java/org/apache/commons/configuration2/beanutils/TestXMLBeanDeclaration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.beanutils; +package org.apache.commons.configuration2.beanutils; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -29,9 +29,9 @@ import java.util.Iterator; import java.util.Map; -import org.apache.commons.configuration3.BaseHierarchicalConfiguration; -import org.apache.commons.configuration3.HierarchicalConfiguration; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; +import org.apache.commons.configuration2.HierarchicalConfiguration; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration3/builder/BuilderEventListenerImpl.java b/src/test/java/org/apache/commons/configuration2/builder/BuilderEventListenerImpl.java similarity index 94% rename from src/test/java/org/apache/commons/configuration3/builder/BuilderEventListenerImpl.java rename to src/test/java/org/apache/commons/configuration2/builder/BuilderEventListenerImpl.java index 256a70ec84..990708128b 100644 --- a/src/test/java/org/apache/commons/configuration3/builder/BuilderEventListenerImpl.java +++ b/src/test/java/org/apache/commons/configuration2/builder/BuilderEventListenerImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -24,8 +24,8 @@ import java.util.LinkedList; import java.util.List; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.event.EventType; +import org.apache.commons.configuration2.event.EventListener; +import org.apache.commons.configuration2.event.EventType; /** * A test implementation of an event listener for configuration builders. This class is used by some unit tests. It diff --git a/src/test/java/org/apache/commons/configuration3/builder/ParametersBeanTestImpl.java b/src/test/java/org/apache/commons/configuration2/builder/ParametersBeanTestImpl.java similarity index 97% rename from src/test/java/org/apache/commons/configuration3/builder/ParametersBeanTestImpl.java rename to src/test/java/org/apache/commons/configuration2/builder/ParametersBeanTestImpl.java index 7e4e5cbe8b..5375603e25 100644 --- a/src/test/java/org/apache/commons/configuration3/builder/ParametersBeanTestImpl.java +++ b/src/test/java/org/apache/commons/configuration2/builder/ParametersBeanTestImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; /** * A test bean used to check whether all properties can be found. diff --git a/src/test/java/org/apache/commons/configuration3/builder/TestAutoSaveListener.java b/src/test/java/org/apache/commons/configuration2/builder/TestAutoSaveListener.java similarity index 95% rename from src/test/java/org/apache/commons/configuration3/builder/TestAutoSaveListener.java rename to src/test/java/org/apache/commons/configuration2/builder/TestAutoSaveListener.java index b108072056..46c02fc21b 100644 --- a/src/test/java/org/apache/commons/configuration3/builder/TestAutoSaveListener.java +++ b/src/test/java/org/apache/commons/configuration2/builder/TestAutoSaveListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; @@ -22,9 +22,9 @@ import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions; -import org.apache.commons.configuration3.event.ConfigurationEvent; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.FileHandler; +import org.apache.commons.configuration2.event.ConfigurationEvent; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.FileHandler; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/builder/TestBasicBuilderParameters.java b/src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.java similarity index 96% rename from src/test/java/org/apache/commons/configuration3/builder/TestBasicBuilderParameters.java rename to src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.java index 9271109610..a4419ca8dd 100644 --- a/src/test/java/org/apache/commons/configuration3/builder/TestBasicBuilderParameters.java +++ b/src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -34,18 +34,18 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.configuration3.ConfigurationDecoder; -import org.apache.commons.configuration3.beanutils.BeanHelper; -import org.apache.commons.configuration3.convert.ConversionHandler; -import org.apache.commons.configuration3.convert.DefaultConversionHandler; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration3.convert.ListDelimiterHandler; -import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration3.interpol.InterpolatorSpecification; -import org.apache.commons.configuration3.interpol.Lookup; -import org.apache.commons.configuration3.io.ConfigurationLogger; -import org.apache.commons.configuration3.sync.ReadWriteSynchronizer; -import org.apache.commons.configuration3.sync.Synchronizer; +import org.apache.commons.configuration2.ConfigurationDecoder; +import org.apache.commons.configuration2.beanutils.BeanHelper; +import org.apache.commons.configuration2.convert.ConversionHandler; +import org.apache.commons.configuration2.convert.DefaultConversionHandler; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.convert.ListDelimiterHandler; +import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration2.interpol.InterpolatorSpecification; +import org.apache.commons.configuration2.interpol.Lookup; +import org.apache.commons.configuration2.io.ConfigurationLogger; +import org.apache.commons.configuration2.sync.ReadWriteSynchronizer; +import org.apache.commons.configuration2.sync.Synchronizer; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/builder/TestBasicConfigurationBuilder.java b/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilder.java similarity index 93% rename from src/test/java/org/apache/commons/configuration3/builder/TestBasicConfigurationBuilder.java rename to src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilder.java index 0eb565560a..9885485e37 100644 --- a/src/test/java/org/apache/commons/configuration3/builder/TestBasicConfigurationBuilder.java +++ b/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -35,30 +35,30 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.commons.configuration3.BaseConfiguration; -import org.apache.commons.configuration3.BaseHierarchicalConfiguration; -import org.apache.commons.configuration3.Configuration; -import org.apache.commons.configuration3.Initializable; -import org.apache.commons.configuration3.PropertiesConfiguration; -import org.apache.commons.configuration3.XMLConfiguration; -import org.apache.commons.configuration3.beanutils.BeanCreationContext; -import org.apache.commons.configuration3.beanutils.BeanDeclaration; -import org.apache.commons.configuration3.beanutils.BeanFactory; -import org.apache.commons.configuration3.beanutils.BeanHelper; -import org.apache.commons.configuration3.beanutils.DefaultBeanFactory; -import org.apache.commons.configuration3.beanutils.XMLBeanDeclaration; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration3.convert.ListDelimiterHandler; -import org.apache.commons.configuration3.event.ConfigurationErrorEvent; -import org.apache.commons.configuration3.event.ConfigurationEvent; -import org.apache.commons.configuration3.event.ErrorListenerTestImpl; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.event.EventListenerRegistrationData; -import org.apache.commons.configuration3.event.EventListenerTestImpl; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration3.reloading.ReloadingController; -import org.apache.commons.configuration3.reloading.ReloadingDetector; +import org.apache.commons.configuration2.BaseConfiguration; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.Initializable; +import org.apache.commons.configuration2.PropertiesConfiguration; +import org.apache.commons.configuration2.XMLConfiguration; +import org.apache.commons.configuration2.beanutils.BeanCreationContext; +import org.apache.commons.configuration2.beanutils.BeanDeclaration; +import org.apache.commons.configuration2.beanutils.BeanFactory; +import org.apache.commons.configuration2.beanutils.BeanHelper; +import org.apache.commons.configuration2.beanutils.DefaultBeanFactory; +import org.apache.commons.configuration2.beanutils.XMLBeanDeclaration; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.convert.ListDelimiterHandler; +import org.apache.commons.configuration2.event.ConfigurationErrorEvent; +import org.apache.commons.configuration2.event.ConfigurationEvent; +import org.apache.commons.configuration2.event.ErrorListenerTestImpl; +import org.apache.commons.configuration2.event.EventListener; +import org.apache.commons.configuration2.event.EventListenerRegistrationData; +import org.apache.commons.configuration2.event.EventListenerTestImpl; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.reloading.ReloadingController; +import org.apache.commons.configuration2.reloading.ReloadingDetector; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/builder/TestBasicConfigurationBuilderEvents.java b/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilderEvents.java similarity index 95% rename from src/test/java/org/apache/commons/configuration3/builder/TestBasicConfigurationBuilderEvents.java rename to src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilderEvents.java index 5461b60fb1..44a4915942 100644 --- a/src/test/java/org/apache/commons/configuration3/builder/TestBasicConfigurationBuilderEvents.java +++ b/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilderEvents.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -23,11 +23,11 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.apache.commons.configuration3.Configuration; -import org.apache.commons.configuration3.PropertiesConfiguration; -import org.apache.commons.configuration3.event.Event; -import org.apache.commons.configuration3.event.EventType; -import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.PropertiesConfiguration; +import org.apache.commons.configuration2.event.Event; +import org.apache.commons.configuration2.event.EventType; +import org.apache.commons.configuration2.ex.ConfigurationException; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration3/builder/TestBuilderConfigurationWrapperFactory.java b/src/test/java/org/apache/commons/configuration2/builder/TestBuilderConfigurationWrapperFactory.java similarity index 92% rename from src/test/java/org/apache/commons/configuration3/builder/TestBuilderConfigurationWrapperFactory.java rename to src/test/java/org/apache/commons/configuration2/builder/TestBuilderConfigurationWrapperFactory.java index f3fff0d99b..6a69de2376 100644 --- a/src/test/java/org/apache/commons/configuration3/builder/TestBuilderConfigurationWrapperFactory.java +++ b/src/test/java/org/apache/commons/configuration2/builder/TestBuilderConfigurationWrapperFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -30,16 +30,16 @@ import java.util.Collection; -import org.apache.commons.configuration3.BaseHierarchicalConfiguration; -import org.apache.commons.configuration3.Configuration; -import org.apache.commons.configuration3.HierarchicalConfiguration; -import org.apache.commons.configuration3.PropertiesConfiguration; -import org.apache.commons.configuration3.builder.BuilderConfigurationWrapperFactory.EventSourceSupport; -import org.apache.commons.configuration3.event.ConfigurationEvent; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.event.EventListenerTestImpl; -import org.apache.commons.configuration3.event.EventSource; -import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.HierarchicalConfiguration; +import org.apache.commons.configuration2.PropertiesConfiguration; +import org.apache.commons.configuration2.builder.BuilderConfigurationWrapperFactory.EventSourceSupport; +import org.apache.commons.configuration2.event.ConfigurationEvent; +import org.apache.commons.configuration2.event.EventListener; +import org.apache.commons.configuration2.event.EventListenerTestImpl; +import org.apache.commons.configuration2.event.EventSource; +import org.apache.commons.configuration2.ex.ConfigurationException; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration3/builder/TestCopyObjectDefaultHandler.java b/src/test/java/org/apache/commons/configuration2/builder/TestCopyObjectDefaultHandler.java similarity index 95% rename from src/test/java/org/apache/commons/configuration3/builder/TestCopyObjectDefaultHandler.java rename to src/test/java/org/apache/commons/configuration2/builder/TestCopyObjectDefaultHandler.java index f0873b3f24..aebe8b4c78 100644 --- a/src/test/java/org/apache/commons/configuration3/builder/TestCopyObjectDefaultHandler.java +++ b/src/test/java/org/apache/commons/configuration2/builder/TestCopyObjectDefaultHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -22,8 +22,8 @@ import java.util.Map; -import org.apache.commons.configuration3.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration3.tree.ExpressionEngine; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.tree.ExpressionEngine; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration3/builder/TestDatabaseBuilderParametersImpl.java b/src/test/java/org/apache/commons/configuration2/builder/TestDatabaseBuilderParametersImpl.java similarity index 97% rename from src/test/java/org/apache/commons/configuration3/builder/TestDatabaseBuilderParametersImpl.java rename to src/test/java/org/apache/commons/configuration2/builder/TestDatabaseBuilderParametersImpl.java index 43b06fb253..26bdfddb77 100644 --- a/src/test/java/org/apache/commons/configuration3/builder/TestDatabaseBuilderParametersImpl.java +++ b/src/test/java/org/apache/commons/configuration2/builder/TestDatabaseBuilderParametersImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; @@ -24,7 +24,7 @@ import javax.sql.DataSource; -import org.apache.commons.configuration3.beanutils.BeanHelper; +import org.apache.commons.configuration2.beanutils.BeanHelper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/builder/TestDefaultParametersManager.java b/src/test/java/org/apache/commons/configuration2/builder/TestDefaultParametersManager.java similarity index 95% rename from src/test/java/org/apache/commons/configuration3/builder/TestDefaultParametersManager.java rename to src/test/java/org/apache/commons/configuration2/builder/TestDefaultParametersManager.java index aec4097a83..f954c0a851 100644 --- a/src/test/java/org/apache/commons/configuration3/builder/TestDefaultParametersManager.java +++ b/src/test/java/org/apache/commons/configuration2/builder/TestDefaultParametersManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -26,12 +26,12 @@ import java.nio.charset.StandardCharsets; import java.util.Map; -import org.apache.commons.configuration3.builder.fluent.FileBasedBuilderParameters; -import org.apache.commons.configuration3.builder.fluent.Parameters; -import org.apache.commons.configuration3.builder.fluent.PropertiesBuilderParameters; -import org.apache.commons.configuration3.builder.fluent.XMLBuilderParameters; -import org.apache.commons.configuration3.convert.ListDelimiterHandler; -import org.apache.commons.configuration3.tree.ExpressionEngine; +import org.apache.commons.configuration2.builder.fluent.FileBasedBuilderParameters; +import org.apache.commons.configuration2.builder.fluent.Parameters; +import org.apache.commons.configuration2.builder.fluent.PropertiesBuilderParameters; +import org.apache.commons.configuration2.builder.fluent.XMLBuilderParameters; +import org.apache.commons.configuration2.convert.ListDelimiterHandler; +import org.apache.commons.configuration2.tree.ExpressionEngine; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/builder/TestDefaultReloadingDetectorFactory.java b/src/test/java/org/apache/commons/configuration2/builder/TestDefaultReloadingDetectorFactory.java similarity index 91% rename from src/test/java/org/apache/commons/configuration3/builder/TestDefaultReloadingDetectorFactory.java rename to src/test/java/org/apache/commons/configuration2/builder/TestDefaultReloadingDetectorFactory.java index 679340ef66..dde3835101 100644 --- a/src/test/java/org/apache/commons/configuration3/builder/TestDefaultReloadingDetectorFactory.java +++ b/src/test/java/org/apache/commons/configuration2/builder/TestDefaultReloadingDetectorFactory.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertSame; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.FileHandler; -import org.apache.commons.configuration3.reloading.FileHandlerReloadingDetector; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration2.reloading.FileHandlerReloadingDetector; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/builder/TestEventListenerParameters.java b/src/test/java/org/apache/commons/configuration2/builder/TestEventListenerParameters.java similarity index 92% rename from src/test/java/org/apache/commons/configuration3/builder/TestEventListenerParameters.java rename to src/test/java/org/apache/commons/configuration2/builder/TestEventListenerParameters.java index 6bdbd8ecfb..4dde79c567 100644 --- a/src/test/java/org/apache/commons/configuration3/builder/TestEventListenerParameters.java +++ b/src/test/java/org/apache/commons/configuration2/builder/TestEventListenerParameters.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; @@ -22,9 +22,9 @@ import java.util.Arrays; -import org.apache.commons.configuration3.event.ConfigurationEvent; -import org.apache.commons.configuration3.event.EventListenerRegistrationData; -import org.apache.commons.configuration3.event.EventListenerTestImpl; +import org.apache.commons.configuration2.event.ConfigurationEvent; +import org.apache.commons.configuration2.event.EventListenerRegistrationData; +import org.apache.commons.configuration2.event.EventListenerTestImpl; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration3/builder/TestFileBasedBuilderParameters.java b/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedBuilderParameters.java similarity index 97% rename from src/test/java/org/apache/commons/configuration3/builder/TestFileBasedBuilderParameters.java rename to src/test/java/org/apache/commons/configuration2/builder/TestFileBasedBuilderParameters.java index 75a3b20d0a..764b27e00f 100644 --- a/src/test/java/org/apache/commons/configuration3/builder/TestFileBasedBuilderParameters.java +++ b/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedBuilderParameters.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -32,12 +32,12 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.configuration3.ConfigurationAssert; -import org.apache.commons.configuration3.beanutils.BeanHelper; -import org.apache.commons.configuration3.io.FileBased; -import org.apache.commons.configuration3.io.FileHandler; -import org.apache.commons.configuration3.io.FileLocationStrategy; -import org.apache.commons.configuration3.io.FileSystem; +import org.apache.commons.configuration2.ConfigurationAssert; +import org.apache.commons.configuration2.beanutils.BeanHelper; +import org.apache.commons.configuration2.io.FileBased; +import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration2.io.FileLocationStrategy; +import org.apache.commons.configuration2.io.FileSystem; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration3/builder/TestFileBasedConfigurationBuilder.java b/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java similarity index 95% rename from src/test/java/org/apache/commons/configuration3/builder/TestFileBasedConfigurationBuilder.java rename to src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java index 7f071d99b0..ee531ea8fc 100644 --- a/src/test/java/org/apache/commons/configuration3/builder/TestFileBasedConfigurationBuilder.java +++ b/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; -import static org.apache.commons.configuration3.TempDirUtils.newFile; -import static org.apache.commons.configuration3.TempDirUtils.newFolder; +import static org.apache.commons.configuration2.TempDirUtils.newFile; +import static org.apache.commons.configuration2.TempDirUtils.newFolder; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -41,21 +41,21 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.configuration3.Configuration; -import org.apache.commons.configuration3.ConfigurationAssert; -import org.apache.commons.configuration3.FileBasedConfiguration; -import org.apache.commons.configuration3.PropertiesConfiguration; -import org.apache.commons.configuration3.XMLConfiguration; -import org.apache.commons.configuration3.XMLPropertiesConfiguration; -import org.apache.commons.configuration3.builder.fluent.Parameters; -import org.apache.commons.configuration3.builder.fluent.PropertiesBuilderParameters; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.FileHandler; -import org.apache.commons.configuration3.io.FileLocator; -import org.apache.commons.configuration3.io.FileLocatorUtils; -import org.apache.commons.configuration3.io.HomeDirectoryLocationStrategy; -import org.apache.commons.configuration3.io.URLConnectionOptions; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.ConfigurationAssert; +import org.apache.commons.configuration2.FileBasedConfiguration; +import org.apache.commons.configuration2.PropertiesConfiguration; +import org.apache.commons.configuration2.XMLConfiguration; +import org.apache.commons.configuration2.XMLPropertiesConfiguration; +import org.apache.commons.configuration2.builder.fluent.Parameters; +import org.apache.commons.configuration2.builder.fluent.PropertiesBuilderParameters; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration2.io.FileLocator; +import org.apache.commons.configuration2.io.FileLocatorUtils; +import org.apache.commons.configuration2.io.HomeDirectoryLocationStrategy; +import org.apache.commons.configuration2.io.URLConnectionOptions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; @@ -296,7 +296,7 @@ public void testGetConfigurationLoadFromFile() throws ConfigurationException { */ @Test public void testGetConfigurationLoadFromJarFile() throws ConfigurationException, IOException { - final URL jarResourceUrl = getClass().getClassLoader().getResource("org/apache/commons/configuration3/test.jar"); + final URL jarResourceUrl = getClass().getClassLoader().getResource("org/apache/commons/configuration2/test.jar"); assertNotNull(jarResourceUrl); final Path testJar = Paths.get(tempFolder.getAbsolutePath(), "test.jar"); try (InputStream inputStream = jarResourceUrl.openStream()) { diff --git a/src/test/java/org/apache/commons/configuration3/builder/TestHierarchicalBuilderParametersImpl.java b/src/test/java/org/apache/commons/configuration2/builder/TestHierarchicalBuilderParametersImpl.java similarity index 94% rename from src/test/java/org/apache/commons/configuration3/builder/TestHierarchicalBuilderParametersImpl.java rename to src/test/java/org/apache/commons/configuration2/builder/TestHierarchicalBuilderParametersImpl.java index cdc9642962..9510a13756 100644 --- a/src/test/java/org/apache/commons/configuration3/builder/TestHierarchicalBuilderParametersImpl.java +++ b/src/test/java/org/apache/commons/configuration2/builder/TestHierarchicalBuilderParametersImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; @@ -22,8 +22,8 @@ import java.util.Map; -import org.apache.commons.configuration3.beanutils.BeanHelper; -import org.apache.commons.configuration3.tree.ExpressionEngine; +import org.apache.commons.configuration2.beanutils.BeanHelper; +import org.apache.commons.configuration2.tree.ExpressionEngine; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/builder/TestJndiBuilderParametersImpl.java b/src/test/java/org/apache/commons/configuration2/builder/TestJndiBuilderParametersImpl.java similarity index 96% rename from src/test/java/org/apache/commons/configuration3/builder/TestJndiBuilderParametersImpl.java rename to src/test/java/org/apache/commons/configuration2/builder/TestJndiBuilderParametersImpl.java index 4307f76d70..a279f70b5a 100644 --- a/src/test/java/org/apache/commons/configuration3/builder/TestJndiBuilderParametersImpl.java +++ b/src/test/java/org/apache/commons/configuration2/builder/TestJndiBuilderParametersImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; @@ -24,7 +24,7 @@ import javax.naming.Context; -import org.apache.commons.configuration3.beanutils.BeanHelper; +import org.apache.commons.configuration2.beanutils.BeanHelper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/builder/TestPropertiesBuilderParametersImpl.java b/src/test/java/org/apache/commons/configuration2/builder/TestPropertiesBuilderParametersImpl.java similarity index 94% rename from src/test/java/org/apache/commons/configuration3/builder/TestPropertiesBuilderParametersImpl.java rename to src/test/java/org/apache/commons/configuration2/builder/TestPropertiesBuilderParametersImpl.java index 988706b1e6..6bd13b7100 100644 --- a/src/test/java/org/apache/commons/configuration3/builder/TestPropertiesBuilderParametersImpl.java +++ b/src/test/java/org/apache/commons/configuration2/builder/TestPropertiesBuilderParametersImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -23,11 +23,11 @@ import java.util.Map; -import org.apache.commons.configuration3.ConfigurationConsumer; -import org.apache.commons.configuration3.PropertiesConfiguration; -import org.apache.commons.configuration3.PropertiesConfigurationLayout; -import org.apache.commons.configuration3.beanutils.BeanHelper; -import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration2.ConfigurationConsumer; +import org.apache.commons.configuration2.PropertiesConfiguration; +import org.apache.commons.configuration2.PropertiesConfigurationLayout; +import org.apache.commons.configuration2.beanutils.BeanHelper; +import org.apache.commons.configuration2.ex.ConfigurationException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/configuration3/builder/TestReloadingBuilderSupportListener.java b/src/test/java/org/apache/commons/configuration2/builder/TestReloadingBuilderSupportListener.java similarity index 87% rename from src/test/java/org/apache/commons/configuration3/builder/TestReloadingBuilderSupportListener.java rename to src/test/java/org/apache/commons/configuration2/builder/TestReloadingBuilderSupportListener.java index ed620f6651..12dfff746d 100644 --- a/src/test/java/org/apache/commons/configuration3/builder/TestReloadingBuilderSupportListener.java +++ b/src/test/java/org/apache/commons/configuration2/builder/TestReloadingBuilderSupportListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.ArgumentMatchers.any; @@ -24,12 +24,12 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import org.apache.commons.configuration3.Configuration; -import org.apache.commons.configuration3.PropertiesConfiguration; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.reloading.ReloadingController; -import org.apache.commons.configuration3.reloading.ReloadingDetector; -import org.apache.commons.configuration3.reloading.ReloadingEvent; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.PropertiesConfiguration; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.reloading.ReloadingController; +import org.apache.commons.configuration2.reloading.ReloadingDetector; +import org.apache.commons.configuration2.reloading.ReloadingEvent; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration3/builder/TestReloadingFileBasedConfigurationBuilder.java b/src/test/java/org/apache/commons/configuration2/builder/TestReloadingFileBasedConfigurationBuilder.java similarity index 96% rename from src/test/java/org/apache/commons/configuration3/builder/TestReloadingFileBasedConfigurationBuilder.java rename to src/test/java/org/apache/commons/configuration2/builder/TestReloadingFileBasedConfigurationBuilder.java index 1d7b5c43e5..3725698d01 100644 --- a/src/test/java/org/apache/commons/configuration3/builder/TestReloadingFileBasedConfigurationBuilder.java +++ b/src/test/java/org/apache/commons/configuration2/builder/TestReloadingFileBasedConfigurationBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -30,11 +30,11 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.configuration3.PropertiesConfiguration; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.io.FileHandler; -import org.apache.commons.configuration3.reloading.FileHandlerReloadingDetector; -import org.apache.commons.configuration3.reloading.ReloadingDetector; +import org.apache.commons.configuration2.PropertiesConfiguration; +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.ReloadingDetector; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration3/builder/TestXMLBuilderParametersImpl.java b/src/test/java/org/apache/commons/configuration2/builder/TestXMLBuilderParametersImpl.java similarity index 97% rename from src/test/java/org/apache/commons/configuration3/builder/TestXMLBuilderParametersImpl.java rename to src/test/java/org/apache/commons/configuration2/builder/TestXMLBuilderParametersImpl.java index e32fea4d83..5e3f759085 100644 --- a/src/test/java/org/apache/commons/configuration3/builder/TestXMLBuilderParametersImpl.java +++ b/src/test/java/org/apache/commons/configuration2/builder/TestXMLBuilderParametersImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder; +package org.apache.commons.configuration2.builder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; @@ -24,7 +24,7 @@ import javax.xml.parsers.DocumentBuilder; -import org.apache.commons.configuration3.beanutils.BeanHelper; +import org.apache.commons.configuration2.beanutils.BeanHelper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.xml.sax.EntityResolver; diff --git a/src/test/java/org/apache/commons/configuration3/builder/combined/AbstractMultiFileConfigurationBuilderTest.java b/src/test/java/org/apache/commons/configuration2/builder/combined/AbstractMultiFileConfigurationBuilderTest.java similarity index 91% rename from src/test/java/org/apache/commons/configuration3/builder/combined/AbstractMultiFileConfigurationBuilderTest.java rename to src/test/java/org/apache/commons/configuration2/builder/combined/AbstractMultiFileConfigurationBuilderTest.java index ac75aa46fe..1ebbbfb716 100644 --- a/src/test/java/org/apache/commons/configuration3/builder/combined/AbstractMultiFileConfigurationBuilderTest.java +++ b/src/test/java/org/apache/commons/configuration2/builder/combined/AbstractMultiFileConfigurationBuilderTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.combined; +package org.apache.commons.configuration2.builder.combined; -import org.apache.commons.configuration3.builder.BasicBuilderParameters; -import org.apache.commons.configuration3.builder.BuilderParameters; -import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration3.interpol.DefaultLookups; +import org.apache.commons.configuration2.builder.BasicBuilderParameters; +import org.apache.commons.configuration2.builder.BuilderParameters; +import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration2.interpol.DefaultLookups; import org.junit.jupiter.api.AfterEach; /** diff --git a/src/test/java/org/apache/commons/configuration3/builder/combined/TestBaseConfigurationBuilderProvider.java b/src/test/java/org/apache/commons/configuration2/builder/combined/TestBaseConfigurationBuilderProvider.java similarity index 90% rename from src/test/java/org/apache/commons/configuration3/builder/combined/TestBaseConfigurationBuilderProvider.java rename to src/test/java/org/apache/commons/configuration2/builder/combined/TestBaseConfigurationBuilderProvider.java index 95998a2f78..43c1a133fc 100644 --- a/src/test/java/org/apache/commons/configuration3/builder/combined/TestBaseConfigurationBuilderProvider.java +++ b/src/test/java/org/apache/commons/configuration2/builder/combined/TestBaseConfigurationBuilderProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.combined; +package org.apache.commons.configuration2.builder.combined; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -25,21 +25,21 @@ import java.util.Collection; import java.util.Collections; -import org.apache.commons.configuration3.BaseHierarchicalConfiguration; -import org.apache.commons.configuration3.Configuration; -import org.apache.commons.configuration3.ConfigurationAssert; -import org.apache.commons.configuration3.HierarchicalConfiguration; -import org.apache.commons.configuration3.PropertiesConfiguration; -import org.apache.commons.configuration3.builder.BasicBuilderParameters; -import org.apache.commons.configuration3.builder.BasicConfigurationBuilder; -import org.apache.commons.configuration3.builder.BuilderParameters; -import org.apache.commons.configuration3.builder.ConfigurationBuilder; -import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; -import org.apache.commons.configuration3.builder.FileBasedConfigurationBuilder; -import org.apache.commons.configuration3.builder.ReloadingFileBasedConfigurationBuilder; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration3.convert.DisabledListDelimiterHandler; -import org.apache.commons.configuration3.ex.ConfigurationException; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.ConfigurationAssert; +import org.apache.commons.configuration2.HierarchicalConfiguration; +import org.apache.commons.configuration2.PropertiesConfiguration; +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.FileBasedBuilderParametersImpl; +import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder; +import org.apache.commons.configuration2.builder.ReloadingFileBasedConfigurationBuilder; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler; +import org.apache.commons.configuration2.ex.ConfigurationException; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration3/builder/combined/TestCombinedBuilderParametersImpl.java b/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java similarity index 95% rename from src/test/java/org/apache/commons/configuration3/builder/combined/TestCombinedBuilderParametersImpl.java rename to src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java index b93eb0584d..0536636697 100644 --- a/src/test/java/org/apache/commons/configuration3/builder/combined/TestCombinedBuilderParametersImpl.java +++ b/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.combined; +package org.apache.commons.configuration2.builder.combined; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -31,17 +31,17 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.configuration3.ConfigurationAssert; -import org.apache.commons.configuration3.XMLConfiguration; -import org.apache.commons.configuration3.beanutils.BeanHelper; -import org.apache.commons.configuration3.builder.BasicBuilderParameters; -import org.apache.commons.configuration3.builder.BasicConfigurationBuilder; -import org.apache.commons.configuration3.builder.BuilderParameters; -import org.apache.commons.configuration3.builder.ConfigurationBuilder; -import org.apache.commons.configuration3.builder.DefaultParametersHandler; -import org.apache.commons.configuration3.builder.DefaultParametersManager; -import org.apache.commons.configuration3.builder.XMLBuilderParametersImpl; -import org.apache.commons.configuration3.builder.fluent.FileBasedBuilderParameters; +import org.apache.commons.configuration2.ConfigurationAssert; +import org.apache.commons.configuration2.XMLConfiguration; +import org.apache.commons.configuration2.beanutils.BeanHelper; +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.DefaultParametersHandler; +import org.apache.commons.configuration2.builder.DefaultParametersManager; +import org.apache.commons.configuration2.builder.XMLBuilderParametersImpl; +import org.apache.commons.configuration2.builder.fluent.FileBasedBuilderParameters; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/configuration3/builder/combined/TestCombinedConfigurationBuilder.java b/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java similarity index 94% rename from src/test/java/org/apache/commons/configuration3/builder/combined/TestCombinedConfigurationBuilder.java rename to src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java index f729156f6e..2ec29dc1f5 100644 --- a/src/test/java/org/apache/commons/configuration3/builder/combined/TestCombinedConfigurationBuilder.java +++ b/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration3.builder.combined; +package org.apache.commons.configuration2.builder.combined; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -41,51 +41,51 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; -import org.apache.commons.configuration3.BaseHierarchicalConfiguration; -import org.apache.commons.configuration3.CombinedConfiguration; -import org.apache.commons.configuration3.Configuration; -import org.apache.commons.configuration3.ConfigurationAssert; -import org.apache.commons.configuration3.ConfigurationDecoder; -import org.apache.commons.configuration3.DynamicCombinedConfiguration; -import org.apache.commons.configuration3.HierarchicalConfiguration; -import org.apache.commons.configuration3.PropertiesConfiguration; -import org.apache.commons.configuration3.XMLConfiguration; -import org.apache.commons.configuration3.XMLPropertiesConfiguration; -import org.apache.commons.configuration3.builder.BasicConfigurationBuilder; -import org.apache.commons.configuration3.builder.BuilderEventListenerImpl; -import org.apache.commons.configuration3.builder.ConfigurationBuilder; -import org.apache.commons.configuration3.builder.ConfigurationBuilderEvent; -import org.apache.commons.configuration3.builder.CopyObjectDefaultHandler; -import org.apache.commons.configuration3.builder.FileBasedBuilderParametersImpl; -import org.apache.commons.configuration3.builder.FileBasedBuilderProperties; -import org.apache.commons.configuration3.builder.FileBasedConfigurationBuilder; -import org.apache.commons.configuration3.builder.PropertiesBuilderParametersImpl; -import org.apache.commons.configuration3.builder.ReloadingFileBasedConfigurationBuilder; -import org.apache.commons.configuration3.builder.XMLBuilderParametersImpl; -import org.apache.commons.configuration3.builder.XMLBuilderProperties; -import org.apache.commons.configuration3.builder.fluent.CombinedBuilderParameters; -import org.apache.commons.configuration3.builder.fluent.FileBasedBuilderParameters; -import org.apache.commons.configuration3.builder.fluent.Parameters; -import org.apache.commons.configuration3.builder.fluent.XMLBuilderParameters; -import org.apache.commons.configuration3.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration3.convert.ListDelimiterHandler; -import org.apache.commons.configuration3.event.ConfigurationEvent; -import org.apache.commons.configuration3.event.Event; -import org.apache.commons.configuration3.event.EventListener; -import org.apache.commons.configuration3.ex.ConfigurationException; -import org.apache.commons.configuration3.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration3.interpol.Lookup; -import org.apache.commons.configuration3.io.DefaultFileSystem; -import org.apache.commons.configuration3.io.FileHandler; -import org.apache.commons.configuration3.io.FileLocatorUtils; -import org.apache.commons.configuration3.io.FileSystem; -import org.apache.commons.configuration3.reloading.ReloadingController; -import org.apache.commons.configuration3.reloading.ReloadingControllerSupport; -import org.apache.commons.configuration3.resolver.CatalogResolver; -import org.apache.commons.configuration3.tree.DefaultExpressionEngine; -import org.apache.commons.configuration3.tree.DefaultExpressionEngineSymbols; -import org.apache.commons.configuration3.tree.ImmutableNode; -import org.apache.commons.configuration3.tree.xpath.XPathExpressionEngine; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; +import org.apache.commons.configuration2.CombinedConfiguration; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.ConfigurationAssert; +import org.apache.commons.configuration2.ConfigurationDecoder; +import org.apache.commons.configuration2.DynamicCombinedConfiguration; +import org.apache.commons.configuration2.HierarchicalConfiguration; +import org.apache.commons.configuration2.PropertiesConfiguration; +import org.apache.commons.configuration2.XMLConfiguration; +import org.apache.commons.configuration2.XMLPropertiesConfiguration; +import org.apache.commons.configuration2.builder.BasicConfigurationBuilder; +import org.apache.commons.configuration2.builder.BuilderEventListenerImpl; +import org.apache.commons.configuration2.builder.ConfigurationBuilder; +import org.apache.commons.configuration2.builder.ConfigurationBuilderEvent; +import org.apache.commons.configuration2.builder.CopyObjectDefaultHandler; +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.PropertiesBuilderParametersImpl; +import org.apache.commons.configuration2.builder.ReloadingFileBasedConfigurationBuilder; +import org.apache.commons.configuration2.builder.XMLBuilderParametersImpl; +import org.apache.commons.configuration2.builder.XMLBuilderProperties; +import org.apache.commons.configuration2.builder.fluent.CombinedBuilderParameters; +import org.apache.commons.configuration2.builder.fluent.FileBasedBuilderParameters; +import org.apache.commons.configuration2.builder.fluent.Parameters; +import org.apache.commons.configuration2.builder.fluent.XMLBuilderParameters; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.convert.ListDelimiterHandler; +import org.apache.commons.configuration2.event.ConfigurationEvent; +import org.apache.commons.configuration2.event.Event; +import org.apache.commons.configuration2.event.EventListener; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration2.interpol.Lookup; +import org.apache.commons.configuration2.io.DefaultFileSystem; +import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration2.io.FileLocatorUtils; +import org.apache.commons.configuration2.io.FileSystem; +import org.apache.commons.configuration2.reloading.ReloadingController; +import org.apache.commons.configuration2.reloading.ReloadingControllerSupport; +import org.apache.commons.configuration2.resolver.CatalogResolver; +import org.apache.commons.configuration2.tree.DefaultExpressionEngine; +import org.apache.commons.configuration2.tree.DefaultExpressionEngineSymbols; +import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -435,7 +435,7 @@ private BasicConfigurationBuilder
        diff --git a/src/test/resources/testCCEntityResolver.xml b/src/test/resources/testCCEntityResolver.xml index a412eafcee..90be8b37c9 100644 --- a/src/test/resources/testCCEntityResolver.xml +++ b/src/test/resources/testCCEntityResolver.xml @@ -22,7 +22,7 @@
        + config-class="org.apache.commons.configuration2.builder.combined.TestCombinedConfigurationBuilder$EntityResolverWithPropertiesTestImpl"/>
        diff --git a/src/test/resources/testCCFileSystem.xml b/src/test/resources/testCCFileSystem.xml index d1f1a59d4b..a54c69915d 100644 --- a/src/test/resources/testCCFileSystem.xml +++ b/src/test/resources/testCCFileSystem.xml @@ -22,7 +22,7 @@
        + config-class="org.apache.commons.configuration2.builder.combined.TestCombinedConfigurationBuilder$FileSystemTestImpl"/>
        diff --git a/src/test/resources/testCCFileSystemSubConfig.xml b/src/test/resources/testCCFileSystemSubConfig.xml index 87ddac3c7b..330606df13 100644 --- a/src/test/resources/testCCFileSystemSubConfig.xml +++ b/src/test/resources/testCCFileSystemSubConfig.xml @@ -22,10 +22,10 @@
        + config-class="org.apache.commons.configuration2.io.DefaultFileSystem"/>
        + config-class="org.apache.commons.configuration2.builder.combined.TestCombinedConfigurationBuilder$FileSystemTestImpl"/>         diff --git a/src/test/resources/testCCLookup.xml b/src/test/resources/testCCLookup.xml index 96b559da94..99a73b7dcd 100644 --- a/src/test/resources/testCCLookup.xml +++ b/src/test/resources/testCCLookup.xml @@ -23,7 +23,7 @@
        + config-class="org.apache.commons.configuration2.builder.combined.TestCombinedConfigurationBuilder$TestLookup"/>
        diff --git a/src/test/resources/testCCMultiTenent.xml b/src/test/resources/testCCMultiTenent.xml index 723b56f717..66c6e6ad90 100644 --- a/src/test/resources/testCCMultiTenent.xml +++ b/src/test/resources/testCCMultiTenent.xml @@ -22,9 +22,9 @@
        - +
        @@ -32,12 +32,12 @@ config-name="clientConfig" schemaValidation="false" config-optional="true" config-forceCreate="true"> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/>         \ No newline at end of file diff --git a/src/test/resources/testCCMultiTenentReloading.xml b/src/test/resources/testCCMultiTenentReloading.xml index 00f580d111..342103a038 100644 --- a/src/test/resources/testCCMultiTenentReloading.xml +++ b/src/test/resources/testCCMultiTenentReloading.xml @@ -21,7 +21,7 @@
        + config-class="org.apache.commons.configuration2.DynamicCombinedConfiguration">
        diff --git a/src/test/resources/testCCResultClass.xml b/src/test/resources/testCCResultClass.xml index 51815fa66b..8103c4c1c3 100644 --- a/src/test/resources/testCCResultClass.xml +++ b/src/test/resources/testCCResultClass.xml @@ -22,8 +22,8 @@
        - + config-class="org.apache.commons.configuration2.builder.combined.TestCombinedConfigurationBuilder$CombinedConfigurationTestImpl"> +
        diff --git a/src/test/resources/testCCResultInitialization.xml b/src/test/resources/testCCResultInitialization.xml index 1b5d5beecd..7e6707ef32 100644 --- a/src/test/resources/testCCResultInitialization.xml +++ b/src/test/resources/testCCResultInitialization.xml @@ -22,11 +22,11 @@
        + config-class="org.apache.commons.configuration2.convert.DefaultListDelimiterHandler"> - - + + diff --git a/src/test/resources/testComplexInitialization.xml b/src/test/resources/testComplexInitialization.xml index 7c3d081e58..c22f8157d5 100644 --- a/src/test/resources/testComplexInitialization.xml +++ b/src/test/resources/testComplexInitialization.xml @@ -20,8 +20,8 @@
        - - + + @@ -35,12 +35,12 @@ - - diff --git a/src/test/resources/testConfigurationInterpolatorUpdate.xml b/src/test/resources/testConfigurationInterpolatorUpdate.xml index a91937f448..b830b45a0e 100644 --- a/src/test/resources/testConfigurationInterpolatorUpdate.xml +++ b/src/test/resources/testConfigurationInterpolatorUpdate.xml @@ -19,13 +19,13 @@
        - - + + + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$XMLConfigurationProvider" + configurationClass="org.apache.commons.configuration2.TestDefaultConfigurationBuilder$ExtendedXMLConfiguration"/> @@ -39,12 +39,12 @@ - - diff --git a/src/test/resources/testConfigurationProvider.xml b/src/test/resources/testConfigurationProvider.xml index 7e780ad50b..b9cdf9f2fd 100644 --- a/src/test/resources/testConfigurationProvider.xml +++ b/src/test/resources/testConfigurationProvider.xml @@ -19,12 +19,12 @@
        - - + + + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$FileConfigurationProvider"/> @@ -38,12 +38,12 @@ - - diff --git a/src/test/resources/testDigesterCreateObject.xml b/src/test/resources/testDigesterCreateObject.xml index e7db993ca3..67851f1721 100644 --- a/src/test/resources/testDigesterCreateObject.xml +++ b/src/test/resources/testDigesterCreateObject.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/test/resources/testExpression.xml b/src/test/resources/testExpression.xml index dbf3fdeda8..47074e26b2 100644 --- a/src/test/resources/testExpression.xml +++ b/src/test/resources/testExpression.xml @@ -19,16 +19,16 @@
        - + + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> - + + config-class="org.apache.commons.configuration2.interpol.ExprLookup"> @@ -37,20 +37,20 @@ + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration2.MultiFileHierarchicalConfiguration"/>
        + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/>         \ No newline at end of file diff --git a/src/test/resources/testExtendedClass.xml b/src/test/resources/testExtendedClass.xml index 5e7f0b0682..5c83539fd7 100644 --- a/src/test/resources/testExtendedClass.xml +++ b/src/test/resources/testExtendedClass.xml @@ -19,9 +19,9 @@
        - - + config-class="org.apache.commons.configuration2.TestDefaultConfigurationBuilder$ExtendedCombinedConfiguration"> + + @@ -35,12 +35,12 @@ - - diff --git a/src/test/resources/testExtendedXMLConfigurationProvider.xml b/src/test/resources/testExtendedXMLConfigurationProvider.xml index a91937f448..b830b45a0e 100644 --- a/src/test/resources/testExtendedXMLConfigurationProvider.xml +++ b/src/test/resources/testExtendedXMLConfigurationProvider.xml @@ -19,13 +19,13 @@
        - - + + + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$XMLConfigurationProvider" + configurationClass="org.apache.commons.configuration2.TestDefaultConfigurationBuilder$ExtendedXMLConfiguration"/> @@ -39,12 +39,12 @@ - - diff --git a/src/test/resources/testFileReloadConfigurationBuilder.xml b/src/test/resources/testFileReloadConfigurationBuilder.xml index bb0b906cd8..96cf65aac5 100644 --- a/src/test/resources/testFileReloadConfigurationBuilder.xml +++ b/src/test/resources/testFileReloadConfigurationBuilder.xml @@ -19,33 +19,33 @@
        - + + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> - + + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration2.MultiFileHierarchicalConfiguration"/>
        + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.reloading.VFSFileChangedReloadingStrategy"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.reloading.VFSFileChangedReloadingStrategy"/>         \ No newline at end of file diff --git a/src/test/resources/testFileReloadConfigurationBuilder2.xml b/src/test/resources/testFileReloadConfigurationBuilder2.xml index d063ec58d1..5332973e5d 100644 --- a/src/test/resources/testFileReloadConfigurationBuilder2.xml +++ b/src/test/resources/testFileReloadConfigurationBuilder2.xml @@ -19,33 +19,33 @@
        - + + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> - + + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration2.MultiFileHierarchicalConfiguration"/>
        + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.reloading.VFSFileChangedReloadingStrategy"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.reloading.VFSFileChangedReloadingStrategy"/>         \ No newline at end of file diff --git a/src/test/resources/testFileSystem.xml b/src/test/resources/testFileSystem.xml index 62d8a3d022..9d321932e7 100644 --- a/src/test/resources/testFileSystem.xml +++ b/src/test/resources/testFileSystem.xml @@ -19,13 +19,13 @@
        - - + + - + + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$FileConfigurationProvider"/> @@ -39,12 +39,12 @@ - - diff --git a/src/test/resources/testGlobalLookup.xml b/src/test/resources/testGlobalLookup.xml index c1c21aef6b..ba37d8cf33 100644 --- a/src/test/resources/testGlobalLookup.xml +++ b/src/test/resources/testGlobalLookup.xml @@ -19,12 +19,12 @@
        - - + + + config-class="org.apache.commons.configuration2.TestDefaultConfigurationBuilder$TestLookup"/> @@ -38,12 +38,12 @@ - - diff --git a/src/test/resources/testInterpolationBuilder.xml b/src/test/resources/testInterpolationBuilder.xml index 4837ff77a9..19c3dac26b 100644 --- a/src/test/resources/testInterpolationBuilder.xml +++ b/src/test/resources/testInterpolationBuilder.xml @@ -25,6 +25,6 @@ - + diff --git a/src/test/resources/testMultiTenentConfigurationBuilder.xml b/src/test/resources/testMultiTenentConfigurationBuilder.xml index 69e7e8dd28..59ef5e309b 100644 --- a/src/test/resources/testMultiTenentConfigurationBuilder.xml +++ b/src/test/resources/testMultiTenentConfigurationBuilder.xml @@ -19,28 +19,28 @@
        - + + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration2.MultiFileHierarchicalConfiguration"/>
        + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/>         \ No newline at end of file diff --git a/src/test/resources/testMultiTenentConfigurationBuilder2.xml b/src/test/resources/testMultiTenentConfigurationBuilder2.xml index 8a087788b7..8078a15cb9 100644 --- a/src/test/resources/testMultiTenentConfigurationBuilder2.xml +++ b/src/test/resources/testMultiTenentConfigurationBuilder2.xml @@ -19,33 +19,33 @@
        - + + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration2.MultiFileHierarchicalConfiguration"/>
        + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.reloading.FileChangedReloadingStrategy"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.reloading.FileChangedReloadingStrategy"/>         \ No newline at end of file diff --git a/src/test/resources/testMultiTenentConfigurationBuilder3.xml b/src/test/resources/testMultiTenentConfigurationBuilder3.xml index 071a505381..e1d79c0f15 100644 --- a/src/test/resources/testMultiTenentConfigurationBuilder3.xml +++ b/src/test/resources/testMultiTenentConfigurationBuilder3.xml @@ -19,33 +19,33 @@
        - + + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration2.MultiFileHierarchicalConfiguration"/>
        + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.reloading.FileChangedReloadingStrategy"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.reloading.FileChangedReloadingStrategy"/>         \ No newline at end of file diff --git a/src/test/resources/testMultiTenentConfigurationBuilder4.xml b/src/test/resources/testMultiTenentConfigurationBuilder4.xml index faf9c612ee..d4ace8e8f3 100644 --- a/src/test/resources/testMultiTenentConfigurationBuilder4.xml +++ b/src/test/resources/testMultiTenentConfigurationBuilder4.xml @@ -20,15 +20,15 @@
        - + + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.TestDynamicCombinedConfiguration$ThreadLookup"/>
        @@ -38,12 +38,12 @@ config-forceCreate="true" schemaValidation="true"> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/>         \ No newline at end of file diff --git a/src/test/resources/testMultiTenentConfigurationBuilder5.xml b/src/test/resources/testMultiTenentConfigurationBuilder5.xml index 8b78c4bd21..a9ffae65bd 100644 --- a/src/test/resources/testMultiTenentConfigurationBuilder5.xml +++ b/src/test/resources/testMultiTenentConfigurationBuilder5.xml @@ -22,11 +22,11 @@
        - + + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/>
        @@ -35,13 +35,13 @@ config-name="clientConfig" config-optional="true" config-forceCreate="true" schemaValidation="false"> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/>         diff --git a/src/test/resources/testSystemProperties.xml b/src/test/resources/testSystemProperties.xml index 3ad677604f..8f36f3eae3 100644 --- a/src/test/resources/testSystemProperties.xml +++ b/src/test/resources/testSystemProperties.xml @@ -19,14 +19,14 @@
        - - + +
        -         \ No newline at end of file diff --git a/src/test/resources/testVFSMultiTenentConfigurationBuilder1.xml b/src/test/resources/testVFSMultiTenentConfigurationBuilder1.xml index 5e66bd278a..d0a2a76fb2 100644 --- a/src/test/resources/testVFSMultiTenentConfigurationBuilder1.xml +++ b/src/test/resources/testVFSMultiTenentConfigurationBuilder1.xml @@ -19,34 +19,34 @@
        - + + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> - + + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration2.MultiFileHierarchicalConfiguration"/>
        + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.reloading.VFSFileChangedReloadingStrategy"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.reloading.VFSFileChangedReloadingStrategy"/>         \ No newline at end of file diff --git a/src/test/resources/testVFSMultiTenentConfigurationBuilder2.xml b/src/test/resources/testVFSMultiTenentConfigurationBuilder2.xml index e76eb8ae01..4fcef32c45 100644 --- a/src/test/resources/testVFSMultiTenentConfigurationBuilder2.xml +++ b/src/test/resources/testVFSMultiTenentConfigurationBuilder2.xml @@ -19,34 +19,34 @@
        - + + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> - + + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration2.MultiFileHierarchicalConfiguration"/>
        + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.reloading.VFSFileChangedReloadingStrategy"/> + config-class="org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine"/> + config-class="org.apache.commons.configuration2.reloading.VFSFileChangedReloadingStrategy"/>         \ No newline at end of file diff --git a/src/test/resources/testValidation.xml b/src/test/resources/testValidation.xml index d6ed4e0caa..13b2158b99 100644 --- a/src/test/resources/testValidation.xml +++ b/src/test/resources/testValidation.xml @@ -19,8 +19,8 @@
        - - + +
        diff --git a/src/test/resources/testValidation2.xml b/src/test/resources/testValidation2.xml index 42c7f72070..e7ea005dd6 100644 --- a/src/test/resources/testValidation2.xml +++ b/src/test/resources/testValidation2.xml @@ -19,8 +19,8 @@
        - - + +
        diff --git a/src/test/resources/testValidation3.xml b/src/test/resources/testValidation3.xml index b4e4e31a22..df8f4316d3 100644 --- a/src/test/resources/testValidation3.xml +++ b/src/test/resources/testValidation3.xml @@ -19,15 +19,15 @@
        - - + + + config-class="org.apache.commons.configuration2.DefaultConfigurationBuilder$FileConfigurationProvider" + configurationClass="org.apache.commons.configuration2.MultiFileHierarchicalConfiguration"/>
        From d901ed77c5253a9f9fa54c5469d2c45212cef560 Mon Sep 17 00:00:00 2001 From: dockxm Date: Tue, 19 Mar 2024 08:13:21 +0100 Subject: [PATCH 4/4] CONFIGURATION-836: v3.0.0-SNAPSHOT --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 08a0d7ad45..bc6b07e6bb 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 4.0.0 commons-configuration2 - 2.10.1-SNAPSHOT + 3.0.0-SNAPSHOT Apache Commons Configuration 2001 @@ -571,7 +571,7 @@ false - 2.9.0 + 3.0.0-SNAPSHOT RC1 true scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}