db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: rev 57541 - in incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: harness tests/derbynet tests/jdbcapi tests/lang tests/tools util util/StaticInitializers util/VTIClasses
Date Fri, 12 Nov 2004 21:10:44 GMT
Author: djd
Date: Fri Nov 12 13:10:42 2004
New Revision: 57541

Modified:
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/BackgroundStreamDrainer.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/BackgroundStreamSaver.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/CopySuppFiles.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/CurrentTime.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/FileCompare.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/GRFileFilter.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/GenerateReport.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/HandleResult.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ManageSysProps.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/NetServer.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ProcessStreamDrainer.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ProcessStreamResult.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/PropertyUtil.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunClass.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunIJ.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SimpleDiff.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SkipTest.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SpecialFlags.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SysInfoLog.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/TimedProcess.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/UnJar.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/currentjvm.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/dbcleanup.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm13.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm14.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9_13.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk13.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk14.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk15.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jvm.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/shutdown.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSinSameJVM.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/badConnection.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/callable.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/checkSecMgr.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/csPrepStmt.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dblook_test_net.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/executeUpdate.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/getCurrentProperties.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/maxthreads.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/prepStmt.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/runtimeinfo.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/sysinfo.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testconnection.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testij.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/timeslice.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/dataSourcePermissions.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadataMultiConn.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/parameterMetaDataJdbc30.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/AIjdbc.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CharUTF8.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/WISCInsert.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/WiscMetaData.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/WiscVTI.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/bug4356.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/bug5052rts.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/bug5054.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/casting.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/closed.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/coalesceTests.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/concateTests.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/currentof.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/cursor.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dbManagerLimits.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/deadlockMode.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/declareGlobalTempTableJava.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/declareGlobalTempTableJavaJDBC30.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/forbitdata.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJavaReflection.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/logStream.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/longStringColumn.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/outparams.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/repeat.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/simpleThread.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/simpleThreadWrapper.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/stmtCache3.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/streams.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/updateCursor.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/userDefMethods.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/dblook_test.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ConsistencyChecker.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/DbFile.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ExtendingInterface.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/Formatters.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/JDBCTestDisplayUtil.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ManyMethods.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/NoMethodInterface.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ProcedureTest.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/PropertyUtil.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ShortHolder.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/StatParser.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/StaticInitializers/DMLInStaticInitializer.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/StaticInitializers/InsertInStaticInitializer.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/StreamUtil.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SubClass.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SubInterfaceClass.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SubSubClass.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/T_Access.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/T_Authorize.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/T_ConsistencyChecker.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/TestPropertyInfo.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/TestUtil.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/Triggers.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/VTIClasses/AbstractAllNegativeNoStatic.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/VTIClasses/ECTResult.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/VTIClasses/ExternalTable.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/VTIClasses/PositiveInteger_VTICosting_SI.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/VTIClasses/ResultSetMetaDataPositive.java
Log:
Remove IBM's binary copyright from java/testing files.


Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/BackgroundStreamDrainer.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/BackgroundStreamDrainer.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/BackgroundStreamDrainer.java	Fri Nov 12 13:10:42 2004
@@ -15,10 +15,6 @@
 
 public class BackgroundStreamDrainer implements Runnable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	protected ByteArrayOutputStream data;
 	protected InputStream in;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/BackgroundStreamSaver.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/BackgroundStreamSaver.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/BackgroundStreamSaver.java	Fri Nov 12 13:10:42 2004
@@ -14,11 +14,7 @@
 import java.io.OutputStream;
 import java.io.IOException;
 
