Return-Path: 
 <derby-commits-return-9436-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: (qmail 50371 invoked from network); 17 Feb 2008 12:06:07 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 17 Feb 2008 12:06:07 -0000
Received: (qmail 41998 invoked by uid 500); 17 Feb 2008 12:06:01 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 41968 invoked by uid 500); 17 Feb 2008 12:06:01 -0000
Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:derby-commits-help@db.apache.org>
list-unsubscribe: <mailto:derby-commits-unsubscribe@db.apache.org>
List-Post: <mailto:derby-commits@db.apache.org>
Reply-To: "Derby Development" <derby-dev@db.apache.org>
List-Id: <derby-commits.db.apache.org>
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 41957 invoked by uid 99); 17 Feb 2008 12:06:01 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 17 Feb 2008 04:06:01 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 17 Feb 2008 12:05:37 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E30D51A9832; Sun, 17 Feb 2008 04:05:45 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: 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
Date: Sun, 17 Feb 2008 12:05:45 -0000
To: derby-commits@db.apache.org
From: kristwaa@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080217120545.E30D51A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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