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 57463 - in incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql: . compile conn depend execute
Date Thu, 11 Nov 2004 19:58:29 GMT
Author: djd
Date: Thu Nov 11 11:58:27 2004
New Revision: 57463

Modified:
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/CursorTableReference.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericClassInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericLanguageFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericResultDescription.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStorablePreparedStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AccessPathImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ActivationClassBuilder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AllResultColumn.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterSPSNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterTableNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AndNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseJoinStrategy.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseTypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BetweenOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryArithmeticOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryListOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryRelationalOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BitConstantNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BitTypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BooleanConstantNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BooleanTypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CLOBTypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/C_NodeNames.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CastNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharConstantNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharTypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CollectNodesVisitor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnOrdering.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnReference.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConcatenationOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConditionalNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstantNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CostEstimateImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CountAggregateDefinition.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateSchemaNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateStatementNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTableNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateViewNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentIsolationNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentRowLocationNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentUserNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DB2LengthOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DateTypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DefaultNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DefaultVTIModDeferPolicy.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DistinctNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropAliasNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropIndexNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSPSNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSchemaNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropStatementNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTableNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTriggerNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropViewNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExecSPSNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExpressionClassBuilder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExtractOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromSubquery.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GetCurrentConnectionNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByColumn.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HalfOuterJoinNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HasCorrelatedCRsVisitor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HasNodeVisitor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HasVariantValueNodeVisitor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashNodeList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashTableNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InListOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IndexToBaseRowNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InsertNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNullNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LOBConstantNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LOBTypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LengthOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Level2CostEstimateImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Level2OptimizerFactoryImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Level2OptimizerImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LockTableNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeSubqueryNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaxMinAggregateDefinition.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NOPStatementNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NestedLoopJoinStrategy.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NodeFactoryImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NotNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericConstantNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericTypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerFactoryImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderedColumn.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderedColumnList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParseException.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParserImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Predicate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QuantifiedBinaryOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QuantifiedUnaryOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNodeVector.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReadCursorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RefTypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReferencedTablesVisitor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RelationalOperator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RemapCRsVisitor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RenameNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReplaceAggregatesWithCRVisitor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowOrderingImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowResultSetNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLBooleanConstantNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SavepointNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ScrollInsensitiveResultSetNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetSchemaNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetTransactionIsolationNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SimpleStringOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StatementNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticClassFieldReferenceNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StringSlicer.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SumAvgAggregateDefinition.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableElementList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableElementNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableName.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimeTypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampTypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Token.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TransactionStatementNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TriggerReferencingStruct.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UCode_CharStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryLogicalOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnionNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UntypedNullConstantNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UpdateNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserDefinedTypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserTypeConstantNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VTIDeferModPolicy.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNodeList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VarbitConstantNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VerifyAggregateExpressionsVisitor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VirtualColumnNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/CachedStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericAuthorizer.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/TempTableInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicDependency.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicDependencyManager.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicProviderInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/DepClassInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateTriggerConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericQualifier.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashJoinResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashLeftOuterJoinResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexChanger.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ProjectRestrictResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SumAggregator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateVTIResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java
Log:
Remove IBM's binary copyright in java files under java/engine/org/apache/derby/impl

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/CursorTableReference.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/CursorTableReference.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/CursorTableReference.java	Thu Nov 11 11:58:27 2004
@@ -27,10 +27,6 @@
 public class CursorTableReference
 	implements ExecCursorTableReference, Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	/********************************************************
 	**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericClassInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericClassInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericClassInfo.java	Thu Nov 11 11:58:27 2004
@@ -15,10 +15,6 @@
 
 public class GenericClassInfo extends FormatableInstanceGetter 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	public Object getNewInstance() 
 	{

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericLanguageFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericLanguageFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericLanguageFactory.java	Thu Nov 11 11:58:27 2004
@@ -38,10 +38,6 @@
  */
 public class GenericLanguageFactory implements LanguageFactory, ModuleControl
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private GenericParameterValueSet emptySet;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameter.java	Thu Nov 11 11:58:27 2004
@@ -47,10 +47,6 @@
  */
 final class GenericParameter
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	// These defaults match the Network Server/ JCC max precision and
 	// The JCC "guessed" scale. They are used as the defaults for 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericResultDescription.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericResultDescription.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericResultDescription.java	Thu Nov 11 11:58:27 2004
@@ -33,10 +33,6 @@
 public final class GenericResultDescription
 	implements ResultDescription, Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/********************************************************
 	**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStatement.java	Thu Nov 11 11:58:27 2004
@@ -63,10 +63,6 @@
 
 public class GenericStatement
 	implements Statement {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	// these fields define the identity of the statement
 	private final SchemaDescriptor compilationSchema;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStorablePreparedStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStorablePreparedStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStorablePreparedStatement.java	Thu Nov 11 11:58:27 2004
@@ -62,10 +62,6 @@
 public class GenericStorablePreparedStatement
 	extends GenericPreparedStatement implements Formatable, StorablePreparedStatement
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	// formatable
 	private ByteArray 		byteCode;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AccessPathImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AccessPathImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AccessPathImpl.java	Thu Nov 11 11:58:27 2004
@@ -26,10 +26,6 @@
 
 class AccessPathImpl implements AccessPath
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	ConglomerateDescriptor	cd = null;
 	private CostEstimate	costEstimate = null;
 	boolean					coveringIndexScan = false;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ActivationClassBuilder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ActivationClassBuilder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ActivationClassBuilder.java	Thu Nov 11 11:58:27 2004
@@ -69,10 +69,6 @@
  */
 public class ActivationClassBuilder	extends	ExpressionClassBuilder
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	///////////////////////////////////////////////////////////////////////
 	//
 	// CONSTANTS

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java	Thu Nov 11 11:58:27 2004
@@ -44,10 +44,6 @@
 interface AggregateDefinition
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 	 * Get the aggregator that performs the aggregation on the
 	 * input datatype at execution time.  If the input type can be handled, 
 	 * return a type descriptor with the resultant type information and

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java	Thu Nov 11 11:58:27 2004
@@ -54,10 +54,6 @@
 
 public class AggregateNode extends UnaryOperatorNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private boolean					distinct;
 
 	private AggregateDefinition		uad;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AllResultColumn.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AllResultColumn.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AllResultColumn.java	Thu Nov 11 11:58:27 2004
@@ -26,10 +26,6 @@
 
 public class AllResultColumn extends ResultColumn
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private TableName		tableName;
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterSPSNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterSPSNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterSPSNode.java	Thu Nov 11 11:58:27 2004
@@ -29,10 +29,6 @@
  */
 public class AlterSPSNode extends DDLStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private ResultSetNode		usingClause;
 	private String				usingText;
 	private boolean				invalidOnly;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterTableNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterTableNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterTableNode.java	Thu Nov 11 11:58:27 2004
@@ -37,10 +37,6 @@
 
 public class AlterTableNode extends DDLStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	// The alter table action
 	public	TableElementList	tableElementList = null;
 	public  char				lockGranularity;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AndNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AndNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AndNode.java	Thu Nov 11 11:58:27 2004
@@ -21,10 +21,6 @@
 
 public class AndNode extends BinaryLogicalOperatorNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 	 * Initializer for an AndNode

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java	Thu Nov 11 11:58:27 2004
@@ -38,10 +38,6 @@
 
 public class BaseColumnNode extends ValueNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	public String	columnName;
 
 	/*

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseJoinStrategy.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseJoinStrategy.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseJoinStrategy.java	Thu Nov 11 11:58:27 2004
@@ -38,10 +38,6 @@
 import org.apache.derby.iapi.reference.ClassName;
 
 abstract public class BaseJoinStrategy implements JoinStrategy {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	public BaseJoinStrategy() {
 	}
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseTypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseTypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseTypeCompiler.java	Thu Nov 11 11:58:27 2004
@@ -45,10 +45,6 @@
 
 public abstract class BaseTypeCompiler implements TypeCompiler
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	TypeId correspondingTypeId;
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BetweenOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BetweenOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BetweenOperatorNode.java	Thu Nov 11 11:58:27 2004
@@ -37,10 +37,6 @@
 public class BetweenOperatorNode extends BinaryListOperatorNode
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * Initializer for a BetweenOperatorNode
 	 *
 	 * @param leftOperand		The left operand of the node

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryArithmeticOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryArithmeticOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryArithmeticOperatorNode.java	Thu Nov 11 11:58:27 2004
@@ -41,10 +41,6 @@
 public final class BinaryArithmeticOperatorNode extends BinaryOperatorNode
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * Initializer for a BinaryArithmeticOperatorNode
 	 *
 	 * @param leftOperand	The left operand

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java	Thu Nov 11 11:58:27 2004
@@ -38,10 +38,6 @@
 
 public abstract class BinaryComparisonOperatorNode extends BinaryOperatorNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	// Use between selectivity?
 	private boolean forQueryRewrite;
 	private boolean betweenSelectivity;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryListOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryListOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryListOperatorNode.java	Thu Nov 11 11:58:27 2004
@@ -39,10 +39,6 @@
 
 public abstract class BinaryListOperatorNode extends ValueNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	String	methodName;
 	/* operator used for error messages */
 	String	operator;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java	Thu Nov 11 11:58:27 2004
