You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by kr...@apache.org on 2008/02/17 13:05:45 UTC
svn commit: r628482 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests:
testData/build.xml testData/serializedDataSources/SerializeDataSources.java
tests/jdbcapi/DataSourceSerializationTest.java
Author: kristwaa
Date: Sun Feb 17 04:05:43 2008
New Revision: 628482
URL: http://svn.apache.org/viewvc?rev=628482&view=rev
Log:
DERBY-1318: JavaDoc fixes for DataSourceSerializationTest. I also made the utility class SerializeDataSources be built and included in derbytesting.jar.
Patch file: derby-1318-2a-javadoc_and_build.diff
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/SerializeDataSources.java
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=628482&r1=628481&r2=628482&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 Sun Feb 17 04:05:43 2008
@@ -32,7 +32,7 @@
<property file="${user.home}/properties/derbytesting.properties"/>
<!-- Targets -->
- <target name="testdata" depends="copyfiles"/>
+ <target name="testdata" depends="copyfiles,compile_jdk15"/>
<target name="copyfiles">
<copy todir="${out.dir}/${derby.testing.functest.dir}/testData/v1">
@@ -59,6 +59,27 @@
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/testData/serializedDataSources"
includes="*.ser"/>
</copy>
+ </target>
+
+ <target name="compile_jdk15" >
+ <javac
+ source="1.5"
+ target="1.5"
+ bootclasspath="${empty}"
+ nowarn="on"
+ debug="true"
+ depend="${depend}"
+ deprecation="${deprecation}"
+ optimize="${optimize}"
+ proceed="${proceed}"
+ verbose="${verbose}"
+ srcdir="${derby.testing.src.dir}"
+ destdir="${out.dir}">
+ <classpath>
+ <pathelement path="${java15compile.classpath}"/>
+ </classpath>
+ <include name="${derby.testing.functest.dir}/testData/serializedDataSources/*.java"/>
+ </javac>
</target>
</project>
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/SerializeDataSources.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/SerializeDataSources.java?rev=628482&r1=628481&r2=628482&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/SerializeDataSources.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/SerializeDataSources.java Sun Feb 17 04:05:43 2008
@@ -1,6 +1,6 @@
/*
- Derby - Class SerializeDataSources
+ Derby - Class org.apache.derbyTesting.functionTests.testData.serializedDataSources.SerializeDataSources
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -18,6 +18,7 @@
limitations under the License.
*/
+package org.apache.derbyTesting.functionTests.testData.serializedDataSources;
import java.io.File;
import java.io.FileInputStream;
@@ -75,7 +76,7 @@
/**
* Serialize and write data sources to file.
*
- * @param minorVersion Derby version string (i.e. 10.3.2.1)
+ * @param versionString Derby version string (i.e. 10.3.2.1)
* @param buildNumber Derby build number (svn)
* @param dataSourceClasses list of data source class names
* @return The number of data sources serialized and written to file.
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=628482&r1=628481&r2=628482&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 Sun Feb 17 04:05:43 2008
@@ -165,7 +165,7 @@
* </ol>
* <p>
* If the object is successfully instantiated and cast to
- * {@link java.sql.DataSource}
+ * {@link javax.sql.DataSource}
*
* @param className name of the class to de-serialize
* @param version Derby version