db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r407405 - in /db/derby/code/branches/10.1: ./ java/drda/org/apache/derby/impl/drda/ java/engine/org/apache/derby/database/ java/engine/org/apache/derby/iapi/db/ java/engine/org/apache/derby/impl/sql/compile/ java/engine/org/apache/derby/vti...
Date Wed, 17 May 2006 23:51:25 GMT
Author: fuzzylogic
Date: Wed May 17 16:51:25 2006
New Revision: 407405

URL: http://svn.apache.org/viewvc?rev=407405&view=rev
Log:
DERBY-1324: Merge revision 407403 to Derby 10.1 branch

Removed:
    db/derby/code/branches/10.1/tools/jar/copyright.txt
Modified:
    db/derby/code/branches/10.1/COPYRIGHT
    db/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/EbcdicCcsidManager.java
    db/derby/code/branches/10.1/java/engine/org/apache/derby/database/Database.java
    db/derby/code/branches/10.1/java/engine/org/apache/derby/database/UserUtility.java
    db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/ConnectionInfo.java
    db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/ConsistencyChecker.java
    db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/Factory.java
    db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/PropertyInfo.java
    db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/TriggerExecutionContext.java
    db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java
    db/derby/code/branches/10.1/java/engine/org/apache/derby/vti/VTICosting.java
    db/derby/code/branches/10.1/java/engine/org/apache/derby/vti/VTIEnvironment.java

Modified: db/derby/code/branches/10.1/COPYRIGHT
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/COPYRIGHT?rev=407405&r1=407404&r2=407405&view=diff
==============================================================================
--- db/derby/code/branches/10.1/COPYRIGHT (original)
+++ db/derby/code/branches/10.1/COPYRIGHT Wed May 17 16:51:25 2006
@@ -3,3 +3,5 @@
 and are placed here unaltered.
 
 (C) Copyright 1997,2004 International Business Machines Corporation.  All rights reserved.
+
+(C) Copyright IBM Corp. 2003.  

Modified: db/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/EbcdicCcsidManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/EbcdicCcsidManager.java?rev=407405&r1=407404&r2=407405&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/EbcdicCcsidManager.java
(original)
+++ db/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/EbcdicCcsidManager.java
Wed May 17 16:51:25 2006
@@ -16,11 +16,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
-   This program and the accompanying materials 
-   are made available under the terms of the Common Public License v1.0
-   which accompanies this distribution, and is available at
-   http://www.ibm.com/developerworks/oss/CPLv1.0.htm
-
  */
 
 package org.apache.derby.impl.drda;

Modified: db/derby/code/branches/10.1/java/engine/org/apache/derby/database/Database.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/engine/org/apache/derby/database/Database.java?rev=407405&r1=407404&r2=407405&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/engine/org/apache/derby/database/Database.java (original)
+++ db/derby/code/branches/10.1/java/engine/org/apache/derby/database/Database.java Wed May
17 16:51:25 2006
@@ -43,11 +43,7 @@
  * operations on the database such as  backup and recovery,
  * and all other things that are associated with the database itself.
  * 