@@ -35,10 +35,6 @@
 
 public abstract class BinaryLogicalOperatorNode extends BinaryOperatorNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	boolean	shortCircuitValue;
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java	Thu Nov 11 11:58:27 2004
@@ -45,10 +45,6 @@
 
 public class BinaryOperatorNode extends ValueNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	String	operator;
 	String	methodName;
 	ValueNode	receiver; // used in generation

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryRelationalOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryRelationalOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryRelationalOperatorNode.java	Thu Nov 11 11:58:27 2004
@@ -52,10 +52,6 @@
 	extends BinaryComparisonOperatorNode
 	implements RelationalOperator
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private int operatorType;
 	/* RelationalOperator Interface */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BitConstantNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BitConstantNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BitConstantNode.java	Thu Nov 11 11:58:27 2004
@@ -29,10 +29,6 @@
 
 public class BitConstantNode extends ConstantNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private int bitLength;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BitTypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BitTypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BitTypeCompiler.java	Thu Nov 11 11:58:27 2004
@@ -39,10 +39,6 @@
 
 public class BitTypeCompiler extends BaseTypeCompiler
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
         /**
          * Tell whether this type (bit) can be compared to the given type. // 
          *

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BooleanConstantNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BooleanConstantNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BooleanConstantNode.java	Thu Nov 11 11:58:27 2004
@@ -27,10 +27,6 @@
 
 public final class BooleanConstantNode extends ConstantNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/* Cache actual value to save overhead and
 	 * throws clauses.
 	 */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BooleanTypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BooleanTypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BooleanTypeCompiler.java	Thu Nov 11 11:58:27 2004
@@ -36,10 +36,6 @@
 public class BooleanTypeCompiler extends BaseTypeCompiler
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 	 * Tell whether this type (boolean) can be compared to the given type.
 	 *
 	 * @param otherType	The TypeId of the other type.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CLOBTypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CLOBTypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CLOBTypeCompiler.java	Thu Nov 11 11:58:27 2004
@@ -39,12 +39,7 @@
  */
 
 public class CLOBTypeCompiler extends BaseTypeCompiler
