commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ohe...@apache.org
Subject svn commit: r611444 [3/5] - in /commons/proper/configuration/branches/configuration2_experimental/src: main/java/org/apache/commons/configuration/ main/java/org/apache/commons/configuration2/ main/java/org/apache/commons/configuration2/beanutils/ main/...
Date Sat, 12 Jan 2008 17:06:46 GMT
Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListParserConstants.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/PropertyListParserConstants.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListParserConstants.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListParserConstants.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/PropertyListParserConstants.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/PropertyListParserConstants.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListParserConstants.java Sat Jan 12 09:06:33 2008
@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. PropertyListParserConstants.java */
-package org.apache.commons.configuration.plist;
+package org.apache.commons.configuration2.plist;
 
 interface PropertyListParserConstants
 {

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListParserTokenManager.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/PropertyListParserTokenManager.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListParserTokenManager.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListParserTokenManager.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/PropertyListParserTokenManager.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/PropertyListParserTokenManager.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListParserTokenManager.java Sat Jan 12 09:06:33 2008
@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. PropertyListParserTokenManager.java */
-package org.apache.commons.configuration.plist;
+package org.apache.commons.configuration2.plist;
 
 class PropertyListParserTokenManager implements PropertyListParserConstants
 {

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/SimpleCharStream.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/SimpleCharStream.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/SimpleCharStream.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/SimpleCharStream.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/SimpleCharStream.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/SimpleCharStream.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/SimpleCharStream.java Sat Jan 12 09:06:33 2008
@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 3.0 */
-package org.apache.commons.configuration.plist;
+package org.apache.commons.configuration2.plist;
 
 /**
  * An implementation of interface CharStream, where the stream is assumed to

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/Token.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/Token.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/Token.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/Token.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/Token.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/Token.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/Token.java Sat Jan 12 09:06:33 2008
@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. Token.java Version 3.0 */
-package org.apache.commons.configuration.plist;
+package org.apache.commons.configuration2.plist;
 
 /**
  * Describes the input token stream.

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/TokenMgrError.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/TokenMgrError.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/TokenMgrError.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/TokenMgrError.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/TokenMgrError.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/TokenMgrError.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/TokenMgrError.java Sat Jan 12 09:06:33 2008
@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 3.0 */
-package org.apache.commons.configuration.plist;
+package org.apache.commons.configuration2.plist;
 
 class TokenMgrError extends Error
 {

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/XMLPropertyListConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/XMLPropertyListConfiguration.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/plist/XMLPropertyListConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration.plist;
+package org.apache.commons.configuration2.plist;
 
 import java.io.File;
 import java.io.PrintWriter;
@@ -36,11 +36,11 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.configuration.AbstractHierarchicalFileConfiguration;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.configuration.MapConfiguration;
+import org.apache.commons.configuration2.AbstractHierarchicalFileConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationException;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.MapConfiguration;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 
@@ -151,7 +151,7 @@
      * Creates and loads the property list from the specified file.
      *
      * @param fileName The name of the plist file to load.
-     * @throws org.apache.commons.configuration.ConfigurationException Error
+     * @throws org.apache.commons.configuration2.ConfigurationException Error
      * while loading the plist file
      */
     public XMLPropertyListConfiguration(String fileName) throws ConfigurationException

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/reloading/FileChangedReloadingStrategy.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/reloading/FileChangedReloadingStrategy.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/reloading/FileChangedReloadingStrategy.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/reloading/FileChangedReloadingStrategy.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/reloading/FileChangedReloadingStrategy.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/reloading/FileChangedReloadingStrategy.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/reloading/FileChangedReloadingStrategy.java Sat Jan 12 09:06:33 2008
@@ -15,14 +15,14 @@
  * 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.ConfigurationUtils;
-import org.apache.commons.configuration.FileConfiguration;
+import org.apache.commons.configuration2.ConfigurationUtils;
+import org.apache.commons.configuration2.FileConfiguration;
 
 /**
  * <p>A reloading strategy that will reload the configuration every time its

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/reloading/InvariantReloadingStrategy.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/reloading/InvariantReloadingStrategy.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/reloading/InvariantReloadingStrategy.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/reloading/InvariantReloadingStrategy.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/reloading/InvariantReloadingStrategy.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/reloading/InvariantReloadingStrategy.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/reloading/InvariantReloadingStrategy.java Sat Jan 12 09:06:33 2008
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration.reloading;
+package org.apache.commons.configuration2.reloading;
 
-import org.apache.commons.configuration.FileConfiguration;
+import org.apache.commons.configuration2.FileConfiguration;
 
 /**
  * A strategy that never triggers a reloading.

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingStrategy.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/reloading/ManagedReloadingStrategy.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingStrategy.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingStrategy.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/reloading/ManagedReloadingStrategy.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/reloading/ManagedReloadingStrategy.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingStrategy.java Sat Jan 12 09:06:33 2008
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration.reloading;
+package org.apache.commons.configuration2.reloading;
 
-import org.apache.commons.configuration.FileConfiguration;
+import org.apache.commons.configuration2.FileConfiguration;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -40,14 +40,14 @@
     private boolean reloadingRequired;
 
     /**
-     * @see org.apache.commons.configuration.reloading.ReloadingStrategy#init()
+     * @see org.apache.commons.configuration2.reloading.ReloadingStrategy#init()
      */
     public void init()
     {
     }
 
     /**
-     * @see org.apache.commons.configuration.reloading.ReloadingStrategy#reloadingPerformed()
+     * @see org.apache.commons.configuration2.reloading.ReloadingStrategy#reloadingPerformed()
      */
     public void reloadingPerformed()
     {
@@ -59,7 +59,7 @@
      * the <code>refresh()</code> method has been invokded.
      *
      * @return a flag whether reloading is required
-     * @see org.apache.commons.configuration.reloading.ReloadingStrategy#reloadingRequired()
+     * @see org.apache.commons.configuration2.reloading.ReloadingStrategy#reloadingRequired()
      */
     public boolean reloadingRequired()
     {
@@ -81,7 +81,7 @@
      * refreshed. This method will typically be called from outside (through an
      * exposed MBean) on behalf of an administrator.
      *
-     * @see org.apache.commons.configuration.reloading.ManagedReloadingStrategyMBean#refresh()
+     * @see org.apache.commons.configuration2.reloading.ManagedReloadingStrategyMBean#refresh()
      */
     public void refresh()
     {

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingStrategyMBean.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/reloading/ManagedReloadingStrategyMBean.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingStrategyMBean.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingStrategyMBean.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/reloading/ManagedReloadingStrategyMBean.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/reloading/ManagedReloadingStrategyMBean.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/reloading/ManagedReloadingStrategyMBean.java Sat Jan 12 09:06:33 2008
@@ -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.

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/reloading/ReloadingStrategy.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/reloading/ReloadingStrategy.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/reloading/ReloadingStrategy.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/reloading/ReloadingStrategy.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/reloading/ReloadingStrategy.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/reloading/ReloadingStrategy.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/reloading/ReloadingStrategy.java Sat Jan 12 09:06:33 2008
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration.reloading;
+package org.apache.commons.configuration2.reloading;
 
-import org.apache.commons.configuration.FileConfiguration;
+import org.apache.commons.configuration2.FileConfiguration;
 
 /**
  * A strategy to decide if a configuration should be reloaded.

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNode.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/ConfigurationNode.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNode.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNode.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/ConfigurationNode.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/ConfigurationNode.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNode.java Sat Jan 12 09:06:33 2008
@@ -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;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitor.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/ConfigurationNodeVisitor.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitor.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitor.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/ConfigurationNodeVisitor.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/ConfigurationNodeVisitor.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitor.java Sat Jan 12 09:06:33 2008
@@ -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>

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitorAdapter.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/ConfigurationNodeVisitorAdapter.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitorAdapter.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitorAdapter.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/ConfigurationNodeVisitorAdapter.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/ConfigurationNodeVisitorAdapter.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/ConfigurationNodeVisitorAdapter.java Sat Jan 12 09:06:33 2008
@@ -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>

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/DefaultConfigurationKey.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/DefaultConfigurationKey.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/DefaultConfigurationKey.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java Sat Jan 12 09:06:33 2008
@@ -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;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationNode.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/DefaultConfigurationNode.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationNode.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationNode.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/DefaultConfigurationNode.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/DefaultConfigurationNode.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationNode.java Sat Jan 12 09:06:33 2008
@@ -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;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/DefaultExpressionEngine.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/DefaultExpressionEngine.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/DefaultExpressionEngine.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java Sat Jan 12 09:06:33 2008
@@ -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.Iterator;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/ExpressionEngine.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/ExpressionEngine.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/ExpressionEngine.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/ExpressionEngine.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/ExpressionEngine.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/ExpressionEngine.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/ExpressionEngine.java Sat Jan 12 09:06:33 2008
@@ -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;
 
@@ -65,7 +65,7 @@
      * 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
-     * <code>{@link org.apache.commons.configuration.Configuration#getKeys() getKeys()}</code>
+     * <code>{@link org.apache.commons.configuration2.Configuration#getKeys() getKeys()}</code>
      * method.
      *
      * @param node the node, for which the key must be constructed

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/NodeAddData.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/NodeAddData.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/NodeAddData.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/NodeAddData.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/NodeAddData.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/NodeAddData.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/NodeAddData.java Sat Jan 12 09:06:33 2008
@@ -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.LinkedList;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/NodeCombiner.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/NodeCombiner.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/NodeCombiner.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/NodeCombiner.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/NodeCombiner.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/NodeCombiner.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/NodeCombiner.java Sat Jan 12 09:06:33 2008
@@ -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;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/OverrideCombiner.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/OverrideCombiner.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/OverrideCombiner.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/OverrideCombiner.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/OverrideCombiner.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/OverrideCombiner.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/OverrideCombiner.java Sat Jan 12 09:06:33 2008
@@ -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;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/UnionCombiner.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/UnionCombiner.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/UnionCombiner.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/UnionCombiner.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/UnionCombiner.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/UnionCombiner.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/UnionCombiner.java Sat Jan 12 09:06:33 2008
@@ -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.LinkedList;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/ViewNode.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/ViewNode.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/ViewNode.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/ViewNode.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/ViewNode.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/ViewNode.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/ViewNode.java Sat Jan 12 09:06:33 2008
@@ -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;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodeIteratorAttribute.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodeIteratorAttribute.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodeIteratorAttribute.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java Sat Jan 12 09:06:33 2008
@@ -14,13 +14,13 @@
  * 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;
 import java.util.List;
 
-import org.apache.commons.configuration.tree.ConfigurationNode;
+import org.apache.commons.configuration2.tree.ConfigurationNode;
 import org.apache.commons.jxpath.ri.QName;
 import org.apache.commons.jxpath.ri.model.NodePointer;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorBase.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodeIteratorBase.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorBase.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorBase.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodeIteratorBase.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodeIteratorBase.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorBase.java Sat Jan 12 09:06:33 2008
@@ -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.List;
 
-import org.apache.commons.configuration.tree.ConfigurationNode;
+import org.apache.commons.configuration2.tree.ConfigurationNode;
 import org.apache.commons.jxpath.ri.model.NodeIterator;
 import org.apache.commons.jxpath.ri.model.NodePointer;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodeIteratorChildren.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodeIteratorChildren.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodeIteratorChildren.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java Sat Jan 12 09:06:33 2008
@@ -14,14 +14,14 @@
  * 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;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.configuration.tree.ConfigurationNode;
+import org.apache.commons.configuration2.tree.ConfigurationNode;
 import org.apache.commons.jxpath.ri.Compiler;
 import org.apache.commons.jxpath.ri.QName;
 import org.apache.commons.jxpath.ri.compiler.NodeNameTest;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointer.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodePointer.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointer.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointer.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodePointer.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodePointer.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointer.java Sat Jan 12 09:06:33 2008
@@ -14,13 +14,13 @@
  * 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.Iterator;
 import java.util.List;
 import java.util.Locale;
 
-import org.apache.commons.configuration.tree.ConfigurationNode;
+import org.apache.commons.configuration2.tree.ConfigurationNode;
 import org.apache.commons.jxpath.ri.Compiler;
 import org.apache.commons.jxpath.ri.QName;
 import org.apache.commons.jxpath.ri.compiler.NodeTest;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodePointerFactory.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodePointerFactory.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodePointerFactory.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java Sat Jan 12 09:06:33 2008
@@ -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.ConfigurationNode;
+import org.apache.commons.configuration2.tree.ConfigurationNode;
 import org.apache.commons.jxpath.ri.QName;
 import org.apache.commons.jxpath.ri.model.NodePointer;
 import org.apache.commons.jxpath.ri.model.NodePointerFactory;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/xpath/XPathExpressionEngine.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/xpath/XPathExpressionEngine.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/tree/xpath/XPathExpressionEngine.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java Sat Jan 12 09:06:33 2008
@@ -14,16 +14,16 @@
  * 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;
 import java.util.List;
 import java.util.StringTokenizer;
 
-import org.apache.commons.configuration.tree.ConfigurationNode;
-import org.apache.commons.configuration.tree.ExpressionEngine;
-import org.apache.commons.configuration.tree.NodeAddData;
+import org.apache.commons.configuration2.tree.ConfigurationNode;
+import org.apache.commons.configuration2.tree.ExpressionEngine;
+import org.apache.commons.configuration2.tree.NodeAddData;
 import org.apache.commons.jxpath.JXPathContext;
 import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl;
 import org.apache.commons.lang.StringUtils;
@@ -142,7 +142,7 @@
      * This implementation will create an XPATH expression that selects the
      * given node (under the assumption that the passed in parent key is valid).
      * As the <code>nodeKey()</code> implementation of
-     * <code>{@link org.apache.commons.configuration.tree.DefaultExpressionEngine DefaultExpressionEngine}</code>
+     * <code>{@link org.apache.commons.configuration2.tree.DefaultExpressionEngine DefaultExpressionEngine}</code>
      * this method will not return indices for nodes. So all child nodes of a
      * given parent whith the same name will have the same key.
      *

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/web/AppletConfiguration.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/web/AppletConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/web/AppletConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/web/AppletConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/web/AppletConfiguration.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/web/AppletConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/web/AppletConfiguration.java Sat Jan 12 09:06:33 2008
@@ -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.Iterator;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/web/BaseWebConfiguration.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/web/BaseWebConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/web/BaseWebConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/web/BaseWebConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/web/BaseWebConfiguration.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/web/BaseWebConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/web/BaseWebConfiguration.java Sat Jan 12 09:06:33 2008
@@ -14,12 +14,12 @@
  * 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.List;
 
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.PropertyConverter;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.PropertyConverter;
 
 /**
  * <p>

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/web/ServletConfiguration.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/web/ServletConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/web/ServletConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/web/ServletConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/web/ServletConfiguration.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/web/ServletConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/web/ServletConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration.web;
+package org.apache.commons.configuration2.web;
 
 import java.util.Iterator;
 import javax.servlet.Servlet;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/web/ServletContextConfiguration.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/web/ServletContextConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/web/ServletContextConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/web/ServletContextConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/web/ServletContextConfiguration.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/web/ServletContextConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/web/ServletContextConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration.web;
+package org.apache.commons.configuration2.web;
 
 import java.util.Iterator;
 import javax.servlet.Servlet;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/web/ServletFilterConfiguration.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/web/ServletFilterConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/web/ServletFilterConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/web/ServletFilterConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/web/ServletFilterConfiguration.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/web/ServletFilterConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/web/ServletFilterConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration.web;
+package org.apache.commons.configuration2.web;
 
 import java.util.Iterator;
 import javax.servlet.FilterConfig;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java (from r611443, commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/web/ServletRequestConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/web/ServletRequestConfiguration.java&r1=611443&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration/web/ServletRequestConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java Sat Jan 12 09:06:33 2008
@@ -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;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/BaseNonStringProperties.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/BaseNonStringProperties.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/BaseNonStringProperties.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/BaseNonStringProperties.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/BaseNonStringProperties.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/BaseNonStringProperties.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/BaseNonStringProperties.java Sat Jan 12 09:06:33 2008
@@ -1,4 +1,4 @@
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,6 +16,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+import org.apache.commons.configuration2.Configuration;
 
 import junit.framework.TestCase;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/ConfigurationAssert.java (from r610535, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/ConfigurationAssert.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/ConfigurationAssert.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/ConfigurationAssert.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/ConfigurationAssert.java&r1=610535&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/ConfigurationAssert.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/ConfigurationAssert.java Sat Jan 12 09:06:33 2008
@@ -15,10 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.io.File;
 import java.util.Iterator;
+
+import org.apache.commons.configuration2.Configuration;
 
 import junit.framework.Assert;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/ConfigurationErrorListenerImpl.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/ConfigurationErrorListenerImpl.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/ConfigurationErrorListenerImpl.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/ConfigurationErrorListenerImpl.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/ConfigurationErrorListenerImpl.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/ConfigurationErrorListenerImpl.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/ConfigurationErrorListenerImpl.java Sat Jan 12 09:06:33 2008
@@ -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 junit.framework.Assert;
 
-import org.apache.commons.configuration.event.ConfigurationErrorEvent;
-import org.apache.commons.configuration.event.ConfigurationErrorListener;
+import org.apache.commons.configuration2.event.ConfigurationErrorEvent;
+import org.apache.commons.configuration2.event.ConfigurationErrorListener;
 
 /**
  * An implementation of the <code>ConfigurationErrorListener</code> interface

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/FileURLStreamHandler.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/FileURLStreamHandler.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/FileURLStreamHandler.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/FileURLStreamHandler.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/FileURLStreamHandler.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/FileURLStreamHandler.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/FileURLStreamHandler.java Sat Jan 12 09:06:33 2008
@@ -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;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/InterpolationTestHelper.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/InterpolationTestHelper.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/InterpolationTestHelper.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/InterpolationTestHelper.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/InterpolationTestHelper.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/InterpolationTestHelper.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/InterpolationTestHelper.java Sat Jan 12 09:06:33 2008
@@ -14,14 +14,16 @@
  * 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.awt.event.KeyEvent;
 import java.util.List;
 
 import junit.framework.Assert;
 
-import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
 import org.apache.commons.lang.text.StrLookup;
 
 /**

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/MockInitialContextFactory.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/MockInitialContextFactory.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/MockInitialContextFactory.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java Sat Jan 12 09:06:33 2008
@@ -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;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/NonCloneableConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/NonCloneableConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/NonCloneableConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/NonCloneableConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/NonCloneableConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/NonCloneableConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/NonCloneableConfiguration.java Sat Jan 12 09:06:33 2008
@@ -14,9 +14,11 @@
  * 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;
+
+import org.apache.commons.configuration2.AbstractConfiguration;
 
 /**
  * A specialized configuration implementation that does not support cloning.

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/NonStringTestHolder.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/NonStringTestHolder.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/NonStringTestHolder.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/NonStringTestHolder.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/NonStringTestHolder.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/NonStringTestHolder.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/NonStringTestHolder.java Sat Jan 12 09:06:33 2008
@@ -15,10 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.util.Iterator;
 import java.util.List;
+
+import org.apache.commons.configuration2.Configuration;
 
 import junit.framework.Assert;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestAbstractConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestAbstractConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestAbstractConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,12 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestAbstractConfigurationBasicFeatures.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestAbstractConfigurationBasicFeatures.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestAbstractConfigurationBasicFeatures.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java Sat Jan 12 09:06:33 2008
@@ -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.ArrayList;
 import java.util.Arrays;
@@ -25,8 +25,12 @@
 import java.util.Map;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.configuration.event.ConfigurationEvent;
-import org.apache.commons.configuration.event.ConfigurationListener;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.event.ConfigurationListener;
 
 import junit.framework.TestCase;
 

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestBaseConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestBaseConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestBaseConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -33,8 +33,12 @@
 import junitx.framework.ObjectAssert;
 
 import org.apache.commons.collections.set.ListOrderedSet;
-import org.apache.commons.configuration.event.ConfigurationEvent;
-import org.apache.commons.configuration.event.ConfigurationListener;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConversionException;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.event.ConfigurationListener;
 
 /**
  * Tests some basic functions of the BaseConfiguration class. Missing keys will

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestBaseConfigurationXMLReader.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestBaseConfigurationXMLReader.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestBaseConfigurationXMLReader.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -26,6 +26,8 @@
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.sax.SAXSource;
 
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.BaseConfigurationXMLReader;
 import org.apache.commons.jxpath.JXPathContext;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestBaseNullConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestBaseNullConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestBaseNullConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java Sat Jan 12 09:06:33 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.configuration;
+package org.apache.commons.configuration2;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -23,6 +23,10 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Properties;
+
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConversionException;
 
 import junit.framework.TestCase;
 import junitx.framework.ObjectAssert;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java (from r610517, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestCombinedConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestCombinedConfiguration.java&r1=610517&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestCombinedConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java Sat Jan 12 09:06:33 2008
@@ -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.FileWriter;
@@ -23,11 +23,18 @@
 import java.util.Collection;
 import java.util.Set;
 
-import org.apache.commons.configuration.event.ConfigurationEvent;
-import org.apache.commons.configuration.event.ConfigurationListener;
-import org.apache.commons.configuration.reloading.FileAlwaysReloadingStrategy;
-import org.apache.commons.configuration.tree.NodeCombiner;
-import org.apache.commons.configuration.tree.UnionCombiner;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.CombinedConfiguration;
+import org.apache.commons.configuration2.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.StrictConfigurationComparator;
+import org.apache.commons.configuration2.XMLConfiguration;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.event.ConfigurationListener;
+import org.apache.commons.configuration2.reloading.FileAlwaysReloadingStrategy;
+import org.apache.commons.configuration2.tree.NodeCombiner;
+import org.apache.commons.configuration2.tree.UnionCombiner;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;

Copied: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java (from r610881, commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestCompositeConfiguration.java)
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java&p1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestCompositeConfiguration.java&r1=610881&r2=611444&rev=611444&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestCompositeConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java Sat Jan 12 09:06:33 2008
@@ -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.FileWriter;
@@ -27,9 +27,18 @@
 import java.util.NoSuchElementException;
 import java.util.Collection;
 
-import org.apache.commons.configuration.event.ConfigurationEvent;
-import org.apache.commons.configuration.event.ConfigurationListener;
-import org.apache.commons.configuration.reloading.FileAlwaysReloadingStrategy;
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.CompositeConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationConverter;
+import org.apache.commons.configuration2.ConfigurationException;
+import org.apache.commons.configuration2.ConfigurationRuntimeException;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.StrictConfigurationComparator;
+import org.apache.commons.configuration2.XMLConfiguration;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.commons.configuration2.event.ConfigurationListener;
+import org.apache.commons.configuration2.reloading.FileAlwaysReloadingStrategy;
 
 import junit.framework.TestCase;
 



Mime
View raw message