- * <P>
- * <I>IBM Corp. reserves the right to change, rename, or
- * remove this interface at any time.</I>
-
-   @see org.apache.derby.iapi.db.Factory
+ *  @see org.apache.derby.iapi.db.Factory
  */
 public interface Database
 {

Modified: db/derby/code/branches/10.1/java/engine/org/apache/derby/database/UserUtility.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/engine/org/apache/derby/database/UserUtility.java?rev=407405&r1=407404&r2=407405&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/engine/org/apache/derby/database/UserUtility.java (original)
+++ db/derby/code/branches/10.1/java/engine/org/apache/derby/database/UserUtility.java Wed
May 17 16:51:25 2006
@@ -36,11 +36,6 @@
   
    <p>This class can only be used within an SQL-J statement, a Java procedure or a
server side Java method.
    <p>This class can be accessed using the class alias <code> USERUTILITY </code>
in SQL-J statements.
-  <P>
-  <i>
-  IBM Corp. reserves the right 
-  to change, rename, or remove this interface
-  at any time. </i>
   */
 public abstract class UserUtility
 {

Modified: db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/ConnectionInfo.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/ConnectionInfo.java?rev=407405&r1=407404&r2=407405&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/ConnectionInfo.java (original)
+++ db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/ConnectionInfo.java Wed
May 17 16:51:25 2006
@@ -36,9 +36,6 @@
  * <p>
  * Use the methods of this class only within an SQL-J statement; do not call 
  * them directly. 
- * <p>
- * <i>IBM Corp. reserves the right to change, rename or remove this class or
- * any of the methods in the class at any time.</i>
  */
  
 public abstract class ConnectionInfo

Modified: db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/ConsistencyChecker.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/ConsistencyChecker.java?rev=407405&r1=407404&r2=407405&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/ConsistencyChecker.java
(original)
+++ db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/ConsistencyChecker.java
Wed May 17 16:51:25 2006
@@ -66,10 +66,6 @@
  *
    <p>This class can only be used within an SQL-J statement, a Java procedure or a
server side Java method.
    <p>This class can be accessed using the class alias <code> CONSISTENCYCHECKER
</code> in SQL-J statements.
- * <p>
- * <I>IBM Corp. reserves the right to change, rename, or
- * remove this class or any of the the methods on the
- * class at any time.</I>
  */
 public class ConsistencyChecker
 {

Modified: db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/Factory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/Factory.java?rev=407405&r1=407404&r2=407405&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/Factory.java (original)
+++ db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/Factory.java Wed May
17 16:51:25 2006
@@ -54,9 +54,6 @@
  *  </OL>
   This class can only be used within an SQL-J statement, a Java procedure or a server side
Java method.
   <p>This class can be accessed using the class alias <code> FACTORY </code>
in SQL-J statements.
- * <P>
- * <I>IBM Corp. reserves the right to change, rename, or
- * remove this interface at any time.</I>
  */
 
 public class Factory

Modified: db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/PropertyInfo.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/PropertyInfo.java?rev=407405&r1=407404&r2=407405&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/PropertyInfo.java (original)
+++ db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/PropertyInfo.java Wed
May 17 16:51:25 2006
@@ -50,9 +50,6 @@
   * <P>
   This class can only be used within an SQL-J statement, a Java procedure or a server side
Java method.
   <p>This class can be accessed using the class alias <code> PROPERTYINFO </code>
in SQL-J statements.
-  * <P>
-  * <I>IBM Corp. reserves the right to change, rename, or
-  * remove this interface at any time.</I>
   */
 public final class PropertyInfo
 {

Modified: db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/TriggerExecutionContext.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/TriggerExecutionContext.java?rev=407405&r1=407404&r2=407405&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/TriggerExecutionContext.java
(original)
+++ db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/db/TriggerExecutionContext.java
Wed May 17 16:51:25 2006
@@ -27,10 +27,6 @@
 /**
  * A trigger execution context holds information that is
  * available from the context of a trigger invocation.
- * 
- * <P>
- * <I>IBM Corp. reserves the right to change, rename, or
- * remove this interface at any time.</I>
  */
 public interface TriggerExecutionContext
 {

Modified: db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java?rev=407405&r1=407404&r2=407405&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java
(original)
+++ db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java
Wed May 17 16:51:25 2006
@@ -42,9 +42,6 @@
  * of the input types (e.g. COUNT()), then it may be convenient
  * to implement both the AggregateDefinition and the Aggregator
  * interfaces by the same class.
- * <P>
- * <I> IBM Corp. reserves the right to change, rename, or
- * remove this interface at any time. </I>
  *
  * @see org.apache.derby.catalog.TypeDescriptor
  */

Modified: db/derby/code/branches/10.1/java/engine/org/apache/derby/vti/VTICosting.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/engine/org/apache/derby/vti/VTICosting.java?rev=407405&r1=407404&r2=407405&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/engine/org/apache/derby/vti/VTICosting.java (original)
+++ db/derby/code/branches/10.1/java/engine/org/apache/derby/vti/VTICosting.java Wed May 17
16:51:25 2006
@@ -36,9 +36,7 @@
   * <P>
   * This class can only be used within an SQL-J statement.  Using the methods
   * in application-side Java code results in Exceptions being thrown.
-  * <P>
-  * <I>IBM Corp reserves the right to change, rename, or
-  * remove this interface at any time.</I>
+  *
   * @see org.apache.derby.vti.VTIEnvironment
  */
 public interface VTICosting

Modified: db/derby/code/branches/10.1/java/engine/org/apache/derby/vti/VTIEnvironment.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/engine/org/apache/derby/vti/VTIEnvironment.java?rev=407405&r1=407404&r2=407405&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/engine/org/apache/derby/vti/VTIEnvironment.java (original)
+++ db/derby/code/branches/10.1/java/engine/org/apache/derby/vti/VTIEnvironment.java Wed May
17 16:51:25 2006
@@ -26,8 +26,7 @@
   * 
   * The interface is
   * passed as a parameter to various methods in the Virtual Table interface.
-  * <I>IBM Corp. reserves the right to change, rename, or
-  * remove this interface at any time.</I>
+  *
   * @see org.apache.derby.vti.VTICosting
   */
 public interface VTIEnvironment



Mime
View raw message