Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/BaseEventSource.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/BaseEventSource.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/BaseEventSource.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/BaseEventSource.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.event; +package org.apache.commons.configuration2.event; import java.util.Collection; import java.util.Collections; @@ -48,7 +48,7 @@ import java.util.List; * 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.configuration.BaseHierarchicalConfiguration + * {@link org.apache.commons.configuration2.BaseHierarchicalConfiguration * BaseHierarchicalConfiguration} for instance has a custom implementation of * {@code setProperty()}, which does not generate any detail events. * </p>
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/ConfigurationErrorEvent.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/ConfigurationErrorEvent.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/ConfigurationErrorEvent.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/ConfigurationErrorEvent.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.event; +package org.apache.commons.configuration2.event; /** * <p> @@ -23,8 +23,8 @@ package org.apache.commons.configuration * </p> * <p> * Some configuration implementations (e.g. - * {@link org.apache.commons.configuration.DatabaseConfiguration} or - * {@link org.apache.commons.configuration.JNDIConfiguration} use an underlying + * {@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 Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/ConfigurationEvent.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/ConfigurationEvent.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/ConfigurationEvent.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/ConfigurationEvent.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.event; +package org.apache.commons.configuration2.event; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/Event.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/Event.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/Event.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/Event.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.event; +package org.apache.commons.configuration2.event; import java.util.EventObject; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/EventListener.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/EventListener.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/EventListener.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/EventListener.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.event; +package org.apache.commons.configuration2.event; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/EventListenerList.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/EventListenerList.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/EventListenerList.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/EventListenerList.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.event; +package org.apache.commons.configuration2.event; import java.util.Collections; import java.util.HashMap; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/EventListenerRegistrationData.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/EventListenerRegistrationData.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/EventListenerRegistrationData.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/EventListenerRegistrationData.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.event; +package org.apache.commons.configuration2.event; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/EventSource.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/EventSource.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/EventSource.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/EventSource.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.event; +package org.apache.commons.configuration2.event; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/EventType.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/EventType.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/EventType.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/EventType.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.event; +package org.apache.commons.configuration2.event; import java.util.HashSet; import java.util.Set; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/package-info.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/package-info.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/package-info.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/event/package-info.java Fri Sep 12 18:04:36 2014 @@ -23,4 +23,4 @@ * * @version $Id$ */ -package org.apache.commons.configuration.event; +package org.apache.commons.configuration2.event; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ex/ConfigurationException.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ex/ConfigurationException.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ex/ConfigurationException.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ex/ConfigurationException.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration.ex; +package org.apache.commons.configuration2.ex; /** Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ex/ConfigurationRuntimeException.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ex/ConfigurationRuntimeException.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ex/ConfigurationRuntimeException.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ex/ConfigurationRuntimeException.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration.ex; +package org.apache.commons.configuration2.ex; /** Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ex/ConversionException.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ex/ConversionException.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ex/ConversionException.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ex/ConversionException.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration.ex; +package org.apache.commons.configuration2.ex; /** Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ex/package-info.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ex/package-info.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ex/package-info.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/ex/package-info.java Fri Sep 12 18:04:36 2014 @@ -27,4 +27,4 @@ * * @version $Id$ */ -package org.apache.commons.configuration.ex; +package org.apache.commons.configuration2.ex; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.interpol; +package org.apache.commons.configuration2.interpol; import java.util.ArrayList; import java.util.Collection; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/ConstantLookup.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/ConstantLookup.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/ConstantLookup.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/ConstantLookup.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.interpol; +package org.apache.commons.configuration2.interpol; import java.lang.reflect.Field; import java.util.HashMap; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/DefaultLookups.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/DefaultLookups.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/DefaultLookups.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/DefaultLookups.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.interpol; +package org.apache.commons.configuration2.interpol; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/DummyLookup.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/DummyLookup.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/DummyLookup.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/DummyLookup.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.interpol; +package org.apache.commons.configuration2.interpol; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/EnvironmentLookup.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/EnvironmentLookup.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/EnvironmentLookup.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/EnvironmentLookup.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.interpol; +package org.apache.commons.configuration2.interpol; /** Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java Fri Sep 12 18:04:36 2014 @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.interpol; +package org.apache.commons.configuration2.interpol; import java.util.ArrayList; -import org.apache.commons.configuration.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; import org.apache.commons.jexl2.Expression; import org.apache.commons.jexl2.JexlContext; import org.apache.commons.jexl2.JexlEngine; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/InterpolatorSpecification.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/InterpolatorSpecification.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/InterpolatorSpecification.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/InterpolatorSpecification.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.interpol; +package org.apache.commons.configuration2.interpol; import java.util.ArrayList; import java.util.Collection; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/Lookup.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/Lookup.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/Lookup.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/Lookup.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.interpol; +package org.apache.commons.configuration2.interpol; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/SystemPropertiesLookup.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/SystemPropertiesLookup.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/SystemPropertiesLookup.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/SystemPropertiesLookup.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.interpol; +package org.apache.commons.configuration2.interpol; import org.apache.commons.lang3.text.StrLookup; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/package-info.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/package-info.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/package-info.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/interpol/package-info.java Fri Sep 12 18:04:36 2014 @@ -22,4 +22,4 @@ * * @version $Id$ */ -package org.apache.commons.configuration.interpol; +package org.apache.commons.configuration2.interpol; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/AbsoluteNameLocationStrategy.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/AbsoluteNameLocationStrategy.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/AbsoluteNameLocationStrategy.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/AbsoluteNameLocationStrategy.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.io; +package org.apache.commons.configuration2.io; import java.io.File; import java.net.URL; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/BasePathLocationStrategy.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/BasePathLocationStrategy.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/BasePathLocationStrategy.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/BasePathLocationStrategy.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.io; +package org.apache.commons.configuration2.io; import java.io.File; import java.net.URL; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/ClasspathLocationStrategy.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/ClasspathLocationStrategy.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/ClasspathLocationStrategy.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/ClasspathLocationStrategy.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.io; +package org.apache.commons.configuration2.io; import java.net.URL; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/CombinedLocationStrategy.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/CombinedLocationStrategy.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/CombinedLocationStrategy.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/CombinedLocationStrategy.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.io; +package org.apache.commons.configuration2.io; import java.net.URL; import java.util.ArrayList; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.io; +package org.apache.commons.configuration2.io; import java.io.File; import java.io.FileNotFoundException; @@ -27,7 +27,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; -import org.apache.commons.configuration.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationException; /** * FileSystem that uses java.io.File or HttpClient Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileBased.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileBased.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileBased.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileBased.java Fri Sep 12 18:04:36 2014 @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.io; +package org.apache.commons.configuration2.io; import java.io.IOException; import java.io.Reader; import java.io.Writer; -import org.apache.commons.configuration.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationException; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileHandler.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileHandler.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileHandler.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileHandler.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.io; +package org.apache.commons.configuration2.io; import java.io.Closeable; import java.io.File; @@ -33,12 +33,12 @@ import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicReference; -import org.apache.commons.configuration.ex.ConfigurationException; -import org.apache.commons.configuration.io.FileLocator.FileLocatorBuilder; -import org.apache.commons.configuration.sync.LockMode; -import org.apache.commons.configuration.sync.NoOpSynchronizer; -import org.apache.commons.configuration.sync.Synchronizer; -import org.apache.commons.configuration.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; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileHandlerListener.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileHandlerListener.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileHandlerListener.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileHandlerListener.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.io; +package org.apache.commons.configuration2.io; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileHandlerListenerAdapter.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileHandlerListenerAdapter.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileHandlerListenerAdapter.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileHandlerListenerAdapter.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.io; +package org.apache.commons.configuration2.io; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileLocationStrategy.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileLocationStrategy.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileLocationStrategy.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileLocationStrategy.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.io; +package org.apache.commons.configuration2.io; import java.net.URL; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileLocator.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileLocator.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileLocator.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileLocator.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.io; +package org.apache.commons.configuration2.io; import java.net.URL; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileLocatorAware.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileLocatorAware.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileLocatorAware.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileLocatorAware.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.io; +package org.apache.commons.configuration2.io; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.io; +package org.apache.commons.configuration2.io; import java.io.File; import java.net.MalformedURLException; @@ -23,7 +23,7 @@ import java.net.URL; import java.util.Arrays; import java.util.Map; -import org.apache.commons.configuration.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; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileOptionsProvider.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileOptionsProvider.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileOptionsProvider.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileOptionsProvider.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.io; +package org.apache.commons.configuration2.io; import java.util.Map; @@ -24,7 +24,7 @@ import java.util.Map; * @since 1.7 * @author <a * href="http://commons.apache.org/configuration/team-list.html">Commons Configuration team</a> - * @version $Id:$ + * @version $Id$ */ public interface FileOptionsProvider { Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileSystem.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileSystem.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileSystem.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileSystem.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.io; +package org.apache.commons.configuration2.io; import java.io.File; import java.io.InputStream; @@ -22,7 +22,7 @@ import java.io.OutputStream; import java.net.MalformedURLException; import java.net.URL; -import org.apache.commons.configuration.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.commons.logging.Log; import org.apache.commons.logging.impl.NoOpLog; @@ -31,7 +31,7 @@ import org.apache.commons.logging.impl.N * @since 1.7 * @author <a * href="http://commons.apache.org/configuration/team-list.html">Commons Configuration team</a> - * @version $Id:$ + * @version $Id$ */ public abstract class FileSystem { Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileSystemLocationStrategy.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileSystemLocationStrategy.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileSystemLocationStrategy.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileSystemLocationStrategy.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.io; +package org.apache.commons.configuration2.io; import java.net.URL; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileUtils.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileUtils.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileUtils.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/FileUtils.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.io; +package org.apache.commons.configuration2.io; import java.io.File; import java.net.URL; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/HomeDirectoryLocationStrategy.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/HomeDirectoryLocationStrategy.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/HomeDirectoryLocationStrategy.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/HomeDirectoryLocationStrategy.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.io; +package org.apache.commons.configuration2.io; import java.io.File; import java.net.URL; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/InputStreamSupport.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/InputStreamSupport.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/InputStreamSupport.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/InputStreamSupport.java Fri Sep 12 18:04:36 2014 @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.io; +package org.apache.commons.configuration2.io; import java.io.IOException; import java.io.InputStream; -import org.apache.commons.configuration.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationException; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/ProvidedURLLocationStrategy.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/ProvidedURLLocationStrategy.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/ProvidedURLLocationStrategy.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/ProvidedURLLocationStrategy.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.io; +package org.apache.commons.configuration2.io; import java.net.URL; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/VFSFileSystem.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/VFSFileSystem.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/VFSFileSystem.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/VFSFileSystem.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.io; +package org.apache.commons.configuration2.io; import java.io.File; import java.io.IOException; @@ -27,8 +27,8 @@ import java.net.URLConnection; import java.net.URLStreamHandler; import java.util.Map; -import org.apache.commons.configuration.ex.ConfigurationException; -import org.apache.commons.configuration.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; import org.apache.commons.vfs2.FileContent; import org.apache.commons.vfs2.FileName; import org.apache.commons.vfs2.FileObject; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/VerifiableOutputStream.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/VerifiableOutputStream.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/VerifiableOutputStream.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/VerifiableOutputStream.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.io; +package org.apache.commons.configuration2.io; import java.io.IOException; import java.io.OutputStream; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/package-info.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/package-info.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/package-info.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/io/package-info.java Fri Sep 12 18:04:36 2014 @@ -30,4 +30,4 @@ * * @version $Id$ */ -package org.apache.commons.configuration.io; +package org.apache.commons.configuration2.io; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/package-info.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/package-info.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/package-info.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/package-info.java Fri Sep 12 18:04:36 2014 @@ -25,4 +25,4 @@ * * @version $Id$ */ -package org.apache.commons.configuration; +package org.apache.commons.configuration2; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration.plist; +package org.apache.commons.configuration2.plist; import java.io.PrintWriter; import java.io.Reader; @@ -30,15 +30,15 @@ import java.util.Map; import java.util.TimeZone; import org.apache.commons.codec.binary.Hex; -import org.apache.commons.configuration.BaseHierarchicalConfiguration; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.FileBasedConfiguration; -import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.configuration.MapConfiguration; -import org.apache.commons.configuration.ex.ConfigurationException; -import org.apache.commons.configuration.tree.ImmutableNode; -import org.apache.commons.configuration.tree.InMemoryNodeModel; -import org.apache.commons.configuration.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.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; /** Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration.plist; +package org.apache.commons.configuration2.plist; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; @@ -39,16 +39,16 @@ import java.util.Map; import java.util.TimeZone; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.configuration.BaseHierarchicalConfiguration; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.FileBasedConfiguration; -import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.configuration.MapConfiguration; -import org.apache.commons.configuration.ex.ConfigurationException; -import org.apache.commons.configuration.io.FileLocator; -import org.apache.commons.configuration.io.FileLocatorAware; -import org.apache.commons.configuration.tree.ImmutableNode; -import org.apache.commons.configuration.tree.InMemoryNodeModel; +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.MapConfiguration; +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.configuration2.tree.ImmutableNode; +import org.apache.commons.configuration2.tree.InMemoryNodeModel; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.xml.sax.Attributes; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/plist/package-info.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/plist/package-info.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/plist/package-info.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/plist/package-info.java Fri Sep 12 18:04:36 2014 @@ -22,4 +22,4 @@ * * @version $Id$ */ -package org.apache.commons.configuration.plist; +package org.apache.commons.configuration2.plist; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/CombinedReloadingController.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/CombinedReloadingController.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/CombinedReloadingController.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/CombinedReloadingController.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.reloading; +package org.apache.commons.configuration2.reloading; import java.util.ArrayList; import java.util.Collection; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java Fri Sep 12 18:04:36 2014 @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.reloading; +package org.apache.commons.configuration2.reloading; import java.io.File; import java.net.MalformedURLException; import java.net.URL; -import org.apache.commons.configuration.io.FileHandler; -import org.apache.commons.configuration.io.FileLocatorUtils; +import org.apache.commons.configuration2.io.FileHandler; +import org.apache.commons.configuration2.io.FileLocatorUtils; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingDetector.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingDetector.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingDetector.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingDetector.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration.reloading; +package org.apache.commons.configuration2.reloading; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -63,7 +63,7 @@ public class ManagedReloadingDetector im * refreshed. This method will typically be called from outside (through an * exposed MBean) on behalf of an administrator. * - * @see org.apache.commons.configuration.reloading.ManagedReloadingDetectorMBean#refresh() + * @see org.apache.commons.configuration2.reloading.ManagedReloadingDetectorMBean#refresh() */ @Override public void refresh() Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingDetectorMBean.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingDetectorMBean.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingDetectorMBean.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingDetectorMBean.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration.reloading; +package org.apache.commons.configuration2.reloading; /** * MBean definition for managing configuration reload. Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/PeriodicReloadingTrigger.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/PeriodicReloadingTrigger.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/PeriodicReloadingTrigger.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/PeriodicReloadingTrigger.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.reloading; +package org.apache.commons.configuration2.reloading; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/ReloadingController.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/ReloadingController.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/ReloadingController.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/ReloadingController.java Fri Sep 12 18:04:36 2014 @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.reloading; +package org.apache.commons.configuration2.reloading; -import org.apache.commons.configuration.event.Event; -import org.apache.commons.configuration.event.EventListener; -import org.apache.commons.configuration.event.EventListenerList; -import org.apache.commons.configuration.event.EventSource; -import org.apache.commons.configuration.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; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/ReloadingControllerSupport.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/ReloadingControllerSupport.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/ReloadingControllerSupport.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/ReloadingControllerSupport.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.reloading; +package org.apache.commons.configuration2.reloading; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/ReloadingDetector.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/ReloadingDetector.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/ReloadingDetector.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/ReloadingDetector.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.reloading; +package org.apache.commons.configuration2.reloading; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/ReloadingEvent.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/ReloadingEvent.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/ReloadingEvent.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/ReloadingEvent.java Fri Sep 12 18:04:36 2014 @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.reloading; +package org.apache.commons.configuration2.reloading; -import org.apache.commons.configuration.event.Event; -import org.apache.commons.configuration.event.EventType; +import org.apache.commons.configuration2.event.Event; +import org.apache.commons.configuration2.event.EventType; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/VFSFileHandlerReloadingDetector.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/VFSFileHandlerReloadingDetector.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/VFSFileHandlerReloadingDetector.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/VFSFileHandlerReloadingDetector.java Fri Sep 12 18:04:36 2014 @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.configuration.reloading; +package org.apache.commons.configuration2.reloading; -import org.apache.commons.configuration.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration.io.FileHandler; -import org.apache.commons.configuration.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; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/package-info.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/package-info.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/package-info.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/reloading/package-info.java Fri Sep 12 18:04:36 2014 @@ -28,4 +28,4 @@ * * @version $Id$ */ -package org.apache.commons.configuration.reloading; +package org.apache.commons.configuration2.reloading; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.resolver; +package org.apache.commons.configuration2.resolver; import java.io.IOException; import java.io.InputStream; @@ -23,11 +23,11 @@ import java.net.URL; import java.net.URLConnection; import java.util.Vector; -import org.apache.commons.configuration.ex.ConfigurationException; -import org.apache.commons.configuration.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration.io.FileLocator; -import org.apache.commons.configuration.io.FileLocatorUtils; -import org.apache.commons.configuration.io.FileSystem; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration2.io.FileLocator; +import org.apache.commons.configuration2.io.FileLocatorUtils; +import org.apache.commons.configuration2.io.FileSystem; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.xml.resolver.CatalogException; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/resolver/DefaultEntityResolver.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/resolver/DefaultEntityResolver.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/resolver/DefaultEntityResolver.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/resolver/DefaultEntityResolver.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.resolver; +package org.apache.commons.configuration2.resolver; import java.io.IOException; import java.io.InputStream; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/resolver/EntityRegistry.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/resolver/EntityRegistry.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/resolver/EntityRegistry.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/resolver/EntityRegistry.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.resolver; +package org.apache.commons.configuration2.resolver; import java.net.URL; import java.util.Map; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/resolver/EntityResolverSupport.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/resolver/EntityResolverSupport.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/resolver/EntityResolverSupport.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/resolver/EntityResolverSupport.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.resolver; +package org.apache.commons.configuration2.resolver; import org.xml.sax.EntityResolver; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/resolver/package-info.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/resolver/package-info.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/resolver/package-info.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/resolver/package-info.java Fri Sep 12 18:04:36 2014 @@ -22,4 +22,4 @@ * * @version $Id$ */ -package org.apache.commons.configuration.resolver; +package org.apache.commons.configuration2.resolver; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/sync/LockMode.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/sync/LockMode.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/sync/LockMode.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/sync/LockMode.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.sync; +package org.apache.commons.configuration2.sync; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/sync/NoOpSynchronizer.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/sync/NoOpSynchronizer.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/sync/NoOpSynchronizer.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/sync/NoOpSynchronizer.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.sync; +package org.apache.commons.configuration2.sync; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/sync/ReadWriteSynchronizer.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/sync/ReadWriteSynchronizer.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/sync/ReadWriteSynchronizer.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/sync/ReadWriteSynchronizer.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.sync; +package org.apache.commons.configuration2.sync; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/sync/Synchronizer.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/sync/Synchronizer.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/sync/Synchronizer.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/sync/Synchronizer.java Fri Sep 12 18:04:36 2014 @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.sync; +package org.apache.commons.configuration2.sync; -import org.apache.commons.configuration.AbstractConfiguration; +import org.apache.commons.configuration2.AbstractConfiguration; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/sync/SynchronizerSupport.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/sync/SynchronizerSupport.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/sync/SynchronizerSupport.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/sync/SynchronizerSupport.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.sync; +package org.apache.commons.configuration2.sync; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/sync/package-info.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/sync/package-info.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/sync/package-info.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/sync/package-info.java Fri Sep 12 18:04:36 2014 @@ -34,4 +34,4 @@ * * @version $Id$ */ -package org.apache.commons.configuration.sync; +package org.apache.commons.configuration2.sync; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.tree; +package org.apache.commons.configuration2.tree; import java.util.ArrayList; import java.util.Collections; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitor.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitor.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitor.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitor.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.tree; +package org.apache.commons.configuration2.tree; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitorAdapter.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitorAdapter.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitorAdapter.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitorAdapter.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.tree; +package org.apache.commons.configuration2.tree; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.tree; +package org.apache.commons.configuration2.tree; import java.util.Iterator; import java.util.NoSuchElementException; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java Fri Sep 12 18:04:36 2014 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.configuration.tree; +package org.apache.commons.configuration2.tree; import java.util.Collection; import java.util.LinkedList;
