Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngineSymbols.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngineSymbols.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngineSymbols.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngineSymbols.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 org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder;
Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ExpressionEngine.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ExpressionEngine.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ExpressionEngine.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ExpressionEngine.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.List; @@ -74,7 +74,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.configuration.Configuration#getKeys() + * {@link org.apache.commons.configuration2.Configuration#getKeys() * getKeys()} method. * * @param <T> the type of the node to be processed Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.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.Collection; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.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.Collection; @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; -import org.apache.commons.configuration.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; import org.apache.commons.lang3.mutable.Mutable; import org.apache.commons.lang3.mutable.MutableObject; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModelSupport.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModelSupport.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModelSupport.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModelSupport.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/MergeCombiner.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/MergeCombiner.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.HashMap; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.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.Collection; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeAddData.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeAddData.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeAddData.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeAddData.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.Collection; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeCombiner.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeCombiner.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeCombiner.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeCombiner.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.Collections; import java.util.HashSet; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeHandler.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeHandler.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeHandler.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeHandler.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.List; import java.util.Set; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeHandlerDecorator.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeHandlerDecorator.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeHandlerDecorator.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeHandlerDecorator.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.List; import java.util.Set; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeKeyResolver.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeKeyResolver.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeKeyResolver.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeKeyResolver.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.List; import java.util.Map; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeModel.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeModel.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeModel.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeModel.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; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeModelSupport.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeModelSupport.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeModelSupport.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeModelSupport.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/NodeSelector.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeSelector.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeSelector.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeSelector.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/NodeTracker.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.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.Collections; @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import org.apache.commons.configuration.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; /** * <p> Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeTreeWalker.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeTreeWalker.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeTreeWalker.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeTreeWalker.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.LinkedList; import java.util.List; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeUpdateData.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeUpdateData.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeUpdateData.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/NodeUpdateData.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.Collection; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/OverrideCombiner.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/OverrideCombiner.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/OverrideCombiner.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/OverrideCombiner.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; /** Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/QueryResult.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/QueryResult.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/QueryResult.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/QueryResult.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 org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.EqualsBuilder; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ReferenceNodeHandler.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ReferenceNodeHandler.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ReferenceNodeHandler.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ReferenceNodeHandler.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.List; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ReferenceTracker.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ReferenceTracker.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ReferenceTracker.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/ReferenceTracker.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.Collections; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeHandler.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeHandler.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeHandler.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeHandler.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/TrackedNodeModel.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeModel.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeModel.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/TrackedNodeModel.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.List; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/TreeData.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/TreeData.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/TreeData.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/TreeData.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.HashMap; import java.util.List; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/TreeUtils.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/TreeUtils.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/TreeUtils.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/TreeUtils.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.io.PrintStream; import java.util.Map; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/UnionCombiner.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/UnionCombiner.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/UnionCombiner.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/UnionCombiner.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.LinkedList; import java.util.List; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/package-info.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/package-info.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/package-info.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/package-info.java Fri Sep 12 18:04:36 2014 @@ -22,4 +22,4 @@ * * @version $Id$ */ -package org.apache.commons.configuration.tree; +package org.apache.commons.configuration2.tree; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationAttributePointer.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationAttributePointer.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationAttributePointer.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationAttributePointer.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.tree.xpath; +package org.apache.commons.configuration2.tree.xpath; -import org.apache.commons.configuration.tree.NodeHandler; -import org.apache.commons.configuration.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; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.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.xpath; +package org.apache.commons.configuration2.tree.xpath; import java.util.ArrayList; import java.util.LinkedHashSet; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorBase.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorBase.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorBase.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorBase.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.tree.xpath; +package org.apache.commons.configuration2.tree.xpath; -import org.apache.commons.configuration.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; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.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.xpath; +package org.apache.commons.configuration2.tree.xpath; import java.util.ArrayList; import java.util.Collections; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointer.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointer.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointer.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointer.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.tree.xpath; +package org.apache.commons.configuration2.tree.xpath; import java.util.Locale; -import org.apache.commons.configuration.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; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.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.tree.xpath; +package org.apache.commons.configuration2.tree.xpath; import java.util.Locale; -import org.apache.commons.configuration.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; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathContextFactory.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathContextFactory.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathContextFactory.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathContextFactory.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.tree.xpath; +package org.apache.commons.configuration2.tree.xpath; -import org.apache.commons.configuration.tree.NodeHandler; +import org.apache.commons.configuration2.tree.NodeHandler; import org.apache.commons.jxpath.JXPathContext; /** Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.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.xpath; +package org.apache.commons.configuration2.tree.xpath; import java.util.ArrayList; import java.util.Collections; @@ -22,10 +22,10 @@ import java.util.LinkedList; import java.util.List; import java.util.StringTokenizer; -import org.apache.commons.configuration.tree.ExpressionEngine; -import org.apache.commons.configuration.tree.NodeAddData; -import org.apache.commons.configuration.tree.NodeHandler; -import org.apache.commons.configuration.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; @@ -223,7 +223,7 @@ public class XPathExpressionEngine imple * {@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.configuration.tree.DefaultExpressionEngine + * {@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. Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/package-info.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/package-info.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/package-info.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/tree/xpath/package-info.java Fri Sep 12 18:04:36 2014 @@ -23,4 +23,4 @@ * * @version $Id$ */ -package org.apache.commons.configuration.tree.xpath; +package org.apache.commons.configuration2.tree.xpath; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/AppletConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/AppletConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/AppletConfiguration.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/AppletConfiguration.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration.web; +package org.apache.commons.configuration2.web; import java.applet.Applet; import java.util.Arrays; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/BaseWebConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/BaseWebConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/BaseWebConfiguration.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/BaseWebConfiguration.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.web; +package org.apache.commons.configuration2.web; import java.util.Collection; -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/web/ServletConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/ServletConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/ServletConfiguration.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/ServletConfiguration.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration.web; +package org.apache.commons.configuration2.web; import java.util.Collections; import java.util.Enumeration; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/ServletContextConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/ServletContextConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/ServletContextConfiguration.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/ServletContextConfiguration.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration.web; +package org.apache.commons.configuration2.web; import java.util.Collections; import java.util.Enumeration; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/ServletFilterConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/ServletFilterConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/ServletFilterConfiguration.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/ServletFilterConfiguration.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration.web; +package org.apache.commons.configuration2.web; import java.util.Collections; import java.util.Enumeration; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration.web; +package org.apache.commons.configuration2.web; import java.util.ArrayList; import java.util.Collection; Modified: commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/package-info.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/package-info.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/package-info.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/main/java/org/apache/commons/configuration2/web/package-info.java Fri Sep 12 18:04:36 2014 @@ -23,4 +23,4 @@ * * @version $Id$ */ -package org.apache.commons.configuration.web; +package org.apache.commons.configuration2.web; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/BaseNonStringProperties.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/BaseNonStringProperties.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/BaseNonStringProperties.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/BaseNonStringProperties.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; +package org.apache.commons.configuration2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/ConfigurationAssert.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/ConfigurationAssert.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/ConfigurationAssert.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/ConfigurationAssert.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration; +package org.apache.commons.configuration2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -25,7 +25,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Iterator; -import org.apache.commons.configuration.ex.ConfigurationRuntimeException; +import org.apache.commons.configuration2.ex.ConfigurationRuntimeException; /** * Assertions on configurations for the unit tests. This class also provides Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.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; +package org.apache.commons.configuration2; import java.io.File; import java.io.FileInputStream; @@ -22,12 +22,12 @@ import java.sql.Connection; import javax.sql.DataSource; -import org.apache.commons.configuration.builder.BasicConfigurationBuilder; -import org.apache.commons.configuration.builder.fluent.DatabaseBuilderParameters; -import org.apache.commons.configuration.builder.fluent.Parameters; -import org.apache.commons.configuration.ex.ConfigurationException; -import org.apache.commons.configuration.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration.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.dbcp.BasicDataSource; import org.dbunit.database.DatabaseConnection; import org.dbunit.database.IDatabaseConnection; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/FileURLStreamHandler.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/FileURLStreamHandler.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/FileURLStreamHandler.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/FileURLStreamHandler.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration; +package org.apache.commons.configuration2; import java.io.File; import java.io.FileInputStream; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/InterpolationTestHelper.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/InterpolationTestHelper.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/InterpolationTestHelper.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/InterpolationTestHelper.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; +package org.apache.commons.configuration2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -23,8 +23,8 @@ import java.awt.event.KeyEvent; import java.util.List; import java.util.Map; -import org.apache.commons.configuration.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration.interpol.Lookup; +import org.apache.commons.configuration2.interpol.ConfigurationInterpolator; +import org.apache.commons.configuration2.interpol.Lookup; /** * A helper class that defines a bunch of tests related to variable Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/Logging.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/Logging.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/Logging.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/Logging.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; +package org.apache.commons.configuration2; import org.apache.commons.logging.impl.Log4JLogger; import org.apache.log4j.Priority; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.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; +package org.apache.commons.configuration2; import java.util.Hashtable; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/NonCloneableConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/NonCloneableConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/NonCloneableConfiguration.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/NonCloneableConfiguration.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; +package org.apache.commons.configuration2; import java.util.Iterator; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/NonStringTestHolder.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/NonStringTestHolder.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/NonStringTestHolder.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/NonStringTestHolder.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration; +package org.apache.commons.configuration2; import java.util.Iterator; import java.util.List; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/SynchronizerTestImpl.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/SynchronizerTestImpl.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/SynchronizerTestImpl.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/SynchronizerTestImpl.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; +package org.apache.commons.configuration2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.apache.commons.configuration.sync.Synchronizer; +import org.apache.commons.configuration2.sync.Synchronizer; /** * A test implementation of Synchronizer which allows keeping track about Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration; +package org.apache.commons.configuration2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -32,7 +32,7 @@ import java.util.List; import junitx.framework.ListAssert; -import org.apache.commons.configuration.ex.ConversionException; +import org.apache.commons.configuration2.ex.ConversionException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Test; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.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; +package org.apache.commons.configuration2; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -33,15 +33,15 @@ import java.util.Map; import java.util.NoSuchElementException; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.configuration.convert.ConversionHandler; -import org.apache.commons.configuration.convert.DefaultConversionHandler; -import org.apache.commons.configuration.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration.convert.DisabledListDelimiterHandler; -import org.apache.commons.configuration.event.ConfigurationEvent; -import org.apache.commons.configuration.event.EventListener; -import org.apache.commons.configuration.event.EventType; -import org.apache.commons.configuration.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration.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.easymock.EasyMock; import org.junit.Test; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationSynchronization.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationSynchronization.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationSynchronization.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationSynchronization.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; +package org.apache.commons.configuration2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -23,10 +23,10 @@ import static org.junit.Assert.assertTru import java.util.Collections; -import org.apache.commons.configuration.SynchronizerTestImpl.Methods; -import org.apache.commons.configuration.io.FileHandler; -import org.apache.commons.configuration.sync.LockMode; -import org.apache.commons.configuration.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.easymock.EasyMock; import org.junit.Before; import org.junit.Test; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration; +package org.apache.commons.configuration2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -35,19 +35,19 @@ import java.util.Map; import java.util.Set; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.configuration.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration.event.ConfigurationEvent; -import org.apache.commons.configuration.event.EventListener; -import org.apache.commons.configuration.event.EventListenerTestImpl; -import org.apache.commons.configuration.tree.DefaultConfigurationKey; -import org.apache.commons.configuration.tree.DefaultExpressionEngine; -import org.apache.commons.configuration.tree.DefaultExpressionEngineSymbols; -import org.apache.commons.configuration.tree.ExpressionEngine; -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.configuration.tree.NodeModel; -import org.apache.commons.configuration.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.Before; import org.junit.Test; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration; +package org.apache.commons.configuration2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -36,13 +36,13 @@ import java.util.Properties; import java.util.StringTokenizer; import junitx.framework.ListAssert; -import org.apache.commons.configuration.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration.event.ConfigurationEvent; -import org.apache.commons.configuration.event.EventListener; -import org.apache.commons.configuration.event.EventListenerTestImpl; -import org.apache.commons.configuration.ex.ConversionException; -import org.apache.commons.configuration.interpol.ConfigurationInterpolator; -import org.apache.commons.configuration.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.easymock.EasyMock; import org.junit.Before; import org.junit.Test; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration; +package org.apache.commons.configuration2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestBaseHierarchicalConfigurationSynchronization.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestBaseHierarchicalConfigurationSynchronization.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestBaseHierarchicalConfigurationSynchronization.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestBaseHierarchicalConfigurationSynchronization.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; +package org.apache.commons.configuration2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -30,14 +30,14 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.CountDownLatch; -import org.apache.commons.configuration.SynchronizerTestImpl.Methods; -import org.apache.commons.configuration.builder.FileBasedConfigurationBuilder; -import org.apache.commons.configuration.builder.fluent.Parameters; -import org.apache.commons.configuration.ex.ConfigurationException; -import org.apache.commons.configuration.io.FileHandler; -import org.apache.commons.configuration.tree.ImmutableNode; -import org.apache.commons.configuration.tree.InMemoryNodeModel; -import org.apache.commons.configuration.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.Before; import org.junit.Test; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration; +package org.apache.commons.configuration2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -30,8 +30,8 @@ import java.util.List; import java.util.NoSuchElementException; import java.util.Properties; -import org.apache.commons.configuration.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration.ex.ConversionException; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.ex.ConversionException; import org.junit.Before; import org.junit.Test; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestCatalogResolver.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestCatalogResolver.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestCatalogResolver.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestCatalogResolver.java Fri Sep 12 18:04:36 2014 @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.commons.configuration; +package org.apache.commons.configuration2; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import org.apache.commons.configuration.ex.ConfigurationException; -import org.apache.commons.configuration.io.FileHandler; -import org.apache.commons.configuration.resolver.CatalogResolver; +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.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.After; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.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; +package org.apache.commons.configuration2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -36,23 +36,23 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.commons.configuration.SynchronizerTestImpl.Methods; -import org.apache.commons.configuration.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration.event.ConfigurationEvent; -import org.apache.commons.configuration.event.EventListener; -import org.apache.commons.configuration.ex.ConfigurationException; -import org.apache.commons.configuration.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration.io.FileHandler; -import org.apache.commons.configuration.sync.LockMode; -import org.apache.commons.configuration.sync.ReadWriteSynchronizer; -import org.apache.commons.configuration.sync.Synchronizer; -import org.apache.commons.configuration.tree.DefaultExpressionEngine; -import org.apache.commons.configuration.tree.DefaultExpressionEngineSymbols; -import org.apache.commons.configuration.tree.ImmutableNode; -import org.apache.commons.configuration.tree.NodeCombiner; -import org.apache.commons.configuration.tree.NodeModel; -import org.apache.commons.configuration.tree.OverrideCombiner; -import org.apache.commons.configuration.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.Before; import org.junit.Rule; import org.junit.Test; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration; +package org.apache.commons.configuration2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -33,14 +33,14 @@ import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; -import org.apache.commons.configuration.SynchronizerTestImpl.Methods; -import org.apache.commons.configuration.convert.DefaultListDelimiterHandler; -import org.apache.commons.configuration.convert.LegacyListDelimiterHandler; -import org.apache.commons.configuration.convert.ListDelimiterHandler; -import org.apache.commons.configuration.event.ConfigurationEvent; -import org.apache.commons.configuration.event.EventListenerTestImpl; -import org.apache.commons.configuration.ex.ConfigurationRuntimeException; -import org.apache.commons.configuration.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.easymock.EasyMock; import org.junit.Before; import org.junit.Test; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestCompositeConfigurationNonStringProperties.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestCompositeConfigurationNonStringProperties.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestCompositeConfigurationNonStringProperties.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestCompositeConfigurationNonStringProperties.java Fri Sep 12 18:04:36 2014 @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.configuration; +package org.apache.commons.configuration2; -import org.apache.commons.configuration.io.FileHandler; +import org.apache.commons.configuration2.io.FileHandler; import org.junit.Before; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration; +package org.apache.commons.configuration2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Properties; import org.apache.commons.collections.ExtendedProperties; -import org.apache.commons.configuration.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; import org.easymock.EasyMock; import org.easymock.IAnswer; import org.junit.Test; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationLookup.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationLookup.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationLookup.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationLookup.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; +package org.apache.commons.configuration2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration; +package org.apache.commons.configuration2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; Modified: commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java?rev=1624601&r1=1624598&r2=1624601&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java (original) +++ commons/proper/configuration/branches/configuration2-alpha/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java Fri Sep 12 18:04:36 2014 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.configuration; +package org.apache.commons.configuration2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue;
