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 06:04:23 UTC
svn commit: rev 57420 - in incubator/derby/code/trunk/java/drda/org/apache/derby: drda impl/drda
Author: djd
Date: Wed Nov 10 21:04:22 2004
New Revision: 57420
Modified:
incubator/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java
incubator/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CcsidManager.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CharacterEncodings.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CodePoint.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CodePointNameTable.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DB2jServerImpl.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAProtocolException.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAProtocolExceptionInfo.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DssConstants.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DssTrace.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EbcdicCcsidManager.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/FdocaConstants.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SQLTypes.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Session.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SignedBinary.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/TestFile.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/TestProto.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/memCheck.java
Log:
Remove IBM's binary copyright in java files under java/drda
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java Wed Nov 10 21:04:22 2004
@@ -39,12 +39,6 @@
*/
public class NetServlet extends HttpServlet {
- /**
- IBM Copyright © notice.
- */
-
-
- private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
private final static int MAX_CONNECT_TRYS = 20;
private final static String SERVLET_PROP_MESSAGES = "org.apache.derby.loc.drda.servlet";
private final static String SERVLET_ADDRESS = "csnet";
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java Wed Nov 10 21:04:22 2004
@@ -151,13 +151,7 @@
*/
-public class NetworkServerControl{
-
- /**
- IBM Copyright © notice.
- */
-
- private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
+public class NetworkServerControl{
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java Wed Nov 10 21:04:22 2004
@@ -19,11 +19,6 @@
*/
class AppRequester
{
- /**
- IBM Copyright © notice.
- */
-
- private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
protected static final int MGR_LEVEL_UNKNOWN = -1;
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CcsidManager.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CcsidManager.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CcsidManager.java Wed Nov 10 21:04:22 2004
@@ -12,11 +12,6 @@
// Peforms character conversions.
abstract class CcsidManager
{
- /**
- IBM Copyright © notice.
- */
-
- private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
byte space; // ' ' character
byte dot; // '.' character
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CharacterEncodings.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CharacterEncodings.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CharacterEncodings.java Wed Nov 10 21:04:22 2004
@@ -12,11 +12,6 @@
public final class CharacterEncodings
{
- /**
- IBM Copyright © notice.
- */
-
- private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
// This is a static class, so hide the default constructor.
private CharacterEncodings () {}
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java Wed Nov 10 21:04:22 2004
@@ -15,11 +15,6 @@
import java.security.*;
class ClientThread extends Thread {
- /**
- IBM Copyright © notice.
- */
-
- private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
DB2jServerImpl parent;
ServerSocket serverSocket;
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CodePoint.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CodePoint.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CodePoint.java Wed Nov 10 21:04:22 2004
@@ -16,11 +16,6 @@
class CodePoint
{
- /**
- IBM Copyright © notice.
- */
-
- private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
// --------------------code points for constant ddm data----------------------
// Indicates false state. This 1-byte code point is used by some DDM parameters.
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CodePointNameTable.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CodePointNameTable.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CodePointNameTable.java Wed Nov 10 21:04:22 2004
@@ -17,11 +17,6 @@
class CodePointNameTable extends java.util.Hashtable
{
- /**
- IBM Copyright © notice.
- */
-
- private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
CodePointNameTable ()
{
put (new Integer (CodePoint.ABNUOWRM), "ABNUOWRM");
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DB2jServerImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DB2jServerImpl.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DB2jServerImpl.java Wed Nov 10 21:04:22 2004
@@ -67,11 +67,7 @@
@see NetworkServerControl for description
*/
- /**
- IBM Copyright © notice.
- */
-
-public class DB2jServerImpl { private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
+public class DB2jServerImpl {
private final static int NO_USAGE_MSGS= 12;
private final static String [] COMMANDS =
{"start","shutdown","trace","tracedirectory","ping",
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java Wed Nov 10 21:04:22 2004
@@ -79,11 +79,6 @@
*/
class DDMReader
{
- /**
- IBM Copyright © notice.
- */
-
- private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
private final static int DEFAULT_BUFFER_SIZE = 32767;
private final static int MAX_MARKS_NESTING = 10;
private final static int NO_CODEPOINT = -1;
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java Wed Nov 10 21:04:22 2004
@@ -26,11 +26,6 @@
*/
class DDMWriter
{
- /**
- IBM Copyright © notice.
- */
-
- private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
// number of nesting levels for collections. We need to mark the length
// location of the collection so that we can update it as we add more stuff
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java Wed Nov 10 21:04:22 2004
@@ -63,12 +63,8 @@
import org.apache.derby.iapi.services.sanity.SanityManager;
import org.apache.derby.iapi.services.stream.HeaderPrintWriter;
import org.apache.derby.iapi.services.monitor.Monitor;
- /**
- IBM Copyright © notice.
- */
-
-public class DRDAConnThread extends Thread { private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
+public class DRDAConnThread extends Thread {
private static final String leftBrace = "{";
private static final String rightBrace = "}";
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAProtocolException.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAProtocolException.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAProtocolException.java Wed Nov 10 21:04:22 2004
@@ -24,11 +24,6 @@
public class DRDAProtocolException extends Exception
{
- /**
- IBM Copyright © notice.
- */
-
- private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
/* Static values, used in constructor if there is no associated
Error Code or the codepoint argument.
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAProtocolExceptionInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAProtocolExceptionInfo.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAProtocolExceptionInfo.java Wed Nov 10 21:04:22 2004
@@ -11,12 +11,6 @@
package org.apache.derby.impl.drda;
public class DRDAProtocolExceptionInfo {
- /**
- IBM Copyright © notice.
- */
-
-
- private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
/*
Holds static information about the protocol error
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java Wed Nov 10 21:04:22 2004
@@ -37,11 +37,6 @@
*/
class DRDAResultSet
{
- /**
- IBM Copyright © notice.
- */
-
- private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
// resultSet states are NOT_OPENED and SUSPENDED
protected static final int NOT_OPENED = 1;
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java Wed Nov 10 21:04:22 2004
@@ -48,11 +48,6 @@
*/
class DRDAStatement
{
- /**
- IBM Copyright © notice.
- */
-
- private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java Wed Nov 10 21:04:22 2004
@@ -27,11 +27,6 @@
*/
class Database
{
- /**
- IBM Copyright © notice.
- */
-
- private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
protected String dbName; // database name
protected int securityMechanism; // Security mechanism
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java Wed Nov 10 21:04:22 2004
@@ -36,11 +36,6 @@
public class DecryptionManager
{
- /**
- IBM Copyright © notice.
- */
-
- private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
// DRDA's Diffie-Hellman agreed public value: prime.
private static final byte modulusBytes__[] = {
(byte)0xC6, (byte)0x21, (byte)0x12, (byte)0xD7,
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DssConstants.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DssConstants.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DssConstants.java Wed Nov 10 21:04:22 2004
@@ -17,11 +17,6 @@
*/
class DssConstants
{
- /**
- IBM Copyright © notice.
- */
-
- private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
protected static final int MAX_DSS_LENGTH = 32767;
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DssTrace.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DssTrace.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DssTrace.java Wed Nov 10 21:04:22 2004
@@ -15,12 +15,6 @@
// the ascii and ebcdic translations.
public class DssTrace
{
- /**
- IBM Copyright © notice.
- */
-
-
- private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
// This class was implemented using character arrays to translate bytes
// into ascii and ebcdic. The goal was to be able to quickly index into the
// arrays to find the characters. Char arrays instead of strings were used as
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EbcdicCcsidManager.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EbcdicCcsidManager.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EbcdicCcsidManager.java Wed Nov 10 21:04:22 2004
@@ -25,8 +25,6 @@
*/
public class EbcdicCcsidManager extends CcsidManager
{
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
-
private static final int[] conversionArrayToEbcdic = {
0x0000,0x0001,0x0002,0x0003,0x0037,0x002d,0x002e,0x002f
,0x0016,0x0005,0x0025,0x000b,0x000c,0x000d,0x000e,0x000f
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/FdocaConstants.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/FdocaConstants.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/FdocaConstants.java Wed Nov 10 21:04:22 2004
@@ -16,11 +16,6 @@
class FdocaConstants
{
-/**
- IBM Copyright © notice.
-*/
-
-public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
// DRDA FD:OCA constants.
static final int FDOCA_TYPE_FIXEDBYTES = 0x01;
static final int FDOCA_TYPE_NFIXEDBYTES = 0x81;
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SQLTypes.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SQLTypes.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SQLTypes.java Wed Nov 10 21:04:22 2004
@@ -18,11 +18,6 @@
public class SQLTypes {
- /**
- IBM Copyright © notice.
- */
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
-
//----------------------------------------------------------------------------
protected final static int DB2_SQLTYPE_DATE = 384; // DATE
protected final static int DB2_SQLTYPE_NDATE = 385;
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Session.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Session.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Session.java Wed Nov 10 21:04:22 2004
@@ -25,11 +25,6 @@
*/
class Session
{
- /**
- IBM Copyright © notice.
- */
-
- private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
// session states
protected static final int INIT = 1; // before exchange of server attributes
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SignedBinary.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SignedBinary.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SignedBinary.java Wed Nov 10 21:04:22 2004
@@ -14,11 +14,6 @@
*/
public class SignedBinary
{
- /**
- IBM Copyright © notice.
- */
-
- public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
// Hide the default constructor, this is a static class.
private SignedBinary () {}
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/TestFile.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/TestFile.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/TestFile.java Wed Nov 10 21:04:22 2004
@@ -15,12 +15,8 @@
This tests protocol errors and protocol not used by JCC
The file containing the test is given as an argument
*/
- /**
- IBM Copyright © notice.
- */
-
-public class TestFile{ private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
+public class TestFile{
// constructor
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/TestProto.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/TestProto.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/TestProto.java Wed Nov 10 21:04:22 2004
@@ -34,12 +34,8 @@
Tests can also be done as separate files and given as an argument to
this class.
*/
- /**
- IBM Copyright © notice.
- */
-
-public class TestProto { private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
+public class TestProto {
private static final CodePointNameTable codePointNameTable = new CodePointNameTable();
private static final Hashtable codePointValueTable = new Hashtable();
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/memCheck.java
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/memCheck.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/memCheck.java Wed Nov 10 21:04:22 2004
@@ -11,12 +11,8 @@
package org.apache.derby.impl.drda;
import java.util.Date;
- /**
- IBM Copyright © notice.
- */
-
-public class memCheck extends Thread { private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
+public class memCheck extends Thread {
int delay = 200000;
boolean stopNow = false;