-	/**
-		IBM Copyright &copy notice.
-	*/
-
-{ private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
-
+{
         /**
          * Tell whether this type (LOB) can be compared to the given type.
          * Clobs are not comparable.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/C_NodeNames.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/C_NodeNames.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/C_NodeNames.java	Thu Nov 11 11:58:27 2004
@@ -26,10 +26,6 @@
 
 public interface C_NodeNames
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	// The names are in alphabetic order.
 	//

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java	Thu Nov 11 11:58:27 2004
@@ -56,10 +56,6 @@
  */
 public class CallStatementNode extends DMLStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private String		methodName;
 	private ValueNode	methodCall;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CastNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CastNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CastNode.java	Thu Nov 11 11:58:27 2004
@@ -85,10 +85,6 @@
 
 public class CastNode extends ValueNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	DataTypeDescriptor	castTarget;
 	ValueNode			castOperand;
 	int					targetCharType;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharConstantNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharConstantNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharConstantNode.java	Thu Nov 11 11:58:27 2004
@@ -28,10 +28,6 @@
 public final class CharConstantNode extends ConstantNode
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * Initializer for a CharConstantNode.
 	 *
 	 * @param arg1	A String containing the value of the constant

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharStream.java	Thu Nov 11 11:58:27 2004
@@ -26,10 +26,6 @@
  */
 
 public interface CharStream {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
   /**
    * Returns the next character from the selected input.  The method

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharTypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharTypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharTypeCompiler.java	Thu Nov 11 11:58:27 2004
@@ -41,10 +41,6 @@
 
 public final class CharTypeCompiler extends BaseTypeCompiler
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
         /**
          * Tell whether this type (char) can be compared to the given type.
 		 * Long types can not be compared.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java	Thu Nov 11 11:58:27 2004
@@ -90,10 +90,6 @@
 
 public class CoalesceFunctionNode extends ValueNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 	String	functionName; //Are we here because of COALESCE function or VALUE function
 	ValueNodeList	argumentsList; //this is the list of arguments to the function. We are interested in the first not-null argument
 	ValueNode firstNonParameterNode;//The generated method will generate code to call coalesce on this non-parameter argument

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CollectNodesVisitor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CollectNodesVisitor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CollectNodesVisitor.java	Thu Nov 11 11:58:27 2004
@@ -30,10 +30,6 @@
  */
 public class CollectNodesVisitor implements Visitor
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	private Vector	nodeList;
 	private Class 	nodeClass;
 	private Class	skipOverClass;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java	Thu Nov 11 11:58:27 2004
@@ -55,10 +55,6 @@
 
 public class ColumnDefinitionNode extends TableElementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	boolean						isAutoincrement;
 	DataTypeDescriptor			dataTypeServices;
 	DataValueDescriptor			defaultValue;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnOrdering.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnOrdering.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnOrdering.java	Thu Nov 11 11:58:27 2004
@@ -17,12 +17,7 @@
 
 import java.util.Vector;
 
-class ColumnOrdering { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+class ColumnOrdering {
 
 	/* See RowOrdering for possible values */
 	int	myDirection;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnReference.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnReference.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnReference.java	Thu Nov 11 11:58:27 2004
@@ -41,10 +41,6 @@
 
 public class ColumnReference extends ValueNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	public String	columnName;
 
 	/*

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java	Thu Nov 11 11:58:27 2004
@@ -61,12 +61,7 @@
  *
  */
 public class CompilerContextImpl extends ContextImpl
-	implements CompilerContext { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+	implements CompilerContext {
 
 	//
 	// Context interface       

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConcatenationOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConcatenationOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConcatenationOperatorNode.java	Thu Nov 11 11:58:27 2004
@@ -49,10 +49,6 @@
 public class ConcatenationOperatorNode extends BinaryOperatorNode
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * Initializer for a ConcatenationOperatorNode
 	 *
 	 * @param leftOperand	The left operand of the concatenation

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConditionalNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConditionalNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConditionalNode.java	Thu Nov 11 11:58:27 2004
@@ -56,10 +56,6 @@
 
 public class ConditionalNode extends ValueNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	ValueNode		testCondition;
 	ValueNodeList	thenElseList;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstantNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstantNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstantNode.java	Thu Nov 11 11:58:27 2004
@@ -54,10 +54,6 @@
  */
 abstract class ConstantNode extends ValueNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	protected	DataValueDescriptor	value;
 
 	/*

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.java	Thu Nov 11 11:58:27 2004
@@ -39,10 +39,6 @@
 
 public class ConstraintDefinitionNode extends TableElementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	
 	private TableName constraintName;
 	protected int constraintType;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CostEstimateImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CostEstimateImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CostEstimateImpl.java	Thu Nov 11 11:58:27 2004
@@ -16,12 +16,7 @@
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
 
-public class CostEstimateImpl implements CostEstimate { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+public class CostEstimateImpl implements CostEstimate {
 	public double	cost;
 	public double	rowCount;
 	public double	singleScanRowCount;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CountAggregateDefinition.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CountAggregateDefinition.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CountAggregateDefinition.java	Thu Nov 11 11:58:27 2004
@@ -29,10 +29,6 @@
 		implements AggregateDefinition 
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * Niladic constructor.  Does nothing.  For ease
 	 * Of use, only.
 	 */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java	Thu Nov 11 11:58:27 2004
@@ -50,10 +50,6 @@
 
 public class CreateAliasNode extends CreateStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	String				javaClassName;
 	String				methodName;
 	char				aliasType; 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java	Thu Nov 11 11:58:27 2004
@@ -55,10 +55,6 @@
 
 public class CreateIndexNode extends CreateStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	boolean				unique;
 	DataDictionary		dd = null;
 	Properties			properties;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateSchemaNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateSchemaNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateSchemaNode.java	Thu Nov 11 11:58:27 2004
@@ -41,10 +41,6 @@
 
 public class CreateSchemaNode extends DDLStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private String 	name;
 	private String	aid;
 	

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateStatementNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateStatementNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateStatementNode.java	Thu Nov 11 11:58:27 2004
@@ -27,10 +27,6 @@
 
 public abstract class CreateStatementNode extends DDLStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	// Synchronization stubs
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTableNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTableNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTableNode.java	Thu Nov 11 11:58:27 2004
@@ -41,10 +41,6 @@
 
 public class CreateTableNode extends CreateStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private char				lockGranularity;
 	private boolean				onCommitDeleteRows; //If true, on commit delete rows else on commit preserve rows of temporary table.
 	private boolean				onRollbackDeleteRows; //If true, on rollback delete rows from temp table if it was logically modified in that UOW. true is the only supported value

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java	Thu Nov 11 11:58:27 2004
@@ -58,10 +58,6 @@
 
 public class CreateTriggerNode extends CreateStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	private	TableName			triggerName;
 	private	TableName			tableName;
 	private	int					triggerEventMask;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateViewNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateViewNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateViewNode.java	Thu Nov 11 11:58:27 2004
@@ -51,10 +51,6 @@
 
 public class CreateViewNode extends CreateStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	Dependent			currentDependent;
 	ResultColumnList	resultColumns;
 	ResultSetNode		queryExpression;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java	Thu Nov 11 11:58:27 2004
@@ -40,10 +40,6 @@
  * @author ames
  */
 public class CurrentDatetimeOperatorNode extends ValueNode {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	public static final int CURRENT_DATE = 0;
 	public static final int CURRENT_TIME = 1;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentIsolationNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentIsolationNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentIsolationNode.java	Thu Nov 11 11:58:27 2004
@@ -35,10 +35,6 @@
  */
 public class CurrentIsolationNode extends ValueNode 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java	Thu Nov 11 11:58:27 2004
@@ -78,10 +78,6 @@
  * @author ames
  */
 public final class CurrentOfNode extends FromTable {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private String	 				cursorName;
 	private ExecPreparedStatement	 preStmt;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentRowLocationNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentRowLocationNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentRowLocationNode.java	Thu Nov 11 11:58:27 2004
@@ -46,10 +46,6 @@
 public class CurrentRowLocationNode extends ValueNode
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * Binding this expression means setting the result DataTypeServices.
 	 * In this case, the result type is always the same.
 	 *

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentUserNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentUserNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentUserNode.java	Thu Nov 11 11:58:27 2004
@@ -46,10 +46,6 @@
  */
 public class CurrentUserNode extends ValueNode 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	public static final int USER = 0;
 	public static final int CURRENT_USER = 1;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java	Thu Nov 11 11:58:27 2004
@@ -48,10 +48,6 @@
 
 public class CursorNode extends ReadCursorNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	public final static int UNSPECIFIED = 0;
 	public final static int READ_ONLY = 1;
 	public final static int UPDATE = 2;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DB2LengthOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DB2LengthOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DB2LengthOperatorNode.java	Thu Nov 11 11:58:27 2004
@@ -42,10 +42,6 @@
 
 public final class DB2LengthOperatorNode extends UnaryOperatorNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
     
 	/**
 	 * Initializer for a DB2LengthOperatorNode

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java	Thu Nov 11 11:58:27 2004
@@ -37,10 +37,6 @@
 
 public abstract class DDLStatementNode extends StatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/////////////////////////////////////////////////////////////////////////
 	//
 	//	CONSTANTS

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java	Thu Nov 11 11:58:27 2004
@@ -81,10 +81,6 @@
 
 public abstract class DMLModStatementNode extends DMLStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 //	protected DataDictionary	dataDictionary;
 	protected FromVTI			targetVTI;
 	protected TableName			targetTableName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java	Thu Nov 11 11:58:27 2004
@@ -59,10 +59,6 @@
 
 public abstract class DMLStatementNode extends StatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 	 * The result set is the rows that result from running the

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DateTypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DateTypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DateTypeCompiler.java	Thu Nov 11 11:58:27 2004
@@ -29,10 +29,6 @@
 
 public class DateTypeCompiler extends BaseTypeCompiler
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	/* TypeCompiler methods */
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DefaultNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DefaultNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DefaultNode.java	Thu Nov 11 11:58:27 2004
@@ -44,10 +44,6 @@
  */
 public  class DefaultNode extends ValueNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	private ProviderList apl;
 	private String		columnName;
 	private String		defaultText;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DefaultVTIModDeferPolicy.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DefaultVTIModDeferPolicy.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DefaultVTIModDeferPolicy.java	Thu Nov 11 11:58:27 2004
@@ -18,11 +18,6 @@
  */
 class DefaultVTIModDeferPolicy implements DeferModification
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-
-    private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
     private final String targetVTIClassName;
     private final boolean VTIResultSetIsSensitive;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java	Thu Nov 11 11:58:27 2004
@@ -82,10 +82,6 @@
 
 public class DeleteNode extends DMLModStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/* Column name for the RowLocation column in the ResultSet */
 	public static final String COLUMNNAME = "###RowLocationToDelete";
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DistinctNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DistinctNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DistinctNode.java	Thu Nov 11 11:58:27 2004
@@ -59,10 +59,6 @@
  */
 public class DistinctNode extends SingleChildResultSetNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	boolean inSortedOrder;
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropAliasNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropAliasNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropAliasNode.java	Thu Nov 11 11:58:27 2004
@@ -37,10 +37,6 @@
 
 public class DropAliasNode extends DropStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	private char aliasType;
 	private char nameSpace;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropIndexNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropIndexNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropIndexNode.java	Thu Nov 11 11:58:27 2004
@@ -38,10 +38,6 @@
 
 public class DropIndexNode extends DropStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	ConglomerateDescriptor	cd;
 	TableDescriptor			td;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSPSNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSPSNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSPSNode.java	Thu Nov 11 11:58:27 2004
@@ -40,10 +40,6 @@
 
 public class DropSPSNode extends DropStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	public String statementToString()
 	{
 		return "DROP STATEMENT";

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSchemaNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSchemaNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSchemaNode.java	Thu Nov 11 11:58:27 2004
@@ -27,10 +27,6 @@
 
 public class DropSchemaNode extends DropStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private int			dropBehavior;
 	private String		schemaName;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropStatementNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropStatementNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropStatementNode.java	Thu Nov 11 11:58:27 2004
@@ -24,10 +24,6 @@
 
 public abstract class DropStatementNode extends DDLStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	//public static final int RESTRICT = StatementType.RESTRICT;
 	//public static final int CASCADE = StatementType.CASCADE;
 	//public static final int DEFAULT = StatementType.DEFAULT;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTableNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTableNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTableNode.java	Thu Nov 11 11:58:27 2004
@@ -42,10 +42,6 @@
 
 public class DropTableNode extends DropStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private long		conglomerateNumber;
 	private int			dropBehavior;
 	private	TableDescriptor	td;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTriggerNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTriggerNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTriggerNode.java	Thu Nov 11 11:58:27 2004
@@ -29,10 +29,6 @@
  */
 public class DropTriggerNode extends DropStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	private TableDescriptor td;
 
 	public String statementToString()

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropViewNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropViewNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropViewNode.java	Thu Nov 11 11:58:27 2004
@@ -33,10 +33,6 @@
 
 public class DropViewNode extends DropStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	/**
 	 * Initializer for a DropViewNode

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExecSPSNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExecSPSNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExecSPSNode.java	Thu Nov 11 11:58:27 2004
@@ -74,10 +74,6 @@
 
 public class ExecSPSNode extends StatementNode 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private TableName			name;
 	private SPSDescriptor		spsd;
 	private ExecPreparedStatement ps;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExpressionClassBuilder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExpressionClassBuilder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExpressionClassBuilder.java	Thu Nov 11 11:58:27 2004
@@ -72,10 +72,6 @@
  */
 public abstract	class ExpressionClassBuilder implements ExpressionClassBuilderInterface
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	///////////////////////////////////////////////////////////////////////
 	//
 	// CONSTANTS

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExtractOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExtractOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExtractOperatorNode.java	Thu Nov 11 11:58:27 2004
@@ -36,10 +36,6 @@
  * @author ames
  */
 public class ExtractOperatorNode extends UnaryOperatorNode {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	static private final String fieldName[] = {
 		"YEAR", "MONTH", "DAY", "HOUR", "MINUTE", "SECOND"

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java	Thu Nov 11 11:58:27 2004
@@ -34,10 +34,6 @@
 
 public final class FKConstraintDefinitionNode extends ConstraintDefinitionNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	TableName 			refTableName;
 	ResultColumnList	refRcl;
 	SchemaDescriptor	refTableSd;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java	Thu Nov 11 11:58:27 2004
@@ -118,10 +118,6 @@
 
 public class FromBaseTable extends FromTable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	static final int UNSET = -1;
 
 	TableName		tableName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java	Thu Nov 11 11:58:27 2004
@@ -45,10 +45,6 @@
 
 public class FromList extends QueryTreeNodeVector implements OptimizableList
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	Properties	properties;
 	// RESOLVE: The default should be false
 	boolean		fixedJoinOrder = true;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromSubquery.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromSubquery.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromSubquery.java	Thu Nov 11 11:58:27 2004
@@ -39,10 +39,6 @@
  */
 public class FromSubquery extends FromTable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	boolean			generatedForGroupByClause;
 	boolean			generatedForHavingClause;
 	ResultSetNode	subquery;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java	Thu Nov 11 11:58:27 2004
@@ -59,10 +59,6 @@
  */
 public abstract class FromTable extends ResultSetNode implements Optimizable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	Properties		tableProperties;
 	String		correlationName;
 	TableName	corrTableName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java	Thu Nov 11 11:58:27 2004
@@ -84,10 +84,6 @@
  */
 public class FromVTI extends FromTable implements VTIEnvironment
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	JBitSet				correlationMap;
 	JBitSet				dependencyMap;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GetCurrentConnectionNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GetCurrentConnectionNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GetCurrentConnectionNode.java	Thu Nov 11 11:58:27 2004
@@ -57,10 +57,6 @@
 public final class GetCurrentConnectionNode extends JavaValueNode
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * Constructor for a GetCurrentConnectionNode
 	 *
 	 */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByColumn.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByColumn.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByColumn.java	Thu Nov 11 11:58:27 2004
@@ -29,10 +29,6 @@
  */
 public class GroupByColumn extends OrderedColumn 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private ColumnReference	colRef;
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByList.java	Thu Nov 11 11:58:27 2004
@@ -36,10 +36,6 @@
 
 public class GroupByList extends OrderedColumnList
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	int		numGroupingColsAdded = 0;
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java	Thu Nov 11 11:58:27 2004
@@ -86,10 +86,6 @@
 public class GroupByNode extends SingleChildResultSetNode
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * The GROUP BY list
 	 */
 	GroupByList groupingList;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HalfOuterJoinNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HalfOuterJoinNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HalfOuterJoinNode.java	Thu Nov 11 11:58:27 2004
@@ -48,10 +48,6 @@
 
 public class HalfOuterJoinNode extends JoinNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private boolean rightOuterJoin;
 	private boolean transformed = false;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HasCorrelatedCRsVisitor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HasCorrelatedCRsVisitor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HasCorrelatedCRsVisitor.java	Thu Nov 11 11:58:27 2004
@@ -26,10 +26,6 @@
  */
 public class HasCorrelatedCRsVisitor implements Visitor
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private boolean hasCorrelatedCRs;
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HasNodeVisitor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HasNodeVisitor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HasNodeVisitor.java	Thu Nov 11 11:58:27 2004
@@ -28,10 +28,6 @@
  */
 public class HasNodeVisitor implements Visitor
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private boolean hasNode;
 	private Class 	nodeClass;
 	private Class	skipOverClass;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HasVariantValueNodeVisitor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HasVariantValueNodeVisitor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HasVariantValueNodeVisitor.java	Thu Nov 11 11:58:27 2004
@@ -39,10 +39,6 @@
  */
 public class HasVariantValueNodeVisitor implements Visitor
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private boolean hasVariant;
 	private int variantType;
 	private boolean ignoreParameters;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java	Thu Nov 11 11:58:27 2004
@@ -41,12 +41,7 @@
 
 import java.util.Vector;
 
-public class HashJoinStrategy extends BaseJoinStrategy { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+public class HashJoinStrategy extends BaseJoinStrategy {
 	public HashJoinStrategy() {
 	}
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashNodeList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashNodeList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashNodeList.java	Thu Nov 11 11:58:27 2004
@@ -29,10 +29,6 @@
 
 public abstract class HashNodeList extends QueryTreeNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private	Hashtable		hashtable = new Hashtable();
 
 	/////////////////////////////////////////////////////////////////

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashTableNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashTableNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashTableNode.java	Thu Nov 11 11:58:27 2004
@@ -62,10 +62,6 @@
 
 public class HashTableNode extends SingleChildResultSetNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	PredicateList	searchPredicateList;
 	PredicateList	joinPredicateList;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InListOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InListOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InListOperatorNode.java	Thu Nov 11 11:58:27 2004
@@ -44,10 +44,6 @@
 
 public final class InListOperatorNode extends BinaryListOperatorNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private boolean isOrdered;
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IndexToBaseRowNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IndexToBaseRowNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IndexToBaseRowNode.java	Thu Nov 11 11:58:27 2004
@@ -50,10 +50,6 @@
  */
 public class IndexToBaseRowNode extends FromTable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	protected FromBaseTable	source;
 	protected ConglomerateDescriptor	baseCD;
 	protected boolean	cursorTargetTable;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InsertNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InsertNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InsertNode.java	Thu Nov 11 11:58:27 2004
@@ -91,10 +91,6 @@
  */
 public final class InsertNode extends DMLModStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	public		ResultColumnList	targetColumnList;
 	public 		boolean				deferred;
 	public		ValueNode			checkConstraints;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNode.java	Thu Nov 11 11:58:27 2004
@@ -31,10 +31,6 @@
 
 public class IsNode extends BinaryLogicalOperatorNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	boolean		notMe;	// set to true if we're to negate the sense of this node
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNullNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNullNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNullNode.java	Thu Nov 11 11:58:27 2004
@@ -45,10 +45,6 @@
 public final class IsNullNode extends UnaryComparisonOperatorNode
 						implements RelationalOperator
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	Object nullValue = null;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java	Thu Nov 11 11:58:27 2004
@@ -40,10 +40,6 @@
 
 public class JavaToSQLValueNode extends ValueNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	JavaValueNode	javaNode;
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java	Thu Nov 11 11:58:27 2004
@@ -52,10 +52,6 @@
 
 public abstract class JavaValueNode extends QueryTreeNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private boolean	mustCastToPrimitive;
 
 	protected boolean forCallStatement;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java	Thu Nov 11 11:58:27 2004
@@ -66,10 +66,6 @@
 
 public class JoinNode extends TableOperatorNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/* Join semantics */
 	public static final int INNERJOIN = 1;
 	public static final int CROSSJOIN = 2;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LOBConstantNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LOBConstantNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LOBConstantNode.java	Thu Nov 11 11:58:27 2004
@@ -28,10 +28,6 @@
 public final class LOBConstantNode extends ConstantNode
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
-	/**
 	 * Initializer for a LOBConstantNode.
 	 *
 	 * @param arg1	The TypeId for the type of the node, or a string?

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LOBTypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LOBTypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LOBTypeCompiler.java	Thu Nov 11 11:58:27 2004
@@ -38,12 +38,8 @@
  */
 
 public class LOBTypeCompiler extends BaseTypeCompiler
-	/**
-		IBM Copyright &copy notice.
-	*/
-
-{ private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
-        /**
+{
+       /**
          * Tell whether this type (BLOB) can be compared to the given type. // 
 		 * BLOBS are not comparable.
          *

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LengthOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LengthOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LengthOperatorNode.java	Thu Nov 11 11:58:27 2004
@@ -36,10 +36,6 @@
 
 public final class LengthOperatorNode extends UnaryOperatorNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	private int parameterType;
 	private int parameterWidth;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Level2CostEstimateImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Level2CostEstimateImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Level2CostEstimateImpl.java	Thu Nov 11 11:58:27 2004
@@ -20,10 +20,6 @@
 
 public class Level2CostEstimateImpl extends CostEstimateImpl 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	public Level2CostEstimateImpl() 
 	{
 	}

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Level2OptimizerFactoryImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Level2OptimizerFactoryImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Level2OptimizerFactoryImpl.java	Thu Nov 11 11:58:27 2004
@@ -45,10 +45,6 @@
 public class Level2OptimizerFactoryImpl
 	extends OptimizerFactoryImpl 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 
 	//
 	// ModuleControl interface

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Level2OptimizerImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Level2OptimizerImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Level2OptimizerImpl.java	Thu Nov 11 11:58:27 2004
@@ -47,10 +47,6 @@
 
 public class Level2OptimizerImpl extends OptimizerImpl
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	private LanguageConnectionContext lcc;
 
 	Level2OptimizerImpl(OptimizableList optimizableList, 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java	Thu Nov 11 11:58:27 2004
@@ -109,10 +109,6 @@
 
 public final class LikeEscapeOperatorNode extends TernaryOperatorNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 	boolean addedEquals;
 	String escape;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LockTableNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LockTableNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LockTableNode.java	Thu Nov 11 11:58:27 2004
@@ -46,10 +46,6 @@
 
 public class LockTableNode extends MiscellaneousStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private TableName	tableName;
 	private boolean		exclusiveMode;
 	private long		conglomerateNumber;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java	Thu Nov 11 11:58:27 2004
@@ -49,10 +49,6 @@
 public class MaterializeResultSetNode extends SingleChildResultSetNode
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * Initializer for a MaterializeResultSetNode.
 	 *
 	 * @param childResult	The child ResultSetNode

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeSubqueryNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeSubqueryNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeSubqueryNode.java	Thu Nov 11 11:58:27 2004
@@ -26,10 +26,6 @@
  */
 class MaterializeSubqueryNode extends ResultSetNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
 
 	private LocalField lf;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaxMinAggregateDefinition.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaxMinAggregateDefinition.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaxMinAggregateDefinition.java	Thu Nov 11 11:58:27 2004
@@ -33,10 +33,6 @@
 public class MaxMinAggregateDefinition 
 		implements AggregateDefinition 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 	private boolean isMax;
   
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java	Thu Nov 11 11:58:27 2004
@@ -57,10 +57,6 @@
 
 public abstract class MethodCallNode extends JavaValueNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/*
 	** Name of the method.
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java	Thu Nov 11 11:58:27 2004
@@ -37,10 +37,6 @@
 
 public abstract class MiscellaneousStatementNode extends StatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	int activationKind()
 	{

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java	Thu Nov 11 11:58:27 2004
@@ -40,10 +40,6 @@
 
 public class ModifyColumnNode extends ColumnDefinitionNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	int		columnPosition = -1;
 	UUID	oldDefaultUUID;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NOPStatementNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NOPStatementNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NOPStatementNode.java	Thu Nov 11 11:58:27 2004
@@ -24,10 +24,6 @@
 
 public class NOPStatementNode extends StatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	public String statementToString()
 	{
 		return "NO-OP";

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NestedLoopJoinStrategy.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NestedLoopJoinStrategy.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NestedLoopJoinStrategy.java	Thu Nov 11 11:58:27 2004
@@ -32,12 +32,7 @@
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
 
-public class NestedLoopJoinStrategy extends BaseJoinStrategy { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
+public class NestedLoopJoinStrategy extends BaseJoinStrategy {
 	public NestedLoopJoinStrategy() {
 	}
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java	Thu Nov 11 11:58:27 2004
@@ -48,10 +48,6 @@
  */
 public class NewInvocationNode extends MethodCallNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	// Whether or not to do a single instantiation
 	private boolean singleInstantiation = false;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NodeFactoryImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NodeFactoryImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NodeFactoryImpl.java	Thu Nov 11 11:58:27 2004
@@ -44,10 +44,6 @@
 
 public class NodeFactoryImpl extends NodeFactory implements ModuleControl, ModuleSupportable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	//////////////////////////////////////////////////////////////////////
 	//
 	// CONSTANTS

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java	Thu Nov 11 11:58:27 2004
@@ -51,10 +51,6 @@
  */
 public class NonStaticMethodCallNode extends MethodCallNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/*
 	** The receiver for a non-static method call is an object, represented
 	** by a ValueNode.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java	Thu Nov 11 11:58:27 2004
@@ -51,10 +51,6 @@
 public class NormalizeResultSetNode extends SingleChildResultSetNode
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * this indicates if the normalize is being performed for an Update
 	 * statement or not. The row passed to update also has
 	 * before values of the columns being updated-- we need not 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NotNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NotNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NotNode.java	Thu Nov 11 11:58:27 2004
@@ -42,10 +42,6 @@
 public final class NotNode extends UnaryLogicalOperatorNode
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * Initializer for a NotNode
 	 *
 	 * @param operand	The operand of the NOT

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericConstantNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericConstantNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericConstantNode.java	Thu Nov 11 11:58:27 2004
@@ -33,10 +33,6 @@
 public final class NumericConstantNode extends ConstantNode
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * Initializer for a typed null node
 	 *
 	 * @param arg1	The TypeId for the type of node

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericTypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericTypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericTypeCompiler.java	Thu Nov 11 11:58:27 2004
@@ -44,10 +44,6 @@
 
 public final class NumericTypeCompiler extends BaseTypeCompiler
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	/** @see TypeCompiler#interfaceName */
 	public String interfaceName()
 	{

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerFactoryImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerFactoryImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerFactoryImpl.java	Thu Nov 11 11:58:27 2004
@@ -41,12 +41,7 @@
  */
 
 public class OptimizerFactoryImpl
-	implements ModuleControl, OptimizerFactory { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+	implements ModuleControl, OptimizerFactory {
 
 	protected String optimizerId = null;
 	protected boolean ruleBasedOptimization = false;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java	Thu Nov 11 11:58:27 2004
@@ -59,10 +59,6 @@
 
 public class OptimizerImpl implements Optimizer 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	DataDictionary			 dDictionary;
 	/* The number of tables in the query as a whole.  (Size of bit maps.) */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrNode.java	Thu Nov 11 11:58:27 2004
@@ -20,10 +20,6 @@
 
 public class OrNode extends BinaryLogicalOperatorNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/* Is this the 1st OR in the OR chain? */
 	private boolean firstOr;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java	Thu Nov 11 11:58:27 2004
@@ -30,10 +30,6 @@
  * @author ames
  */
 public class OrderByColumn extends OrderedColumn {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private ResultColumn	resultCol;
 	private String			columnName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByList.java	Thu Nov 11 11:58:27 2004
@@ -55,10 +55,6 @@
  */
 public class OrderByList extends OrderedColumnList
 						implements RequiredRowOrdering {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	private boolean allAscending = true;
 	private boolean alwaysSort;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByNode.java	Thu Nov 11 11:58:27 2004
@@ -51,10 +51,6 @@
  */
 public class OrderByNode extends SingleChildResultSetNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 
 	OrderByList		orderByList;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderedColumn.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderedColumn.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderedColumn.java	Thu Nov 11 11:58:27 2004
@@ -21,10 +21,6 @@
  */
 public abstract class OrderedColumn extends QueryTreeNode 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	protected static final int UNMATCHEDPOSITION = -1;
 	protected int	columnPosition = UNMATCHEDPOSITION;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderedColumnList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderedColumnList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderedColumnList.java	Thu Nov 11 11:58:27 2004
@@ -24,10 +24,6 @@
 public abstract class OrderedColumnList extends QueryTreeNodeVector
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * Get an array of ColumnOrderings to pass to the store
 	 */
 	public IndexColumnOrder[] getColumnOrdering()

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java	Thu Nov 11 11:58:27 2004
@@ -55,10 +55,6 @@
 
 public class ParameterNode extends ValueNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/*
 	** The parameter number for this parameter.  The numbers start at 0.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParseException.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParseException.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParseException.java	Thu Nov 11 11:58:27 2004
@@ -20,10 +20,6 @@
  * mechanisms so long as you retain the public fields.
  */
 public class ParseException extends Exception {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
   /**
    * This constructor is used by the method "generateParseException"

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParserImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParserImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParserImpl.java	Thu Nov 11 11:58:27 2004
@@ -21,10 +21,6 @@
 
 public class ParserImpl implements Parser
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/*
 	** We will use the following constant to pass in to
 	** our CharStream.  It is the size of the internal

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Predicate.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Predicate.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Predicate.java	Thu Nov 11 11:58:27 2004
@@ -45,10 +45,6 @@
 public final class Predicate extends QueryTreeNode implements OptimizablePredicate,
 														Comparable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/* Top of the predicate */
 	AndNode		andNode;
 	boolean		pushable;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java	Thu Nov 11 11:58:27 2004
@@ -72,10 +72,6 @@
 
 public class PredicateList extends QueryTreeNodeVector implements OptimizablePredicateList
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private int	numberOfStartPredicates;
 	private int numberOfStopPredicates;
 	private int numberOfQualifiers;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java	Thu Nov 11 11:58:27 2004
@@ -70,10 +70,6 @@
 public class ProjectRestrictNode extends SingleChildResultSetNode
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * The ValueNode for the restriction to be evaluated here.
 	 */
 	public ValueNode	restriction;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QuantifiedBinaryOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QuantifiedBinaryOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QuantifiedBinaryOperatorNode.java	Thu Nov 11 11:58:27 2004
@@ -33,10 +33,6 @@
 
 public class QuantifiedBinaryOperatorNode extends BinaryOperatorNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	int	operator;
 
 	public final static int IN	= 1;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QuantifiedUnaryOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QuantifiedUnaryOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QuantifiedUnaryOperatorNode.java	Thu Nov 11 11:58:27 2004
@@ -33,10 +33,6 @@
 
 public class QuantifiedUnaryOperatorNode extends UnaryOperatorNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/*
 	** For NOT EXISTS (SELECT * ...), the parser will generate a NOT
 	** node and an EXISTS node.  Later, normalization will change this

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java	Thu Nov 11 11:58:27 2004
@@ -65,10 +65,6 @@
 
 public abstract class QueryTreeNode implements Visitable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	public static final int AUTOINCREMENT_START_INDEX = 0;
 	public static final int AUTOINCREMENT_INC_INDEX   = 1;
 	public static final int AUTOINCREMENT_IS_AUTOINCREMENT_INDEX   = 2;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNodeVector.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNodeVector.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNodeVector.java	Thu Nov 11 11:58:27 2004
@@ -29,10 +29,6 @@
 
 abstract class QueryTreeNodeVector extends QueryTreeNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	private Vector			v = new Vector();
 
 	public final int size()

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReadCursorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReadCursorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReadCursorNode.java	Thu Nov 11 11:58:27 2004
@@ -36,10 +36,6 @@
 abstract class ReadCursorNode extends DMLStatementNode
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * Bind this ReadCursorNode.  This means looking up tables and columns and
 	 * getting their types, and figuring out the result types of all
 	 * expressions.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RefTypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RefTypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RefTypeCompiler.java	Thu Nov 11 11:58:27 2004
@@ -35,10 +35,6 @@
 
 public class RefTypeCompiler extends BaseTypeCompiler
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	/** @see TypeCompiler#getCorrespondingPrimitiveTypeName */
 	public String getCorrespondingPrimitiveTypeName()
 	{

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReferencedTablesVisitor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReferencedTablesVisitor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReferencedTablesVisitor.java	Thu Nov 11 11:58:27 2004
@@ -25,10 +25,6 @@
  */
 public class ReferencedTablesVisitor implements Visitor 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	private JBitSet tableMap;
 
 	public ReferencedTablesVisitor(JBitSet tableMap)

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RelationalOperator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RelationalOperator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RelationalOperator.java	Thu Nov 11 11:58:27 2004
@@ -29,10 +29,6 @@
  */
 public interface RelationalOperator
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	public final int EQUALS_RELOP = 1;
 	public final int NOT_EQUALS_RELOP = 2;
 	public final int GREATER_THAN_RELOP = 3;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RemapCRsVisitor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RemapCRsVisitor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RemapCRsVisitor.java	Thu Nov 11 11:58:27 2004
@@ -24,10 +24,6 @@
  */
 public class RemapCRsVisitor implements Visitor
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	private boolean remap;
 
 	public RemapCRsVisitor(boolean remap)

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RenameNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RenameNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RenameNode.java	Thu Nov 11 11:58:27 2004
@@ -40,10 +40,6 @@
 
 public class RenameNode extends DDLStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 	protected TableName newTableName;
 
 	// original name of the object being renamed

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReplaceAggregatesWithCRVisitor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReplaceAggregatesWithCRVisitor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReplaceAggregatesWithCRVisitor.java	Thu Nov 11 11:58:27 2004
@@ -23,10 +23,6 @@
  */
 public class ReplaceAggregatesWithCRVisitor implements Visitor
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private ResultColumnList rcl;
 	private Class skipOverClass;
 	private int tableNumber;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java	Thu Nov 11 11:58:27 2004
@@ -67,10 +67,6 @@
 public class ResultColumn extends ValueNode 
 				implements ResultColumnDescriptor, Comparable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/* name and exposedName should point to the same string, unless there is a
 	 * derived column list, in which case name will point to the underlying name
 	 * and exposedName will point to the name from the derived column list.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java	Thu Nov 11 11:58:27 2004
@@ -94,10 +94,6 @@
 
 public class ResultColumnList extends QueryTreeNodeVector
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/* Is this the ResultColumnList for an index row? */
 	protected boolean indexRow;
 	protected long	conglomerateId;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java	Thu Nov 11 11:58:27 2004
@@ -74,10 +74,6 @@
 
 public abstract class ResultSetNode extends QueryTreeNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	int					resultSetNumber;
 	/* Bit map of referenced tables under this ResultSetNode */
 	JBitSet				referencedTableMap;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowOrderingImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowOrderingImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowOrderingImpl.java	Thu Nov 11 11:58:27 2004
@@ -19,12 +19,7 @@
 
 import java.util.Vector;
 
-class RowOrderingImpl implements RowOrdering { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
+class RowOrderingImpl implements RowOrdering {
 
 	/* This vector contains ColumnOrderings */
 	Vector ordering;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowResultSetNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowResultSetNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowResultSetNode.java	Thu Nov 11 11:58:27 2004
@@ -56,10 +56,6 @@
 
 public class RowResultSetNode extends FromTable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	SubqueryList subquerys;
 	Vector		 aggregateVector;
 	OrderByList	 orderByList;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLBooleanConstantNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLBooleanConstantNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLBooleanConstantNode.java	Thu Nov 11 11:58:27 2004
@@ -28,10 +28,6 @@
 public class SQLBooleanConstantNode extends ConstantNode
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * Initializer for a SQLBooleanConstantNode.
 	 *
 	 * @param newValue	A String containing the value of the constant: true, false, unknown

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java	Thu Nov 11 11:58:27 2004
@@ -46,10 +46,6 @@
 
 public class SQLToJavaValueNode extends JavaValueNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	ValueNode	value;
 
 	LocalField	returnsNullOnNullState;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SavepointNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SavepointNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SavepointNode.java	Thu Nov 11 11:58:27 2004
@@ -23,10 +23,6 @@
 
 public class SavepointNode extends DDLStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
 	private String	savepointName; //name of the savepoint
 	private int	savepointStatementType; //Type of savepoint statement ie rollback, release or set savepoint
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ScrollInsensitiveResultSetNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ScrollInsensitiveResultSetNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ScrollInsensitiveResultSetNode.java	Thu Nov 11 11:58:27 2004
@@ -52,10 +52,6 @@
 public class ScrollInsensitiveResultSetNode  extends SingleChildResultSetNode
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 	 * Initializer for a ScrollInsensitiveResultSetNode.
 	 *
 	 * @param childResult	The child ResultSetNode

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java	Thu Nov 11 11:58:27 2004
@@ -51,10 +51,6 @@
 public class SelectNode extends ResultSetNode
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * List of tables in the FROM clause of this SELECT
 	 */
 	FromList	fromList;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetSchemaNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetSchemaNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetSchemaNode.java	Thu Nov 11 11:58:27 2004
@@ -40,10 +40,6 @@
 
 public class SetSchemaNode extends MiscellaneousStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private String 	name;
 	private int 	type;
 	

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetTransactionIsolationNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetTransactionIsolationNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetTransactionIsolationNode.java	Thu Nov 11 11:58:27 2004
@@ -36,10 +36,6 @@
 
 public class SetTransactionIsolationNode extends TransactionStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private int		isolationLevel;
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SimpleStringOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SimpleStringOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SimpleStringOperatorNode.java	Thu Nov 11 11:58:27 2004
@@ -37,10 +37,6 @@
 public class SimpleStringOperatorNode extends UnaryOperatorNode
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * Initializer for a SimpleOperatorNode
 	 *
 	 * @param operand		The operand

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java	Thu Nov 11 11:58:27 2004
@@ -50,10 +50,6 @@
 abstract class SingleChildResultSetNode extends FromTable
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
-	/**
 	 * ResultSetNode under the SingleChildResultSetNode
 	 */
 	ResultSetNode	childResult;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StatementNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StatementNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StatementNode.java	Thu Nov 11 11:58:27 2004
@@ -51,10 +51,6 @@
 
 public abstract class StatementNode extends QueryTreeNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 	 * By default, assume StatementNodes are atomic.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticClassFieldReferenceNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticClassFieldReferenceNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticClassFieldReferenceNode.java	Thu Nov 11 11:58:27 2004
@@ -45,10 +45,6 @@
 
 public final class StaticClassFieldReferenceNode extends JavaValueNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/*
 	** Name of the field.
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java	Thu Nov 11 11:58:27 2004
@@ -101,10 +101,6 @@
  */
 public class StaticMethodCallNode extends MethodCallNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private TableName procedureName;
 
 	private LocalField[] outParamArrays;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StringSlicer.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StringSlicer.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StringSlicer.java	Thu Nov 11 11:58:27 2004
@@ -20,10 +20,6 @@
  */
 public class StringSlicer
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private	char[]		charArray;
 	private	int			charLength;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryList.java	Thu Nov 11 11:58:27 2004
@@ -26,10 +26,6 @@
 
 public class SubqueryList extends QueryTreeNodeVector
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 	 * Prints the sub-nodes of this object.  See QueryTreeNode.java for

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java	Thu Nov 11 11:58:27 2004
@@ -91,10 +91,6 @@
 
 public class SubqueryNode extends ValueNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/*
 	** This must be a single-column result set.  If the subquery is
 	** not quantified, it must also be a single-row result set - that is,

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SumAvgAggregateDefinition.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SumAvgAggregateDefinition.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SumAvgAggregateDefinition.java	Thu Nov 11 11:58:27 2004
@@ -37,10 +37,6 @@
 public class SumAvgAggregateDefinition
 		implements AggregateDefinition 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001_2004;
 	private boolean isSum;
 	/**
 	 * Niladic constructor.  Does nothing.  For ease

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableElementList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableElementList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableElementList.java	Thu Nov 11 11:58:27 2004
@@ -52,10 +52,6 @@
 
 public class TableElementList extends QueryTreeNodeVector
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	int				numColumns;
 	TableDescriptor td;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableElementNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableElementNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableElementNode.java	Thu Nov 11 11:58:27 2004
@@ -22,10 +22,6 @@
 
 public class TableElementNode extends QueryTreeNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
     /////////////////////////////////////////////////////////////////////////
 	//
 	//	CONSTANTS

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableName.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableName.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableName.java	Thu Nov 11 11:58:27 2004
@@ -31,10 +31,6 @@
 
 public class TableName extends QueryTreeNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/* Both schemaName and tableName can be null, however, if 
 	** tableName is null then schemaName must also be null.
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableOperatorNode.java	Thu Nov 11 11:58:27 2004
@@ -49,10 +49,6 @@
 
 public abstract class TableOperatorNode extends FromTable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	boolean			nestedInParens;
 	ResultSetNode	leftResultSet;
 	ResultSetNode	rightResultSet;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java	Thu Nov 11 11:58:27 2004
@@ -50,10 +50,6 @@
 
 public class TernaryOperatorNode extends ValueNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	String		operator;
 	String		methodName;
 	int			operatorType;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java	Thu Nov 11 11:58:27 2004
@@ -35,10 +35,6 @@
 
 public class TestConstraintNode extends UnaryLogicalOperatorNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
 	private String sqlState;
 	private String tableName;
 	private String constraintName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimeTypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimeTypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimeTypeCompiler.java	Thu Nov 11 11:58:27 2004
@@ -29,10 +29,6 @@
 
 public class TimeTypeCompiler extends BaseTypeCompiler
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	/* TypeCompiler methods */
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampOperatorNode.java	Thu Nov 11 11:58:27 2004
@@ -33,10 +33,6 @@
 
 public class TimestampOperatorNode extends BinaryOperatorNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2004;
 
     /**
      * Initailizer for a TimestampOperatorNode.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampTypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampTypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampTypeCompiler.java	Thu Nov 11 11:58:27 2004
@@ -28,10 +28,6 @@
 
 public class TimestampTypeCompiler extends BaseTypeCompiler
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	/* TypeCompiler methods */
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Token.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Token.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Token.java	Thu Nov 11 11:58:27 2004
@@ -15,10 +15,6 @@
  */
 
 public class Token {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
   /**
    * An integer that describes the kind of this token.  This numbering

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TransactionStatementNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TransactionStatementNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TransactionStatementNode.java	Thu Nov 11 11:58:27 2004
@@ -24,10 +24,6 @@
 
 public abstract class TransactionStatementNode extends StatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	int activationKind()
 	{
 		   return StatementNode.NEED_NOTHING_ACTIVATION;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TriggerReferencingStruct.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TriggerReferencingStruct.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TriggerReferencingStruct.java	Thu Nov 11 11:58:27 2004
@@ -18,10 +18,6 @@
  */
 public class TriggerReferencingStruct 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	public String identifier;
 	public boolean isRow;
 	public boolean isNew;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java	Thu Nov 11 11:58:27 2004
@@ -25,10 +25,6 @@
 
 public class TypeCompilerFactoryImpl implements TypeCompilerFactory
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
         private static final String PACKAGE_NAME =
                         "org.apache.derby.impl.sql.compile.";
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UCode_CharStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UCode_CharStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UCode_CharStream.java	Thu Nov 11 11:58:27 2004
@@ -21,10 +21,6 @@
 
 public final class UCode_CharStream implements CharStream
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
   // The next two lines are added to support ability to get the input
   // between two tokens.
   int charCnt;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java	Thu Nov 11 11:58:27 2004
@@ -33,10 +33,6 @@
 
 public class UnaryArithmeticOperatorNode extends UnaryOperatorNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private final static int UNARY_PLUS	= 0;
 	private final static int UNARY_MINUS	= 1;
 	private final static int SQRT = 2;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java	Thu Nov 11 11:58:27 2004
@@ -46,10 +46,6 @@
 public class UnaryComparisonOperatorNode extends UnaryOperatorNode
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * Bind this comparison operator.  All that has to be done for binding
 	 * a comparison operator is to bind the operand and set the result type 
 	 * to SQLBoolean.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryLogicalOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryLogicalOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryLogicalOperatorNode.java	Thu Nov 11 11:58:27 2004
@@ -25,10 +25,6 @@
 public abstract class UnaryLogicalOperatorNode extends UnaryOperatorNode
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * Initializer for a UnaryLogicalOperatorNode
 	 *
 	 * @param operand	The operand of the operator

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java	Thu Nov 11 11:58:27 2004
@@ -42,10 +42,6 @@
 
 public abstract class UnaryOperatorNode extends ValueNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	String	operator;
 	String	methodName;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnionNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnionNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnionNode.java	Thu Nov 11 11:58:27 2004
@@ -64,10 +64,6 @@
 public class UnionNode extends TableOperatorNode
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	** Tells whether to eliminate duplicate rows.  all == TRUE means do
 	** not eliminate duplicates, all == FALSE means eliminate duplicates.
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UntypedNullConstantNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UntypedNullConstantNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UntypedNullConstantNode.java	Thu Nov 11 11:58:27 2004
@@ -31,10 +31,6 @@
 public final class UntypedNullConstantNode extends ConstantNode
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * Constructor for an UntypedNullConstantNode.  Untyped constants
 	 * contain no state (not too surprising).
 	 */

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UpdateNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UpdateNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UpdateNode.java	Thu Nov 11 11:58:27 2004
@@ -78,10 +78,6 @@
 
 public final class UpdateNode extends DMLModStatementNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	//Note: These are public so they will be visible to
 	//the RepUpdateNode.
 	public int[]				changedColumnIds;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserDefinedTypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserDefinedTypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserDefinedTypeCompiler.java	Thu Nov 11 11:58:27 2004
@@ -28,10 +28,6 @@
 
 public class UserDefinedTypeCompiler extends BaseTypeCompiler
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	/* TypeCompiler methods */
 
 	/**

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserTypeConstantNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserTypeConstantNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserTypeConstantNode.java	Thu Nov 11 11:58:27 2004
@@ -61,10 +61,6 @@
 	@author ames
  */
 public class UserTypeConstantNode extends ConstantNode {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/*
 	** This value field hides the value in the super-type.  It is here
 	** Because user-type constants work differently from built-in constants.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VTIDeferModPolicy.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VTIDeferModPolicy.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VTIDeferModPolicy.java	Thu Nov 11 11:58:27 2004
@@ -29,11 +29,6 @@
  */
 class VTIDeferModPolicy implements Visitor
 {
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
     /**
      * See if a VTI modification statement should be deferred.
      *

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNode.java	Thu Nov 11 11:58:27 2004
@@ -56,10 +56,6 @@
 
 public abstract class ValueNode extends QueryTreeNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	public static final int IN_UNKNOWN_CLAUSE = 0;
 	public static final int IN_SELECT_LIST = 1;
 	public static final int IN_WHERE_CLAUSE = 2;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNodeList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNodeList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNodeList.java	Thu Nov 11 11:58:27 2004
@@ -42,10 +42,6 @@
 
 public class ValueNodeList extends QueryTreeNodeVector
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/**
 	 * Prints the sub-nodes of this object.  See QueryTreeNode.java for

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VarbitConstantNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VarbitConstantNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VarbitConstantNode.java	Thu Nov 11 11:58:27 2004
@@ -27,10 +27,6 @@
 public final class VarbitConstantNode extends BitConstantNode
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-	/**
 	 * Initializer for a VarbitConstantNode.
 	 *
 	 * @param arg1  The TypeId for the type of the node

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VerifyAggregateExpressionsVisitor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VerifyAggregateExpressionsVisitor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VerifyAggregateExpressionsVisitor.java	Thu Nov 11 11:58:27 2004
@@ -31,10 +31,6 @@
  */
 public class VerifyAggregateExpressionsVisitor implements Visitor
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private GroupByList groupByList;
 
 	public VerifyAggregateExpressionsVisitor(GroupByList groupByList)

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VirtualColumnNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VirtualColumnNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VirtualColumnNode.java	Thu Nov 11 11:58:27 2004
@@ -32,10 +32,6 @@
 
 public class VirtualColumnNode extends ValueNode
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/* A VirtualColumnNode contains a pointer to the immediate child result
 	 * that is materializing the virtual column and the ResultColumn
 	 * that represents that materialization.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj	Thu Nov 11 11:58:27 2004
@@ -144,11 +144,6 @@
 
 public class SQLParser
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2001;
-
 	private static final String[] SAVEPOINT_CLAUSE_NAMES = {"UNIQUE", "ON ROLLBACK RETAIN LOCKS", "ON ROLLBACK RETAIN CURSORS"};
 	private static final String[] PROCEDURE_CLAUSE_NAMES =
 		{null, "SPECIFIC", "RESULT SET", "LANGUAGE", "EXTERNAL NAME", "PARAMETER STYLE", "SQL", "ON NULL INPUT"};

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/CachedStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/CachedStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/CachedStatement.java	Thu Nov 11 11:58:27 2004
@@ -31,11 +31,6 @@
 */
 public class CachedStatement implements Cacheable {
 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-
 	private GenericPreparedStatement ps;
 	private Object identity;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericAuthorizer.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericAuthorizer.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericAuthorizer.java	Thu Nov 11 11:58:27 2004
@@ -26,10 +26,6 @@
 class GenericAuthorizer
 implements Authorizer
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	//
 	//Enumerations for user access levels.
 	private static final int NO_ACCESS = 0;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java	Thu Nov 11 11:58:27 2004
@@ -94,10 +94,6 @@
 	extends ContextImpl 
 	implements LanguageConnectionContext
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	// make sure these are not zeros
 	private final static int NON_XA = 0;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java	Thu Nov 11 11:58:27 2004
@@ -89,10 +89,6 @@
  */
 public class GenericLanguageConnectionFactory
 	implements LanguageConnectionFactory, CacheableFactory, PropertySetCallback, ModuleControl, ModuleSupportable {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/*
 		fields

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java	Thu Nov 11 11:58:27 2004
@@ -47,10 +47,6 @@
 final class GenericStatementContext 
 	extends ContextImpl implements StatementContext
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private final TransactionController tc;
 
 	private boolean		setSavePoint;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/TempTableInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/TempTableInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/TempTableInfo.java	Thu Nov 11 11:58:27 2004
@@ -166,10 +166,6 @@
 */
 class TempTableInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
 
 	private TableDescriptor td;
 	private int declaredInSavepointLevel;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicDependency.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicDependency.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicDependency.java	Thu Nov 11 11:58:27 2004
@@ -26,12 +26,7 @@
 	It needs to be notified if the schema object changes, so that
 	it can recompile against the new information.
  */
-class BasicDependency implements Dependency { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
+class BasicDependency implements Dependency {
 
 	//
 	// Dependency interface

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicDependencyManager.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicDependencyManager.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicDependencyManager.java	Thu Nov 11 11:58:27 2004
@@ -65,11 +65,6 @@
 
 public class BasicDependencyManager implements DependencyManager {
 
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
-
 	//
 	// DependencyManager interface
 	//

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicProviderInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicProviderInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicProviderInfo.java	Thu Nov 11 11:58:27 2004
@@ -30,10 +30,6 @@
 
 public class BasicProviderInfo implements ProviderInfo
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	/********************************************************
 	**
 	**	This class implements Formatable. That means that it

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/DepClassInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/DepClassInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/DepClassInfo.java	Thu Nov 11 11:58:27 2004
@@ -14,12 +14,7 @@
 import org.apache.derby.iapi.services.io.FormatableInstanceGetter;
 
 // lifted from TypeFactoryImpl.DTSClassInfo
-public class DepClassInfo extends FormatableInstanceGetter { 
-
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2000_2004;
+public class DepClassInfo extends FormatableInstanceGetter {
 
 	public Object getNewInstance() {
 		switch (fmtId) 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateTriggerConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateTriggerConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateTriggerConstantAction.java	Thu Nov 11 11:58:27 2004
@@ -51,10 +51,6 @@
  */
 class CreateTriggerConstantAction extends DDLSingleTableConstantAction
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 
 	private String					triggerName;
 	private String					triggerSchemaName;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java	Thu Nov 11 11:58:27 2004
@@ -40,10 +40,6 @@
  */
 public class CurrentOfResultSet extends NoPutResultSetImpl
 	implements CursorResultSet {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
     private boolean next;
 	private RowLocation rowLocation;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java	Thu Nov 11 11:58:27 2004
@@ -32,10 +32,6 @@
  */
 abstract class DMLVTIResultSet extends DMLWriteResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
 
 	// passed in at construction time
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java	Thu Nov 11 11:58:27 2004
@@ -44,10 +44,6 @@
  */
 public class DeleteCascadeResultSet extends DeleteResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2002_2004;
 
 
 	public ResultSet[] dependentResultSets;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregator.java	Thu Nov 11 11:58:27 2004
@@ -40,10 +40,6 @@
  */
 class GenericAggregator 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	AggregatorInfo			aggInfo;
 	int						aggregatorColumnId;
 	private int						inputColumnId;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericQualifier.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericQualifier.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericQualifier.java	Thu Nov 11 11:58:27 2004
@@ -30,10 +30,6 @@
 
 public class GenericQualifier implements Qualifier
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private int columnId;
 	private int operator;
 	private GeneratedMethod orderableGetter;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java	Thu Nov 11 11:58:27 2004
@@ -65,10 +65,6 @@
  */
 public class GenericResultSetFactory implements ResultSetFactory 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	//
 	// ResultSetFactory interface
 	//

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashJoinResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashJoinResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashJoinResultSet.java	Thu Nov 11 11:58:27 2004
@@ -35,10 +35,6 @@
  */
 public class HashJoinResultSet extends NestedLoopJoinResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
     public HashJoinResultSet(NoPutResultSet leftResultSet,
 								   int leftNumCols,
 								   NoPutResultSet rightResultSet,

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashLeftOuterJoinResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashLeftOuterJoinResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashLeftOuterJoinResultSet.java	Thu Nov 11 11:58:27 2004
@@ -35,10 +35,6 @@
  */
 public class HashLeftOuterJoinResultSet extends NestedLoopLeftOuterJoinResultSet
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
     public HashLeftOuterJoinResultSet(
 						NoPutResultSet leftResultSet,
 						int leftNumCols,

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexChanger.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexChanger.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexChanger.java	Thu Nov 11 11:58:27 2004
@@ -51,10 +51,6 @@
   */
 public class IndexChanger
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	private IndexRowGenerator irg;
 	//Index Conglomerate ID
 	private long indexCID;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java	Thu Nov 11 11:58:27 2004
@@ -47,10 +47,6 @@
  */
 public class LastIndexKeyResultSet extends NoPutResultSetImpl
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1999_2004;
 	protected	ExecRow		candidate;
 
 	// set in constructor and not altered during

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ProjectRestrictResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ProjectRestrictResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ProjectRestrictResultSet.java	Thu Nov 11 11:58:27 2004
@@ -46,10 +46,6 @@
 public class ProjectRestrictResultSet extends NoPutResultSetImpl
 	implements CursorResultSet 
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 	/* Run time statistics variables */
 	public long restrictionTime;
 	public long projectionTime;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SumAggregator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SumAggregator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SumAggregator.java	Thu Nov 11 11:58:27 2004
@@ -28,10 +28,6 @@
 	extends OrderableAggregator
 {
 	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
-	/**
 	 * Accumulate
  	 *
 	 * @param addend	value to be added in

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java	Thu Nov 11 11:58:27 2004
@@ -48,10 +48,6 @@
  */
 public class TemporaryRowHolderResultSet implements CursorResultSet, NoPutResultSet, Cloneable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1998_2004;
 	private ExecRow[] 				rowArray;
 	private int						numRowsOut;
 	private ScanController			scan;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateVTIResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateVTIResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateVTIResultSet.java	Thu Nov 11 11:58:27 2004
@@ -35,12 +35,7 @@
  * base table.
  */
 public class UpdateVTIResultSet extends DMLVTIResultSet
-	/**
-		IBM Copyright &copy notice.
-	*/
-
-{ private static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_2003_2004;
-
+{
 	private java.sql.ResultSet		rs;
 
 	private	TemporaryRowHolderImpl	rowHolder;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java	Thu Nov 11 11:58:27 2004
@@ -58,10 +58,6 @@
 
 abstract	class WriteCursorConstantAction implements ConstantAction, Formatable
 {
-	/**
-		IBM Copyright &copy notice.
-	*/
-	public static final String copyrightNotice = org.apache.derby.iapi.reference.Copyright.SHORT_1997_2004;
 
 	/********************************************************
 	**

Mime
View raw message