You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by dj...@apache.org on 2004/11/11 19:22:05 UTC
svn commit: rev 57451 - in incubator/derby/code/trunk/java/tools/org/apache/derby: iapi/tools/i18n impl/tools/cslook impl/tools/ij impl/tools/sysinfo tools
Author: djd
Date: Thu Nov 11 10:22:04 2004
New Revision: 57451
Modified:
incubator/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedInput.java
incubator/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedOutput.java
incubator/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Check.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Index.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Jar.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Key.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Schema.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_StoredProcedure.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Table.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Trigger.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_View.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/Logs.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/AsyncStatement.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/AttributeHolder.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ConnectionEnv.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/Main.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/Main14.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ParseException.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/Session.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/StatementFinder.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/UCode_CharStream.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijConnectionResult.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijException.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijExceptionResult.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijFatalException.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijMultiResult.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijResult.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijResultImpl.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijRowResult.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijStatementResult.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijTokenException.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijVectorResult.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijWarningResult.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTestCase.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTestSuite.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTester.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTime.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/util.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain14.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/xaAbstractHelper.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/xaHelper.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/ZipInfoProperties.java
incubator/derby/code/trunk/java/tools/org/apache/derby/tools/JDBCDisplayUtil.java
incubator/derby/code/trunk/java/tools/org/apache/derby/tools/URLCheck.java
incubator/derby/code/trunk/java/tools/org/apache/derby/tools/dblook.java
incubator/derby/code/trunk/java/tools/org/apache/derby/tools/ij.java
incubator/derby/code/trunk/java/tools/org/apache/derby/tools/sysinfo.java
Log:
Remove IBM's binary copyright in java files under java/tools
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedInput.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedInput.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedInput.java Thu Nov 11 10:22:04 2004
@@ -15,10 +15,6 @@
import java.io.IOException;
public class LocalizedInput extends InputStreamReader{
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
private InputStream in;
public LocalizedInput(InputStream i){
super(i);
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedOutput.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedOutput.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedOutput.java Thu Nov 11 10:22:04 2004
@@ -15,10 +15,6 @@
import java.io.UnsupportedEncodingException;
public class LocalizedOutput extends PrintWriter {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
private OutputStream out;
public LocalizedOutput(OutputStream o){
super(new OutputStreamWriter(o), true);
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java Thu Nov 11 10:22:04 2004
@@ -33,10 +33,6 @@
public class LocalizedResource implements java.security.PrivilegedAction {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
private ResourceBundle res;
private Locale locale;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Check.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Check.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Check.java Thu Nov 11 10:22:04 2004
@@ -24,15 +24,6 @@
public class DB_Check {
- /*
- IBM Copyright © notice.
- */
- /**
- IBM Copyright © notice.
- */
-
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
-
/* ************************************************
* Generate the DDL for all checks in a given
* database.
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Index.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Index.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Index.java Thu Nov 11 10:22:04 2004
@@ -23,15 +23,6 @@
public class DB_Index {
- /*
- IBM Copyright © notice.
- */
- /**
- IBM Copyright © notice.
- */
-
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
-
/* ************************************************
* Generate the DDL for all indexes in a given
* database.
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Jar.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Jar.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Jar.java Thu Nov 11 10:22:04 2004
@@ -28,15 +28,6 @@
public class DB_Jar {
- /*
- IBM Copyright © notice.
- */
- /**
- IBM Copyright © notice.
- */
-
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
-
/* ************************************************
* Generate the DDL for all jars in a given
* database.
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Key.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Key.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Key.java Thu Nov 11 10:22:04 2004
@@ -24,15 +24,6 @@
public class DB_Key {
- /*
- IBM Copyright © notice.
- */
- /**
- IBM Copyright © notice.
- */
-
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
-
// Prepared statements used throughout the DDL
// generation process.
private static PreparedStatement getReferenceCols;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Schema.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Schema.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Schema.java Thu Nov 11 10:22:04 2004
@@ -21,15 +21,6 @@
public class DB_Schema {
- /*
- IBM Copyright © notice.
- */
- /**
- IBM Copyright © notice.
- */
-
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
-
/* ************************************************
* Generate the DDL for all schemas in a given
* database.
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_StoredProcedure.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_StoredProcedure.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_StoredProcedure.java Thu Nov 11 10:22:04 2004
@@ -22,15 +22,6 @@
public class DB_StoredProcedure {
- /*
- IBM Copyright © notice.
- */
- /**
- IBM Copyright © notice.
- */
-
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
-
// Prepared statements use throughout the DDL
// generation process.
private static PreparedStatement getSpecificInfoQuery;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Table.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Table.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Table.java Thu Nov 11 10:22:04 2004
@@ -25,15 +25,6 @@
public class DB_Table {
- /*
- IBM Copyright © notice.
- */
- /**
- IBM Copyright © notice.
- */
-
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
-
// Prepared statements use throughout the DDL
// generation process.
private static PreparedStatement getColumnInfoStmt;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Trigger.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Trigger.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Trigger.java Thu Nov 11 10:22:04 2004
@@ -23,15 +23,6 @@
public class DB_Trigger {
- /*
- IBM Copyright © notice.
- */
- /**
- IBM Copyright © notice.
- */
-
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
-
/* ************************************************
* Generate the DDL for all triggers in a given
* database.
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_View.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_View.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_View.java Thu Nov 11 10:22:04 2004
@@ -21,15 +21,6 @@
public class DB_View {
- /*
- IBM Copyright © notice.
- */
- /**
- IBM Copyright © notice.
- */
-
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
-
/* ************************************************
* Generate the DDL for all views in a given
* database.
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/Logs.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/Logs.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/Logs.java Thu Nov 11 10:22:04 2004
@@ -19,15 +19,6 @@
public class Logs {
- /*
- IBM Copyright © notice.
- */
- /**
- IBM Copyright © notice.
- */
-
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
-
// Log file (for errors/warnings).
private static PrintWriter logFile = null;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/AsyncStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/AsyncStatement.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/AsyncStatement.java Thu Nov 11 10:22:04 2004
@@ -16,10 +16,6 @@
//import java.io.PrintStream;
class AsyncStatement extends Thread {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
Connection conn;
String stmt;
ijResult result;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/AttributeHolder.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/AttributeHolder.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/AttributeHolder.java Thu Nov 11 10:22:04 2004
@@ -23,10 +23,6 @@
import java.sql.SQLException;
public class AttributeHolder {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
//This is an inner class. This class hold the details about each
//specific attribute which includes what the attribute is and
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ConnectionEnv.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ConnectionEnv.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ConnectionEnv.java Thu Nov 11 10:22:04 2004
@@ -30,10 +30,6 @@
@author jerry
*/
class ConnectionEnv {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
Hashtable sessions = new Hashtable();
private Session currSession;
private String tag;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/Main.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/Main.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/Main.java Thu Nov 11 10:22:04 2004
@@ -48,10 +48,6 @@
*
*/
public class Main {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
public LocalizedOutput out;
public utilMain utilInstance;
public Class langUtilClass;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/Main14.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/Main14.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/Main14.java Thu Nov 11 10:22:04 2004
@@ -36,10 +36,6 @@
public class Main14 extends Main
{
/**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
- /**
* ij can be used directly on a shell command line through
* its main program.
* @param args allows 1 file name to be specified, from which
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ParseException.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ParseException.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ParseException.java Thu Nov 11 10:22:04 2004
@@ -21,10 +21,6 @@
*/
public class ParseException extends Exception {
/**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
- /**
* This constructor is used by the method "generateParseException"
* in the generated parser. Calling this constructor generates
* a new object of this type with the fields "currentToken",
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/Session.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/Session.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/Session.java Thu Nov 11 10:22:04 2004
@@ -31,10 +31,6 @@
@author ames
*/
class Session {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
static final String DEFAULT_NAME="CONNECTION";
boolean singleSession = true;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/StatementFinder.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/StatementFinder.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/StatementFinder.java Thu Nov 11 10:22:04 2004
@@ -36,10 +36,6 @@
*/
public class StatementFinder {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
private Reader source;
private StringBuffer statement = new StringBuffer();
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/UCode_CharStream.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/UCode_CharStream.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/UCode_CharStream.java Thu Nov 11 10:22:04 2004
@@ -18,10 +18,6 @@
public final class UCode_CharStream implements CharStream
{
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
public static final boolean staticFlag = false;
public int bufpos = -1;
int bufsize;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijConnectionResult.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijConnectionResult.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijConnectionResult.java Thu Nov 11 10:22:04 2004
@@ -18,10 +18,6 @@
* @author ames
*/
class ijConnectionResult extends ijResultImpl {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
Connection conn;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijException.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijException.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijException.java Thu Nov 11 10:22:04 2004
@@ -24,10 +24,6 @@
*/
public class ijException extends RuntimeException {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
private final static String IllegalStatementName="IJ_IllegalStatementName";
private final static String NotYetImplemented="IJ_NotYetImpl";
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijExceptionResult.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijExceptionResult.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijExceptionResult.java Thu Nov 11 10:22:04 2004
@@ -21,10 +21,6 @@
* @author ames
*/
class ijExceptionResult extends ijResultImpl {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
SQLException except;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijFatalException.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijFatalException.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijFatalException.java Thu Nov 11 10:22:04 2004
@@ -18,10 +18,6 @@
*/
public class ijFatalException extends RuntimeException {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
private final static String FatalException = LocalizedResource.getMessage("IJ_FataExceTerm");
private SQLException e;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijMultiResult.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijMultiResult.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijMultiResult.java Thu Nov 11 10:22:04 2004
@@ -25,10 +25,6 @@
* @author ames
*/
class ijMultiResult extends ijResultImpl {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
Vector results = new Vector();
Statement statement;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijResult.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijResult.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijResult.java Thu Nov 11 10:22:04 2004
@@ -26,10 +26,6 @@
*
*/
public interface ijResult {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
boolean isConnection();
boolean isStatement();
boolean isResultSet() throws SQLException;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijResultImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijResultImpl.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijResultImpl.java Thu Nov 11 10:22:04 2004
@@ -24,10 +24,6 @@
* @author ames
*/
abstract class ijResultImpl implements ijResult {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
public boolean isConnection() { return false; }
public boolean isStatement() { return false; }
public boolean isResultSet() throws SQLException { return false; }
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijRowResult.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijRowResult.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijRowResult.java Thu Nov 11 10:22:04 2004
@@ -25,10 +25,6 @@
* @author ames
*/
public class ijRowResult extends ijResultImpl {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
ResultSet rowResult;
boolean hadRow;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijStatementResult.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijStatementResult.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijStatementResult.java Thu Nov 11 10:22:04 2004
@@ -24,10 +24,6 @@
* @author ames
*/
class ijStatementResult extends ijResultImpl {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
Statement statement;
boolean closeWhenDone;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijTokenException.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijTokenException.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijTokenException.java Thu Nov 11 10:22:04 2004
@@ -11,10 +11,6 @@
package org.apache.derby.impl.tools.ij;
public class ijTokenException extends RuntimeException {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
public ijTokenException(String message) {
super(message);
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijVectorResult.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijVectorResult.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijVectorResult.java Thu Nov 11 10:22:04 2004
@@ -19,10 +19,6 @@
* @author ames
*/
class ijVectorResult extends ijResultImpl {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
Vector vec;
SQLWarning warns;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijWarningResult.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijWarningResult.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijWarningResult.java Thu Nov 11 10:22:04 2004
@@ -25,10 +25,6 @@
* @author ames
*/
class ijWarningResult extends ijResultImpl {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
SQLWarning warn;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTestCase.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTestCase.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTestCase.java Thu Nov 11 10:22:04 2004
@@ -25,10 +25,6 @@
*/
public class mtTestCase
{
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
public String name = null;
public String file = null;
public String propFile = null;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTestSuite.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTestSuite.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTestSuite.java Thu Nov 11 10:22:04 2004
@@ -21,10 +21,6 @@
*/
public class mtTestSuite
{
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
private Vector cases;
private Vector last;
private Vector init;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTester.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTester.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTester.java Thu Nov 11 10:22:04 2004
@@ -25,10 +25,6 @@
*/
public class mtTester implements Runnable
{
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
private mtTestSuite suite;
private String name;
private LocalizedOutput log;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTime.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTime.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTime.java Thu Nov 11 10:22:04 2004
@@ -14,10 +14,6 @@
*/
public class mtTime
{
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
public int hours;
public int minutes;
public int seconds;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/util.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/util.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/util.java Thu Nov 11 10:22:04 2004
@@ -40,10 +40,6 @@
@author ames
*/
public class util implements java.security.PrivilegedAction {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
private util() {}
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain.java Thu Nov 11 10:22:04 2004
@@ -49,10 +49,6 @@
@author jerry
*/
public class utilMain implements java.security.PrivilegedAction {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_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/tools/org/apache/derby/impl/tools/ij/utilMain14.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain14.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain14.java Thu Nov 11 10:22:04 2004
@@ -28,10 +28,6 @@
*/
public class utilMain14 extends utilMain
{
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
private static final String JDBC_NOTSUPPORTED = "JDBC 3 method called - not yet supported";
/**
* Set up the test to run with 'numConnections' connections/users.
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/xaAbstractHelper.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/xaAbstractHelper.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/xaAbstractHelper.java Thu Nov 11 10:22:04 2004
@@ -21,10 +21,6 @@
*/
interface xaAbstractHelper
{
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
void XADataSourceStatement(ij parser, Token dbname, Token shut, String create) throws SQLException;
void XAConnectStatement(ij parser, Token user, Token pass, String id) throws SQLException;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/xaHelper.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/xaHelper.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/xaHelper.java Thu Nov 11 10:22:04 2004
@@ -31,10 +31,6 @@
*/
class xaHelper implements xaAbstractHelper
{
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
private XADataSource currentXADataSource;
private XAConnection currentXAConnection;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java Thu Nov 11 10:22:04 2004
@@ -65,10 +65,6 @@
public final class Main {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
/**
Application entry point for SysInfo. This will print out
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/ZipInfoProperties.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/ZipInfoProperties.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/ZipInfoProperties.java Thu Nov 11 10:22:04 2004
@@ -18,12 +18,7 @@
import org.apache.derby.iapi.services.info.ProductVersionHolder;
public class ZipInfoProperties // extends Properties
- /**
- IBM Copyright © notice.
- */
-
-{ private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-
+{
private final ProductVersionHolder version;
/**
full path to zip (or expanded zip)
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/tools/JDBCDisplayUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/tools/JDBCDisplayUtil.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/tools/JDBCDisplayUtil.java Thu Nov 11 10:22:04 2004
@@ -45,12 +45,7 @@
@author ames
*/
-public class JDBCDisplayUtil {
-
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+public class JDBCDisplayUtil {
// used to control display
static final private int MINWIDTH = 4;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/tools/URLCheck.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/tools/URLCheck.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/tools/URLCheck.java Thu Nov 11 10:22:04 2004
@@ -31,10 +31,6 @@
*/
public class URLCheck {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
public Vector attributes;
public static Vector booleanAttributes;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/tools/dblook.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/tools/dblook.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/tools/dblook.java Thu Nov 11 10:22:04 2004
@@ -41,15 +41,6 @@
public class dblook {
- /*
- IBM Copyright © notice.
- */
- /**
- IBM Copyright © notice.
- */
-
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
-
// DB2 enforces a maximum of 30 tables to be specified as part of
// the table list.
public static final int DB2_MAX_NUMBER_OF_TABLES = 30;
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/tools/ij.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/tools/ij.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/tools/ij.java Thu Nov 11 10:22:04 2004
@@ -31,10 +31,6 @@
ij is can also be used with any database server that supports a JDBC driver.
*/
public class ij {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
/**
@exception IOException thrown if cannot access input or output files.
Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/tools/sysinfo.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/tools/sysinfo.java (original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/tools/sysinfo.java Thu Nov 11 10:22:04 2004
@@ -37,10 +37,6 @@
*/
public class sysinfo {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
static public void main(String[] args) {
Main.main(args);