svn commit: r628038 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: testData/build.xml testData/serialized-data-sources/ testData/serializedDataSources/ tests/jdbcapi/DataSourceSerializationTest.java

[kr...@apache.org]

Author: kristwaa
Date: Fri Feb 15 04:27:48 2008
New Revision: 628038

URL: http://svn.apache.org/viewvc?rev=628038&view=rev
Log:
Renamed directory 'serialized-data-sources' to 'serializedDataSources'.
The directory was traversed by JavaDoc as part of ant target 'javadoc', and it failed because the old name was not a valid Java package name.
Updated references to the directory.
Patch file: n/a

Added:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/
      - copied from r628036, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serialized-data-sources/
Removed:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serialized-data-sources/
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml?rev=628038&r1=628037&r2=628038&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml Fri Feb 15 04:27:48 2008
@@ -55,8 +55,8 @@
       <fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/testData/ConnectionMethods"
         includes="*.txt"/>
     </copy>
-    <copy todir="${out.dir}/${derby.testing.functest.dir}/testData/serialized-data-sources">
-      <fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/testData/serialized-data-sources"
+    <copy todir="${out.dir}/${derby.testing.functest.dir}/testData/serializedDataSources">
+      <fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/testData/serializedDataSources"
         includes="*.ser"/>
     </copy>
   </target>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java?rev=628038&r1=628037&r2=628038&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java Fri Feb 15 04:27:48 2008
@@ -43,7 +43,7 @@
  * current version of the data souce.
  * <p>
  * Serialized data source from old versions are expected to be found in
- * <tt>testData/serialized-data-sources</tt>, with the following filename
+ * <tt>testData/serializedDataSources</tt>, with the following filename
  * format CLASSNAME-VERSION.ser, where CLASSNAME is the unqualified name of the
  * data source class, and VERSION is the Derby version. An example:
  * <tt>ClientPooledConnectionDataSource-10_1.ser</tt>
@@ -254,7 +254,7 @@
      */
     public static Test suite() {
         TestSuite suite = new TestSuite("DataSourceSerializationTest");
-        String filePrefix = "functionTests/testData/serialized-data-sources/";
+        String filePrefix = "functionTests/testData/serializedDataSources/";
         // De-serialize embedded data sources only if we have the engine code.
         if (Derby.hasEmbedded()) {
             suite.addTest(new DataSourceSerializationTest(