-public class BackgroundStreamSaver implements Runnable { 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+public class BackgroundStreamSaver implements Runnable {
  
 	protected InputStream in;
 	protected OutputStream out;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/CopySuppFiles.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/CopySuppFiles.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/CopySuppFiles.java	Fri Nov 12 13:10:42 2004
@@ -18,11 +18,7 @@
   Copy them to the output directory for the test.
   */
 public class CopySuppFiles
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+{
 
 	public static void main(String[] args) throws Exception
 	{

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/CurrentTime.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/CurrentTime.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/CurrentTime.java	Fri Nov 12 13:10:42 2004
@@ -18,11 +18,7 @@
   Used to print a timestamp for suite/test runs
 */
 public class CurrentTime
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+{
 
 	public static String getTime()
 	{

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/FileCompare.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/FileCompare.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/FileCompare.java	Fri Nov 12 13:10:42 2004
@@ -24,11 +24,7 @@
 import java.util.Properties;
 
 public class FileCompare
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+{
 
     private String testBase;
     private String framework;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/GRFileFilter.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/GRFileFilter.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/GRFileFilter.java	Fri Nov 12 13:10:42 2004
@@ -18,10 +18,6 @@
 	for generating reports.
  */
 class GRFileFilter implements FilenameFilter {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	public boolean accept (File dir, String name) {
 	    if (name.endsWith(".skip")) return true;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/GenerateReport.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/GenerateReport.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/GenerateReport.java	Fri Nov 12 13:10:42 2004
@@ -34,11 +34,7 @@
 
 	@author ames
 **/
-public class GenerateReport { 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+public class GenerateReport {
 
 	static void CollectProperties () {
 		Properties ps = System.getProperties();

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/HandleResult.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/HandleResult.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/HandleResult.java	Fri Nov 12 13:10:42 2004
@@ -23,11 +23,7 @@
 */
 
 public class HandleResult
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+{
 
 	public static void main(String[] args) throws Exception
 	{

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java	Fri Nov 12 13:10:42 2004
@@ -17,11 +17,7 @@
   Used by the test harness for special cases
   */
 public class JavaVersionHolder
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
+{
  
     private String majorVersion;
     private String minorVersion;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ManageSysProps.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ManageSysProps.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ManageSysProps.java	Fri Nov 12 13:10:42 2004
@@ -22,11 +22,7 @@
  */
 
 public class ManageSysProps
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
+{
 
 	private static Properties savedSysProps = null;
 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/NetServer.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/NetServer.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/NetServer.java	Fri Nov 12 13:10:42 2004
@@ -22,11 +22,7 @@
 import java.net.Socket;
 
 public class NetServer
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
+{
 
     File homeDir; // The server directory (usually the test directory)
     String jvmName = "jdk13";

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ProcessStreamDrainer.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ProcessStreamDrainer.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ProcessStreamDrainer.java	Fri Nov 12 13:10:42 2004
@@ -14,11 +14,7 @@
 
 
 public class ProcessStreamDrainer implements Runnable
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+{
 
 	protected ByteArrayOutputStream data;
 	protected InputStream in;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ProcessStreamResult.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ProcessStreamResult.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ProcessStreamResult.java	Fri Nov 12 13:10:42 2004
@@ -15,11 +15,7 @@
 
 
 public class ProcessStreamResult implements Runnable
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+{
 
 	protected InputStream in;
 	protected BufferedOutputStream bos;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/PropertyUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/PropertyUtil.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/PropertyUtil.java	Fri Nov 12 13:10:42 2004
@@ -13,11 +13,7 @@
 import java.util.Properties;
 import java.util.Enumeration;
 
-public class PropertyUtil { 
- 	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;  
+public class PropertyUtil {  
 
 
 	//////////////////////////////////////////////////////////////////////////////

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunClass.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunClass.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunClass.java	Fri Nov 12 13:10:42 2004
@@ -15,11 +15,7 @@
 
 // the purpose of this class is to run Java-based test cases in a separate thread
 public class RunClass implements Runnable
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
+{
 
 	/**
 		param args the arguments to pass into ij

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunIJ.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunIJ.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunIJ.java	Fri Nov 12 13:10:42 2004
@@ -13,11 +13,7 @@
 
 // the purpose of this class is to run IJ in a separate thread
 public class RunIJ implements Runnable
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
+{
 
 	/**
 		param args the arguments to pass into ij

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java	Fri Nov 12 13:10:42 2004
@@ -34,11 +34,7 @@
 import java.util.StringTokenizer;
 
 public class RunList
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+{
 
 	static String jvmName = "currentjvm";
 	static String javaCmd = "java";

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java	Fri Nov 12 13:10:42 2004
@@ -32,11 +32,7 @@
 import java.util.StringTokenizer;
 
 public class RunSuite
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+{
 
     static final boolean verbose=true;
 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java	Fri Nov 12 13:10:42 2004
@@ -45,11 +45,7 @@
 import java.net.URL;
 
 public class RunTest
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+{
 
     // For printing debug info
     static boolean verbose=false;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java	Fri Nov 12 13:10:42 2004
@@ -27,11 +27,7 @@
 import java.util.StringTokenizer;
 
 public class Sed
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+{
 
     public Sed()
     {

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SimpleDiff.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SimpleDiff.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SimpleDiff.java	Fri Nov 12 13:10:42 2004
@@ -20,11 +20,7 @@
 import java.io.FileReader;
 
 public class SimpleDiff
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+{
 
     PrintWriter pw;
 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SkipTest.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SkipTest.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SkipTest.java	Fri Nov 12 13:10:42 2004
@@ -23,11 +23,7 @@
   tests which do not currently work under the WebLogic framework.
   */
 public class SkipTest
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+{
  
     private SkipTest()
     {

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SpecialFlags.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SpecialFlags.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SpecialFlags.java	Fri Nov 12 13:10:42 2004
@@ -23,11 +23,7 @@
 */
 
 public class SpecialFlags
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+{
 
     public static Properties getSpecialProperties(Properties suiteProperties)
     {

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SysInfoLog.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SysInfoLog.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SysInfoLog.java	Fri Nov 12 13:10:42 2004
@@ -21,11 +21,7 @@
 import java.util.Vector;
 
 public class SysInfoLog
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+{
 
     public SysInfoLog()
     {

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/TimedProcess.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/TimedProcess.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/TimedProcess.java	Fri Nov 12 13:10:42 2004
@@ -19,11 +19,7 @@
  * 
  */
 public class TimedProcess
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
+{
 
   private Process process;
 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/UnJar.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/UnJar.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/UnJar.java	Fri Nov 12 13:10:42 2004
@@ -17,11 +17,7 @@
   databases. These need to be "unjarred" in order to do the tests.
   */
 public class UnJar
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+{
  
     public UnJar()
     {

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/currentjvm.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/currentjvm.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/currentjvm.java	Fri Nov 12 13:10:42 2004
@@ -19,11 +19,7 @@
   @author ames
  */
 
-public class currentjvm extends jvm { 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+public class currentjvm extends jvm {
 
 	public String getName() {return "currentjvm";}
     public currentjvm(boolean noasyncgc, boolean verbosegc, boolean noclassgc,

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/dbcleanup.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/dbcleanup.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/dbcleanup.java	Fri Nov 12 13:10:42 2004
@@ -39,10 +39,6 @@
  **
  */
 public class dbcleanup {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	static String dbURL = "jdbc:derby:wombat";
 	static String driver = "org.apache.derby.jdbc.EmbeddedDriver";

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm13.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm13.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm13.java	Fri Nov 12 13:10:42 2004
@@ -19,10 +19,6 @@
   @author ames
  */
 public class ibm13 extends jvm {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 
 	public String getName(){return "ibm13";}
     public ibm13(boolean noasyncgc, boolean verbosegc, boolean noclassgc,

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm14.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm14.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm14.java	Fri Nov 12 13:10:42 2004
@@ -19,10 +19,6 @@
   @author ames
  */
 public class ibm14 extends jvm {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
 
 	public String getName(){return "ibm14";}
     public ibm14(boolean noasyncgc, boolean verbosegc, boolean noclassgc,

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9_13.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9_13.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9_13.java	Fri Nov 12 13:10:42 2004
@@ -21,10 +21,6 @@
   @author ge
  */
 public class j9_13 extends jvm {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
 
 	public String getName(){return "j9_13";}
     public j9_13(boolean noasyncgc, boolean verbosegc, boolean noclassgc,

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk13.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk13.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk13.java	Fri Nov 12 13:10:42 2004
@@ -19,10 +19,6 @@
   @author ames
  */
 public class jdk13 extends jvm {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	public String getName(){return "jdk13";}
     public jdk13(boolean noasyncgc, boolean verbosegc, boolean noclassgc,

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk14.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk14.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk14.java	Fri Nov 12 13:10:42 2004
@@ -19,10 +19,6 @@
   @author ames
  */
 public class jdk14 extends jvm {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 
 	public String getName(){return "jdk14";}
     public jdk14(boolean noasyncgc, boolean verbosegc, boolean noclassgc,

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk15.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk15.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk15.java	Fri Nov 12 13:10:42 2004
@@ -19,10 +19,6 @@
   @author ames
  */
 public class jdk15 extends jvm {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
 	public String getName(){return "jdk15";}
     public jdk15(boolean noasyncgc, boolean verbosegc, boolean noclassgc,

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jvm.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jvm.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jvm.java	Fri Nov 12 13:10:42 2004
@@ -52,10 +52,6 @@
 
 
 public abstract class jvm {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
     // they all take their defaults as the initial value.
     // -1, null, and false all will mean we won't include them

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/shutdown.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/shutdown.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/shutdown.java	Fri Nov 12 13:10:42 2004
@@ -28,11 +28,7 @@
  **
  */
 public class shutdown
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
+{
  
 	static String shutdownurl;
 	static String driver = "org.apache.derby.jdbc.EmbeddedDriver";

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSinSameJVM.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSinSameJVM.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSinSameJVM.java	Fri Nov 12 13:10:42 2004
@@ -16,10 +16,6 @@
 import java.io.PrintWriter;
 
 public class NSinSameJVM {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
 
     private static final int NETWORKSERVER_PORT = 20000;
 	private static final String INVALID_HOSTNAME = "myhost.nowhere.ibm.com";

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/badConnection.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/badConnection.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/badConnection.java	Fri Nov 12 13:10:42 2004
@@ -23,11 +23,7 @@
 */
 
 public class badConnection
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
+{
 	
 	private static Properties properties = new java.util.Properties();
 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/callable.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/callable.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/callable.java	Fri Nov 12 13:10:42 2004
@@ -28,11 +28,7 @@
 */
 
 public class callable
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
+{
 
 	public static void main (String args[])
 	{

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/checkSecMgr.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/checkSecMgr.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/checkSecMgr.java	Fri Nov 12 13:10:42 2004
@@ -25,11 +25,7 @@
 */
 
 public class checkSecMgr
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
+{
 
 	public static void main (String args[])
 	{

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/csPrepStmt.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/csPrepStmt.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/csPrepStmt.java	Fri Nov 12 13:10:42 2004
@@ -29,11 +29,7 @@
 */
 
 class csPrepStmt
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
+{
 	private static Connection conn = null;
 
 	public static void main (String args[])

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net.java	Fri Nov 12 13:10:42 2004
@@ -45,11 +45,7 @@
 import java.lang.reflect.*;
 
 public class dataSourcePermissions_net extends org.apache.derbyTesting.functionTests.tests.jdbcapi.dataSourcePermissions
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
+{
 
 	private static final int NETWORKSERVER_PORT = 20000;
 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dblook_test_net.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dblook_test_net.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dblook_test_net.java	Fri Nov 12 13:10:42 2004
@@ -13,10 +13,6 @@
 import org.apache.derbyTesting.functionTests.tests.tools.dblook_test;
 
 public class dblook_test_net extends dblook_test {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
 	// This test runs dblook on a test database using
 	// a connection to the Network Server.

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/executeUpdate.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/executeUpdate.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/executeUpdate.java	Fri Nov 12 13:10:42 2004
@@ -22,11 +22,7 @@
 */
 
 class executeUpdate
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
+{
 
 	public static void main (String args[])
 	{

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/getCurrentProperties.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/getCurrentProperties.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/getCurrentProperties.java	Fri Nov 12 13:10:42 2004
@@ -19,11 +19,7 @@
 */
 
 public class getCurrentProperties
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
+{
 	private static String databaseURL = "jdbc:derby:net://localhost:1527/wombat;create=true";
 	private static Properties properties = new java.util.Properties();
 	private static Object joinsync = new Object();

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/maxthreads.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/maxthreads.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/maxthreads.java	Fri Nov 12 13:10:42 2004
@@ -26,11 +26,7 @@
 */
 
 public class maxthreads
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
+{
 	private static String databaseURL = "jdbc:derby:net://localhost:1527/wombat;create=true";
 	private static Properties properties = new java.util.Properties();
 	private static jvm jvm;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/prepStmt.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/prepStmt.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/prepStmt.java	Fri Nov 12 13:10:42 2004
@@ -29,11 +29,7 @@
 */
 
 class prepStmt
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
+{
 	private static Connection conn = null;
 
 	public static void main (String args[])

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/runtimeinfo.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/runtimeinfo.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/runtimeinfo.java	Fri Nov 12 13:10:42 2004
@@ -27,11 +27,7 @@
 */
 
 public class runtimeinfo
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
+{
 
 	private static String databaseURL = "jdbc:derby:net://localhost:1527/wombat;create=true";
 	private static Properties properties = new java.util.Properties();

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/sysinfo.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/sysinfo.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/sysinfo.java	Fri Nov 12 13:10:42 2004
@@ -24,11 +24,7 @@
 */
 
 public class sysinfo
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
+{
 
 	private static String databaseURL = "jdbc:derby:net://localhost:1527/wombat;create=true";
 	private static Properties properties = new java.util.Properties();

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java	Fri Nov 12 13:10:42 2004
@@ -36,10 +36,6 @@
 
 public class testProperties
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
 	private static Properties properties = new java.util.Properties();
 	private static jvm jvm;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testconnection.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testconnection.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testconnection.java	Fri Nov 12 13:10:42 2004
@@ -25,10 +25,6 @@
 
 public class testconnection
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
 
 	private static String databaseURL = "jdbc:derby:net://localhost:1527/wombat;create=true";
 	private static Properties properties = new java.util.Properties();

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testij.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testij.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testij.java	Fri Nov 12 13:10:42 2004
@@ -22,11 +22,7 @@
 import org.apache.derby.drda.NetworkServerControl;
 
 public class testij
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
+{
 
 	private static String databaseURL = "jdbc:derby:net://localhost:1527/wombat";
 	private static Properties properties = new java.util.Properties();

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/timeslice.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/timeslice.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/timeslice.java	Fri Nov 12 13:10:42 2004
@@ -26,11 +26,7 @@
 */
 
 public class timeslice
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
+{
 
 	private static String databaseURL = "jdbc:derby:net://localhost:1527/wombat;create=true";
 	private static Properties properties = new java.util.Properties();

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/dataSourcePermissions.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/dataSourcePermissions.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/dataSourcePermissions.java	Fri Nov 12 13:10:42 2004
@@ -42,11 +42,7 @@
 import javax.naming.directory.*;
 
 public class dataSourcePermissions
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
+{
 
 	private static final String zeus = "\u0396\u0395\u03A5\u03A3";
 	private static final String apollo = "\u0391\u09A0\u039F\u039B\u039B\u039A\u0390";

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata.java	Fri Nov 12 13:10:42 2004
@@ -37,11 +37,7 @@
  * @author alan
  */
 
-public class metadata { 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+public class metadata {
 
 	public static void main(String[] args) {
 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadataMultiConn.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadataMultiConn.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadataMultiConn.java	Fri Nov 12 13:10:42 2004
@@ -27,10 +27,6 @@
 
 public class metadataMultiConn
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
 
 	public static Connection getConnection(String[] args, boolean autoCommit)
 		throws Exception

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/parameterMetaDataJdbc30.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/parameterMetaDataJdbc30.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/parameterMetaDataJdbc30.java	Fri Nov 12 13:10:42 2004
@@ -31,11 +31,7 @@
  */
 
 
-public class parameterMetaDataJdbc30 { 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
+public class parameterMetaDataJdbc30 {
 	private static boolean isDerbyNet;
 	public static void main(String[] args) {
 		Connection con = null;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30.java	Fri Nov 12 13:10:42 2004
@@ -30,11 +30,7 @@
  */
 
 
-public class savepointJdbc30 { 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
+public class savepointJdbc30 {
 
 	static private boolean isDerbyNet = false;
 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/AIjdbc.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/AIjdbc.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/AIjdbc.java	Fri Nov 12 13:10:42 2004
@@ -29,11 +29,7 @@
 	@author manish
  */
 public class AIjdbc
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
+{
 
 	public static void main(String[] args) {
 		System.out.println("Test AIjdbc starting");

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CharUTF8.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CharUTF8.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CharUTF8.java	Fri Nov 12 13:10:42 2004
@@ -27,11 +27,7 @@
  * Test all characters written through the UTF8 format.
  */
 
-public class CharUTF8 { 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
+public class CharUTF8 {
 
 	public static PreparedStatement psSet;
 	public static PreparedStatement psGet;    

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/WISCInsert.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/WISCInsert.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/WISCInsert.java	Fri Nov 12 13:10:42 2004
@@ -17,10 +17,6 @@
  * See The Benchmark Handbook, Second Edition (edited by Jim Gray).
  */
 public class WISCInsert {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
 
 	private static final char[] chars = {
 		'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/WiscMetaData.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/WiscMetaData.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/WiscMetaData.java	Fri Nov 12 13:10:42 2004
@@ -21,10 +21,6 @@
  * benchmark schema.
  */
 class WiscMetaData extends VTIMetaDataTemplate {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
  
 	public int getColumnCount() {
 		return 16;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/WiscVTI.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/WiscVTI.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/WiscVTI.java	Fri Nov 12 13:10:42 2004
@@ -22,10 +22,6 @@
  * See The Benchmark Handbook, Second Edition (edited by Jim Gray).
  */
 public class WiscVTI extends VTITemplate {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	int numrows;
 	int prime;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/bug4356.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/bug4356.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/bug4356.java	Fri Nov 12 13:10:42 2004
@@ -25,10 +25,6 @@
  * Demonstrate subselect behavior with prepared statement. 
  */
 public class bug4356 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
  
   public static void main (String args[]) 
   { 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/bug5052rts.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/bug5052rts.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/bug5052rts.java	Fri Nov 12 13:10:42 2004
@@ -33,10 +33,6 @@
  */
 
 public class bug5052rts {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
  
 	public static void main(String[] args) {
 		Connection conn;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/bug5054.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/bug5054.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/bug5054.java	Fri Nov 12 13:10:42 2004
@@ -22,10 +22,6 @@
  * Where current of cursorname and case sensitivity
  */
 public class bug5054 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
 
   public static void main (String args[]) 
   { 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/casting.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/casting.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/casting.java	Fri Nov 12 13:10:42 2004
@@ -19,11 +19,7 @@
 import java.io.*;
 
 
-public class casting { 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
+public class casting {
 
 	public static String VALID_DATE_STRING = "'2000-01-01'";
 	public static String VALID_TIME_STRING = "'15:30:20'";

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/closed.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/closed.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/closed.java	Fri Nov 12 13:10:42 2004
@@ -35,10 +35,6 @@
 	@author ames
  */
 public class closed implements Runnable {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 
 	public static void main(String[] args) {

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/coalesceTests.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/coalesceTests.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/coalesceTests.java	Fri Nov 12 13:10:42 2004
@@ -23,11 +23,7 @@
  * can be null. The selected argument is converted, if necessary, to the attributes of the result.
  */
 public class coalesceTests
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
+{
 
 	private static String VALID_DATE_STRING = "'2000-01-01'";
 	private static String VALID_TIME_STRING = "'15:30:20'";

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/concateTests.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/concateTests.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/concateTests.java	Fri Nov 12 13:10:42 2004
@@ -23,11 +23,7 @@
   Concatenation tests for various datatypes
  */
 public class concateTests
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
+{
 
 	private static String[] concatenatedSQLTypesNames =
 	{

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/currentof.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/currentof.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/currentof.java	Fri Nov 12 13:10:42 2004
@@ -33,11 +33,7 @@
   NIST suite or some equivalent will suffice.
  */
 
-public class currentof { 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+public class currentof {
 
 	private static Connection conn;
 	private static boolean passed = false;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/cursor.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/cursor.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/cursor.java	Fri Nov 12 13:10:42 2004
@@ -33,11 +33,7 @@
   NIST suite or some equivalent will suffice.
  */
 
-public class cursor { 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+public class cursor {
 
 	private static Connection conn;
 	private static boolean passed = false;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dbManagerLimits.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dbManagerLimits.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dbManagerLimits.java	Fri Nov 12 13:10:42 2004
@@ -20,11 +20,7 @@
   Test various data manager limits like in db2 here.
  */
 public class dbManagerLimits
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
+{
 
 	public static void main (String[] argv) throws Throwable
 	{

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/deadlockMode.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/deadlockMode.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/deadlockMode.java	Fri Nov 12 13:10:42 2004
@@ -33,11 +33,7 @@
 	and then both thread will want the same table lock.
  */
 
-public class deadlockMode { 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
+public class deadlockMode {
 
 	private static final int THREAD_COUNT = 20;
 	private static boolean passed = false;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/declareGlobalTempTableJava.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/declareGlobalTempTableJava.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/declareGlobalTempTableJava.java	Fri Nov 12 13:10:42 2004
@@ -30,11 +30,7 @@
  */
 
 
-public class declareGlobalTempTableJava { 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
+public class declareGlobalTempTableJava {
 
 	/*
 	** There is a small description prior to each sub-test describing what is being tested.

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/declareGlobalTempTableJavaJDBC30.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/declareGlobalTempTableJavaJDBC30.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/declareGlobalTempTableJavaJDBC30.java	Fri Nov 12 13:10:42 2004
@@ -37,11 +37,7 @@
  */
 
 
-public class declareGlobalTempTableJavaJDBC30 { 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
+public class declareGlobalTempTableJavaJDBC30 {
 
 	static private boolean isDerbyNet = false;
 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/forbitdata.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/forbitdata.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/forbitdata.java	Fri Nov 12 13:10:42 2004
@@ -17,11 +17,7 @@
 import java.math.BigDecimal;
 
 public class forbitdata
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
+{
 
 	static private boolean isDB2jNet;
 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJavaReflection.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJavaReflection.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJavaReflection.java	Fri Nov 12 13:10:42 2004
@@ -29,10 +29,6 @@
  * this feature under jdk13.
  */
 public class holdCursorJavaReflection {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
 
   //we implemented hold cursor functionality in EmbedConnection20 package and hence
   //the functionality is available under both jdk14 and jdk13 (though, jdbc in jdk13

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/logStream.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/logStream.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/logStream.java	Fri Nov 12 13:10:42 2004
@@ -20,10 +20,6 @@
  * Demonstrate subselect behavior with prepared statement. 
  */
 public class logStream {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
 
   public static void main (String args[]) 
   { 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/longStringColumn.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/longStringColumn.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/longStringColumn.java	Fri Nov 12 13:10:42 2004
@@ -28,11 +28,7 @@
  */
 
 
-public class longStringColumn { 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+public class longStringColumn {
 
 	public static PreparedStatement psSet;
 	public static PreparedStatement psGet;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/outparams.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/outparams.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/outparams.java	Fri Nov 12 13:10:42 2004
@@ -18,11 +18,7 @@
 import java.math.BigDecimal;
 
 public class outparams
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+{
  
 	static final String outputMethods[] =
 	{

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure.java	Fri Nov 12 13:10:42 2004
@@ -24,11 +24,7 @@
 import org.apache.derbyTesting.functionTests.tests.jdbcapi.parameterMetaDataJdbc30;
 
 public class procedure
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
+{
 
   private static Class[] CONN_PARAM = { Integer.TYPE };
   private static Object[] CONN_ARG = { new Integer(JDBC30Translation.CLOSE_CURSORS_AT_COMMIT)};

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/repeat.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/repeat.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/repeat.java	Fri Nov 12 13:10:42 2004
@@ -34,11 +34,7 @@
 	@author ames
  */
 
-public class repeat { 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+public class repeat {
 
 
 	public static void main(String[] args) {

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/simpleThread.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/simpleThread.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/simpleThread.java	Fri Nov 12 13:10:42 2004
@@ -20,11 +20,7 @@
 /*
 	This is from a bug found by a beta customer.
  */
-public class simpleThread implements Runnable { 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+public class simpleThread implements Runnable {
 
         private static Connection _connection = null;
         private static boolean _inUse = false;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/simpleThreadWrapper.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/simpleThreadWrapper.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/simpleThreadWrapper.java	Fri Nov 12 13:10:42 2004
@@ -16,11 +16,7 @@
  */
 
 public class simpleThreadWrapper
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
+{
  
     public static void main(String[] args) 
     {

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/stmtCache3.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/stmtCache3.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/stmtCache3.java	Fri Nov 12 13:10:42 2004
@@ -30,11 +30,7 @@
  */
 
 
-public class stmtCache3 { 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+public class stmtCache3 {
 
 	private static Connection conn;
 	private static boolean passed = false;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/streams.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/streams.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/streams.java	Fri Nov 12 13:10:42 2004
@@ -40,11 +40,7 @@
   Because of this, I had to make some changes into the stack level checking for long varchars.
  */
 
-public class streams { 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
+public class streams {
 
 	private static int pkCount;
 	private static Connection conn;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/updateCursor.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/updateCursor.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/updateCursor.java	Fri Nov 12 13:10:42 2004
@@ -33,11 +33,7 @@
 
  */
 
-public class updateCursor { 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
+public class updateCursor {
 
 	private static Connection conn;
 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/userDefMethods.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/userDefMethods.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/userDefMethods.java	Fri Nov 12 13:10:42 2004
@@ -17,10 +17,6 @@
 //These are not generic methods, typically  used by a particular tests.
 public class userDefMethods
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
  
 	//method that does a delete of rows on table t1 based on values from triggers.
     public static void deleteFromATable() throws SQLException

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/dblook_test.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/dblook_test.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/dblook_test.java	Fri Nov 12 13:10:42 2004
@@ -38,10 +38,6 @@
 import java.util.StringTokenizer;
 
 public class dblook_test {
-	/* 
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
 	private static final int SERVER_PORT = 1527;
 	private static final int FRONT = -1;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ConsistencyChecker.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ConsistencyChecker.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ConsistencyChecker.java	Fri Nov 12 13:10:42 2004
@@ -41,11 +41,7 @@
  * objects like tables.
  */
 public class ConsistencyChecker
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+{
 
 	/**
 	 * Run all of the consistency checkers which do not take parameters.

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/DbFile.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/DbFile.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/DbFile.java	Fri Nov 12 13:10:42 2004
@@ -27,11 +27,7 @@
   Utility class for testing files stored in the database.
   */ 
 public class DbFile
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+{
 	/**
 	  Read the current generation of a file stored in the
 	  database we are connected to and return a 1 line string

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ExtendingInterface.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ExtendingInterface.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ExtendingInterface.java	Fri Nov 12 13:10:42 2004
@@ -11,10 +11,6 @@
 package org.apache.derbyTesting.functionTests.util;
 
 public interface ExtendingInterface extends Runnable {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	public static int INTERFACE_FIELD = 7541;
 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/Formatters.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/Formatters.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/Formatters.java	Fri Nov 12 13:10:42 2004
@@ -11,11 +11,7 @@
 package org.apache.derbyTesting.functionTests.util;
 
 
-public class Formatters { 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
+public class Formatters {
 
 	static final char[] hexDigits = { '0', '1', '2', '3',
 									  '4', '5', '6', '7',

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/JDBCTestDisplayUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/JDBCTestDisplayUtil.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/JDBCTestDisplayUtil.java	Fri Nov 12 13:10:42 2004
@@ -40,10 +40,6 @@
 **/
 
 public class JDBCTestDisplayUtil extends JDBCDisplayUtil {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
 	/**
 	   Show common format for Network Server and Embedded Exceptions

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ManyMethods.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ManyMethods.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ManyMethods.java	Fri Nov 12 13:10:42 2004
@@ -24,11 +24,7 @@
  */
 
 public class ManyMethods implements Serializable
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+{
 
 	int	value;
 	protected int protectedValue;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/NoMethodInterface.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/NoMethodInterface.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/NoMethodInterface.java	Fri Nov 12 13:10:42 2004
@@ -11,10 +11,6 @@
 package org.apache.derbyTesting.functionTests.util;
 
 public interface NoMethodInterface {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	// this field is implicitly public
 	static int INTERFACE_FIELD = 6;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ProcedureTest.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ProcedureTest.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ProcedureTest.java	Fri Nov 12 13:10:42 2004
@@ -18,10 +18,6 @@
 	Java procedures for the procedure.sql test.
 */
 public abstract class ProcedureTest implements ResultSet {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
 
 	public static void zeroArg() {
 		System.out.println("zeroArg() called");

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/PropertyUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/PropertyUtil.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/PropertyUtil.java	Fri Nov 12 13:10:42 2004
@@ -16,11 +16,7 @@
     A bread for the internalUtil class
 */
 public abstract class PropertyUtil extends org.apache.derby.iapi.util.PropertyUtil
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+{
 	public static Serializable getDatabasePropertyDefault(String k) throws Exception
 	{
         LanguageConnectionContext lcc =

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ShortHolder.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ShortHolder.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ShortHolder.java	Fri Nov 12 13:10:42 2004
@@ -20,11 +20,7 @@
  */
 
 public class ShortHolder implements Serializable
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+{
 	short		value;
 
 	/**

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/StatParser.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/StatParser.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/StatParser.java	Fri Nov 12 13:10:42 2004
@@ -16,11 +16,7 @@
  * RESOLVE: This class should be internationalized.
  */
 public class StatParser
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+{
 	public static String getScanCols(String runTimeStats)
 		throws Throwable
 	{

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/StaticInitializers/DMLInStaticInitializer.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/StaticInitializers/DMLInStaticInitializer.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/StaticInitializers/DMLInStaticInitializer.java	Fri Nov 12 13:10:42 2004
@@ -17,11 +17,7 @@
 
 /** Test DML statement called from within static initializer */
 public class DMLInStaticInitializer
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+{
 
 	/* This is the method that is invoked from the outer query */
 	public static int getANumber()

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/StaticInitializers/InsertInStaticInitializer.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/StaticInitializers/InsertInStaticInitializer.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/StaticInitializers/InsertInStaticInitializer.java	Fri Nov 12 13:10:42 2004
@@ -20,11 +20,7 @@
  * hold onto.
 */
 public class InsertInStaticInitializer
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
+{
 
 	/* This is the method that is invoked from the outer query */
 	public static int getANumber()

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/StreamUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/StreamUtil.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/StreamUtil.java	Fri Nov 12 13:10:42 2004
@@ -23,11 +23,7 @@
  * Methods for stream columns
  */
 public class StreamUtil
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+{
 
 	public static void insertAsciiColumn
 	(

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SubClass.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SubClass.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SubClass.java	Fri Nov 12 13:10:42 2004
@@ -15,11 +15,7 @@
  */
 
 public class SubClass extends ManyMethods
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+{
 
 	static int OVERLOADED_INTSTATIC = 2;
 	public static int OVEROVERLOADED_INTSTATIC = 2;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SubInterfaceClass.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SubInterfaceClass.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SubInterfaceClass.java	Fri Nov 12 13:10:42 2004
@@ -12,10 +12,6 @@
 
 public class SubInterfaceClass extends ManyMethods
 	implements NoMethodInterface, ExtendingInterface {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	public SubInterfaceClass(int value) {
 		super(value);

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SubSubClass.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SubSubClass.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SubSubClass.java	Fri Nov 12 13:10:42 2004
@@ -15,11 +15,7 @@
  */
 
 public class SubSubClass extends SubClass
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+{
 
 	public static int OVEROVERLOADED_INTSTATIC = 3;
 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/T_Access.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/T_Access.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/T_Access.java	Fri Nov 12 13:10:42 2004
@@ -24,11 +24,7 @@
   */
 
 public class T_Access
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
+{
 
 	public static AccessFactory getAccessFactory() throws SQLException
 	{

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/T_Authorize.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/T_Authorize.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/T_Authorize.java	Fri Nov 12 13:10:42 2004
@@ -19,11 +19,7 @@
 
 /** Utility functions for testing authorization. */
 public class T_Authorize
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+{
 
 	public static void verifyAccessRW(int k)
 		 throws Exception

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/T_ConsistencyChecker.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/T_ConsistencyChecker.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/T_ConsistencyChecker.java	Fri Nov 12 13:10:42 2004
@@ -53,11 +53,7 @@
  * the sharing of code across the various static methods.
  */
 public class T_ConsistencyChecker
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+{
 	private	DataDictionary				dd;
 	private	TransactionController		tc;
 	private	LanguageConnectionContext	lcc;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/TestPropertyInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/TestPropertyInfo.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/TestPropertyInfo.java	Fri Nov 12 13:10:42 2004
@@ -34,10 +34,6 @@
  */
 public class TestPropertyInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
     /**
      * Get ALL the Properties associated with a given table, not just the

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/TestUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/TestUtil.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/TestUtil.java	Fri Nov 12 13:10:42 2004
@@ -20,10 +20,6 @@
 	Utility methods for tests, in order to bring some consistency to test output.
 */
 public class TestUtil {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	public static void dumpSQLExceptions(SQLException sqle) {
 		TestUtil.dumpSQLExceptions(sqle, false);

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/Triggers.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/Triggers.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/Triggers.java	Fri Nov 12 13:10:42 2004
@@ -19,11 +19,7 @@
  * Methods for testing triggers
  */
 public class Triggers
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+{
 
 	// used for threading test
 	static TriggerThread triggerThread;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/VTIClasses/AbstractAllNegativeNoStatic.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/VTIClasses/AbstractAllNegativeNoStatic.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/VTIClasses/AbstractAllNegativeNoStatic.java	Fri Nov 12 13:10:42 2004
@@ -32,11 +32,7 @@
  * method.
  */
 public abstract class AbstractAllNegativeNoStatic extends VTITemplate
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+{
 
 	public AbstractAllNegativeNoStatic() throws SQLException
 	{

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/VTIClasses/ECTResult.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/VTIClasses/ECTResult.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/VTIClasses/ECTResult.java	Fri Nov 12 13:10:42 2004
@@ -33,10 +33,6 @@
 	 */
 
 public class ECTResult extends VTITemplate {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	private Connection				conn;
 	private int						columnCount;
 	private boolean[]				insertNulls;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/VTIClasses/ExternalTable.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/VTIClasses/ExternalTable.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/VTIClasses/ExternalTable.java	Fri Nov 12 13:10:42 2004
@@ -41,10 +41,6 @@
  *
  */
 public class ExternalTable extends UpdatableVTITemplate  {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
 
 	private Connection	conn;
 	private int		columnCount = 0;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/VTIClasses/PositiveInteger_VTICosting_SI.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/VTIClasses/PositiveInteger_VTICosting_SI.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/VTIClasses/PositiveInteger_VTICosting_SI.java	Fri Nov 12 13:10:42 2004
@@ -32,11 +32,7 @@
  * method.
  */
 public class PositiveInteger_VTICosting_SI extends AbstractAllNegativeNoStatic implements VTICosting
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+{
 
 	private boolean returnedRow = false;
 	private Integer integer;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/VTIClasses/ResultSetMetaDataPositive.java
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/VTIClasses/ResultSetMetaDataPositive.java	(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/VTIClasses/ResultSetMetaDataPositive.java	Fri Nov 12 13:10:42 2004
@@ -33,11 +33,7 @@
  * default values, the other for caller specified values.
  */
 public class ResultSetMetaDataPositive extends VTIMetaDataTemplate
-{ 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+{
 
 	int			columnCount;
 	int[]		nullable;

Mime
View raw message