db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r516194 [1/2] - in /db/derby/code/trunk/java/engine/org/apache/derby/iapi: db/ error/ jdbc/ reference/ services/cache/ services/compiler/ services/context/ services/crypto/ services/daemon/ services/diag/ services/i18n/ services/info/ servi...
Date Thu, 08 Mar 2007 22:15:37 GMT
Author: fuzzylogic
Date: Thu Mar  8 14:15:34 2007
New Revision: 516194

URL: http://svn.apache.org/viewvc?view=rev&rev=516194
Log:
DERBY-2400: Replace references to Cloudscape with Derby

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Database.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Factory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/OptimizerTrace.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/StandardException.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheManager.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/Cacheable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherProvider.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/Serviceable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticUtil.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Diagnosticable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/MessageService.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Formatable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/TypedFormat.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedClass.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedMethod.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Limit.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/LockFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleControl.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/Monitor.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyUtil.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ParameterValueSet.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DDUtils.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GlobalXact.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowSource.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/TransactionController.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/LogicalUndo.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerHandle.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_ContainerLock.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_RowLock.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/LockingPolicy.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Loggable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/LogicalUndoable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Page.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/StreamContainerHandle.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Transaction.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Undoable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/data/DataFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/data/RawContainerHandle.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/Logger.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/RawTransaction.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/TransactionFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/JSQLType.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/TypeId.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/StringUtil.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Database.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Database.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Database.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Database.java Thu Mar  8 14:15:34 2007
@@ -107,7 +107,7 @@
 
 	/**
 	 * Get a Resource Adapter - only used by XA system.  There is one and only
-	 * one resource adapter per cloudscape database.
+	 * one resource adapter per Derby database.
 	 *
 	 * @return the resource Adapter for the database, null if no resource
 	 * adapter is available for this database. Returned as an Object

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Factory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Factory.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Factory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Factory.java Thu Mar  8 14:15:34 2007
@@ -29,7 +29,7 @@
 /**
  *  <P>
  *  Callers of these methods must be within the context of a
- *  Cloudscape statement execution otherwise a SQLException will be thrown.
+ *  Derby statement execution otherwise a SQLException will be thrown.
  *  <BR>
  *  There are two basic ways to call these methods.
  *  <OL>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/OptimizerTrace.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/OptimizerTrace.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/OptimizerTrace.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/OptimizerTrace.java Thu Mar  8 14:15:34 2007
@@ -27,12 +27,8 @@
 /**
   <P>
   This  class provides static methods for controlling the
-  optimizer tracing in a Cloudscape database.
+  optimizer tracing in a Derby database.
   
-  <P>
-  <i>
-  Cloudscape reserves the right to change, rename, or remove this interface
-  at any time. </i>
   */
 public class OptimizerTrace
 {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/StandardException.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/StandardException.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/StandardException.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/StandardException.java Thu Mar  8 14:15:34 2007
@@ -187,7 +187,7 @@
 	/**
 		Convert a message identifer from org.apache.derby.iapi.reference.SQLState to
 		a SQLState five character string.
-	 *	@param messageID - the sql state id of the message from cloudscape
+	 *	@param messageID - the sql state id of the message from Derby
 	 *	@return String 	 - the 5 character code of the SQLState ID to returned to the user 
 	*/
 	public static String getSQLStateFromIdentifier(String messageID) {
@@ -453,8 +453,8 @@
 	public static StandardException unexpectedUserException(Throwable t)
 	{
 		/*
-		** If we have a SQLException that isn't a Util
-		** (i.e. it didn't come from cloudscape), then we check
+		** If we have a SQLException that isn't an EmbedSQLException
+		** (i.e. it didn't come from Derby), then we check
 		** to see if it is a valid user defined exception range 
 		** (38001-38XXX).  If so, then we convert it into a 
 		** StandardException without further ado.
@@ -503,7 +503,7 @@
 			**    standard java exception, e.g. NullPointerException
 			**    SQL Exception - from some server-side JDBC
 			**    3rd party exception - from some application
-			**    some cloudscape exception that is not a standard exception.
+			**    some Derby exception that is not a standard exception.
 			**    
 			**    
 			** We don't want to call t.toString() here, because the JVM is
@@ -516,22 +516,23 @@
 			**
 			** The above is because our test canons contain the text of
 			** error messages.
-			**
-			** In addition we don't want to place the class name in an
-			** exception when the class is from cloudscape because
-			** the class name changes in obfuscated builds. Thus for
-			** exceptions that are in a package below com.ibm.db2j
+			** 
+			** In the past we didn't want to place the class name in
+			** an exception because Cloudscape builds were
+			** obfuscated, so the class name would change from build
+                        ** to build. This is no longer true for Derby, but for
+			** exceptions that are Derby's, i.e. EmbedSQLException,
 			** we use toString(). If this returns an empty or null
-			** then we use the class name to make tracking the problem
-			** down easier, though the lack of a message should be seen
-			** as a bug.
+			** then we use the class name to make tracking the 
+                        ** problem down easier, though the lack of a message 
+			** should be seen as a bug.
 			*/
 			String	detailMessage;
-			boolean cloudscapeException = false;
+			boolean derbyException = false;
 
 			if (t instanceof EmbedSQLException) {
 				detailMessage = ((EmbedSQLException) t).toString();
-				cloudscapeException = true;
+				derbyException = true;
 			}
 			else {
 				detailMessage = t.getMessage();
@@ -550,7 +551,7 @@
 			}
 			else {
 
-				if (!cloudscapeException) {
+				if (!derbyException) {
 					detailMessage = t.getClass().getName() + ": " + detailMessage;
 				}
 			}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java Thu Mar  8 14:15:34 2007
@@ -136,7 +136,7 @@
                 SanityManager.THROWASSERT( "Network server starter module booted twice.");
             return;
         }
-        // Load the server class indirectly so that Cloudscape does not require the network code
+        // Load the server class indirectly so that Derby does not require the network code
         try
         {
             serverClass = Class.forName( serverClassName);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java Thu Mar  8 14:15:34 2007
@@ -32,7 +32,7 @@
 import java.io.PrintStream;
 
 /**
-	A class to boot a cloudscape system that includes a JDBC driver.
+	A class to boot a Derby system that includes a JDBC driver.
 	Should be used indirectly through JDBCDriver or JDBCServletBoot
 	or any other useful booting mechanism that comes along.
 */
@@ -71,7 +71,7 @@
             /* The network server starter module is started differently from other modules because
              * 1. its start is conditional, depending on a system property, and PropertyUtil.getSystemProperty
              *    does not work until the Monitor has started,
-             * 2. we do not want the server to try to field requests before Cloudscape has booted, and
+             * 2. we do not want the server to try to field requests before Derby has booted, and
              * 3. if the module fails to start we want to log a message to the error log and continue as
              *    an embedded database.
              */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java Thu Mar  8 14:15:34 2007
@@ -37,7 +37,7 @@
 	global transactions, i.e., it does not know of in-doubt global transactions
 	re-created by recovery.
 
-	<P>	The following is an overall design of the JTA implementation in cloudscape,
+	<P>	The following is an overall design of the JTA implementation in Derby,
 	most of it has little to do with the ResourceAdapter interface itself.
 	<P><B>Design Overview </B>
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java Thu Mar  8 14:15:34 2007
@@ -154,25 +154,25 @@
 	/**
         derby.database.forceDatabaseLock
 		<BR>
-        Cloudscape attempts to prevent two instances of Cloudscape from booting
+        Derby attempts to prevent two instances of Derby from booting
         the same database with the use of a file called db.lck inside the 
         database directory.
 
-        On some platforms, Cloudscape can successfully prevent a second 
-        instance of Cloudscape from booting the database, and thus prevents 
+        On some platforms, Derby can successfully prevent a second 
+        instance of Derby from booting the database, and thus prevents 
         corruption. If this is the case, you will see an SQLException like the
         following:
 
         ERROR XJ040: Failed to start database 'toursDB', see the next exception
         for details.
-        ERROR XSDB6: Another instance of Cloudscape may have already booted the
+        ERROR XSDB6: Another instance of Derby may have already booted the
         database C:\databases\toursDB.
 
         The error is also written to the information log.
 
-        On other platforms, Cloudscape issues a warning message if an instance
-        of Cloudscape attempts to boot a database that may already have a
-        running instance of Cloudscape attached to it.
+        On other platforms, Derby issues a warning message if an instance
+        of Derby attempts to boot a database that may already have a
+        running instance of Derby attached to it.
         However, it does not prevent the second instance from booting, and thus
         potentially corrupting, the database.
 
@@ -180,15 +180,12 @@
         occurred.
 
 
-        NOTE: When you are using Cloudview, error messages appear in the 
-        console or operating system window from which Cloudview was started.
-
         The warning message looks like this:
 
-        WARNING: Cloudscape (instance 80000000-00d2-3265-de92-000a0a0a0200) is
+        WARNING: Derby (instance 80000000-00d2-3265-de92-000a0a0a0200) is
         attempting to boot the database /export/home/sky/wombat even though
-        Cloudscape (instance 80000000-00d2-3265-8abf-000a0a0a0200) may still be
-        active. Only one instance of Cloudscape
+        Derby (instance 80000000-00d2-3265-8abf-000a0a0a0200) may still be
+        active. Only one instance of Derby 
         should boot a database at a time. Severe and non-recoverable corruption
         can result and may have already occurred.
 
@@ -197,24 +194,24 @@
         This warning is primarily a Technical Support aid to determine the 
         cause of corruption. However, if you see this warning, your best 
         choice is to close the connection and exit the JVM. This minimizes the
-        risk of a corruption. Close all instances of Cloudscape, then restart
-        one instance of Cloudscape and shut down the database properly so that
+        risk of a corruption. Close all instances of Derby, then restart
+        one instance of Derby and shut down the database properly so that
         the db.lck file can be removed. The warning message continues to appear
-        until a proper shutdown of the Cloudscape system can delete the db.lck
+        until a proper shutdown of the Derby system can delete the db.lck
         file.
 
         If the "derby.database.forceDatabaseLock" property is set to true
-        then this default behavior is altered on systems where cloudscape cannot
+        then this default behavior is altered on systems where Derby cannot
         prevent this dual booting.  If the to true, then if the platform does
-        not provide the ability for cloudscape to guarantee no double boot, and
-        if cloudscape finds a db.lck file when it boots, it will throw an 
+        not provide the ability for Derby to guarantee no double boot, and
+        if Derby finds a db.lck file when it boots, it will throw an 
         exception (TODO - mikem - add what exception), leave the db.lck file
         in place and not boot the system.  At this point the system will not 
         boot until the db.lck file is removed by hand.  Note that this 
         situation can arise even when 2 VM's are not accessing the same
-        cloudscape system.  Also note that if the db.lck file is removed by 
+        Derby system.  Also note that if the db.lck file is removed by 
         hand while a VM is still accessing a derby.database, then there 
-        is no way for cloudscape to prevent a second VM from starting up and 
+        is no way for Derby to prevent a second VM from starting up and 
         possibly corrupting the database.  In this situation no warning 
         message will be logged to the error log.
 
@@ -369,8 +366,8 @@
     public static final int IDX_PAGE_SIZE_BUMP_THRESHOLD = 1024;
 
     /**
-     * In cloudscape products which support Row Level Locking (rll), use this 
-     * property to disable rll.  Application's which use rll will use more 
+     * Derby supports Row Level Locking (rll),  but you can use this 
+     * property to disable rll.  Applications which use rll will use more 
      * system resources, so if an application knows that it does not need rll 
      * then it can use this system property to force all locking in the system 
      * to lock at the table level.
@@ -657,10 +654,10 @@
 	public static final String AUTHENTICATION_PROVIDER_PARAMETER =
 								"derby.authentication.provider";
 
-	// This is the user property used by Cloudscape and LDAP schemes
+	// This is the user property used by Derby and LDAP schemes
 	public static final String USER_PROPERTY_PREFIX = "derby.user.";
 
-	// These are the different built-in providers Cloudscape supports
+	// These are the different built-in providers Derby supports
 
 	public static final String AUTHENTICATION_PROVIDER_BUILTIN =
 								"BUILTIN";
@@ -737,8 +734,8 @@
     /**
      * derby.drda.startNetworkServer
      *<BR>
-     * If true then we will attempt to start a DRDA network server when Cloudscape boots,
-     * turning the current JVM into a server.
+     * If true then we will attempt to start a DRDA network server when Derby 
+     * boots, turning the current JVM into a server.
      *<BR>
      * Default: false
      */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheManager.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheManager.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheManager.java Thu Mar  8 14:15:34 2007
@@ -40,7 +40,7 @@
      *
      * @param newSize the new maximum cache size
      *
-     * @exception StandardException Cloudscape Standard error policy
+     * @exception StandardException Standard Derby error policy
      */
 	public void resize( long newSize) throws StandardException;
 
@@ -77,7 +77,7 @@
 
 		@return A reference to an object in the cache, or null if the object cannot be found.
 
-		@exception StandardException Standard Cloudscape error policy.
+		@exception StandardException Standard Derby error policy.
 
 		@see Cacheable#setIdentity
 
@@ -106,7 +106,7 @@
 			}
 			
 		</PRE>
-		@exception StandardException Standard Cloudscape error policy.
+		@exception StandardException Standard Derby error policy.
 	*/
 	public Cacheable findCached(Object key) throws StandardException;
 
@@ -164,7 +164,7 @@
 
 		@return A reference to an object in the cache.
 
-		@exception StandardException Standard Cloudscape error policy.
+		@exception StandardException Standard Derby error policy.
 
 		@see Cacheable#createIdentity
 
@@ -193,7 +193,7 @@
 		<BR>
 		After this call the caller must throw away the reference to item.
 
-		@exception StandardException Standard Cloudscape error policy.
+		@exception StandardException Standard Derby error policy.
 	*/
 	public void remove(Cacheable entry) throws StandardException;
 
@@ -208,7 +208,7 @@
 		@see Cacheable#clean
 		@see Cacheable#isDirty
 
-		@exception StandardException Standard Cloudscape error policy.
+		@exception StandardException Standard Derby error policy.
 	*/
 	public void cleanAll() throws StandardException;
 
@@ -221,7 +221,7 @@
         be able to handle a partial key, e.g. a page has PageKey but a clean 
         may pass a ContainerKey which will discard all pages in that container.
 
-		@exception StandardException Standard Cloudscape error policy.
+		@exception StandardException Standard Derby error policy.
 	*/
 	public void clean(Matchable partialKey) throws StandardException;
 
@@ -247,7 +247,7 @@
 		and then cleanAll() and ageOut() are called. The cache remains
 		in existence until the last kept object has been unkept.
 
-		@exception StandardException Standard Cloudscape error policy.
+		@exception StandardException Standard Derby error policy.
 
 	*/
 	public void shutdown() throws StandardException;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/Cacheable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/Cacheable.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/Cacheable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/Cacheable.java Thu Mar  8 14:15:34 2007
@@ -81,7 +81,7 @@
 
 		@return an object reference if the object can take on the identity, null otherwise.
 
-		@exception StandardException Standard Cloudscape Policy
+		@exception StandardException Standard Derby Policy
 
 		@see CacheManager#find
 
@@ -164,7 +164,7 @@
 		responsibility of the object implementing Cacheable to ensure any users of the
 		object do not conflict with the clean call.
 
-		@exception StandardException Standard Cloudscape error policy.
+		@exception StandardException Standard Derby error policy.
 
 	*/
 	public void clean(boolean forRemove) throws StandardException;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java Thu Mar  8 14:15:34 2007
@@ -75,7 +75,7 @@
 		Fully create the bytecode and load the
 		class using the ClassBuilder's ClassFactory.
 
-		@exception StandardException Standard Cloudscape policy
+		@exception StandardException Standard Derby policy
 	*/
 	GeneratedClass getGeneratedClass() throws StandardException;
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java Thu Mar  8 14:15:34 2007
@@ -76,7 +76,7 @@
 		fast access to a list of candidate contexts. If one of the contexts has its activeThread
 		equal to the current thread then it is the current context manager.
 
-		If the thread has pushed multiple contexts (e.g. open a new non-nested Cloudscape connection
+		If the thread has pushed multiple contexts (e.g. open a new non-nested Derby connection
 		from a server side method) then threadContextList will contain a Stack. The value for each cm
 		will be a push order, with higher numbers being more recently pushed.
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactory.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactory.java Thu Mar  8 14:15:34 2007
@@ -67,7 +67,7 @@
 		@param mode is either ENCRYPT or DECRYPT.  The CipherProvider can only
 				do encryption or decryption but not both.
 
-		@exception StandardException Standard Cloudscape Error Policy
+		@exception StandardException Standard Derby Error Policy
 	 */
 	CipherProvider createNewCipher(int mode)
 		 throws StandardException;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherProvider.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherProvider.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherProvider.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherProvider.java Thu Mar  8 14:15:34 2007
@@ -64,7 +64,7 @@
 		If cleartext and ciphertext are the same array, caller must be careful
 		to not overwrite the cleartext before it is scrambled.
 
-		@exception StandardException Standard Cloudscape Error Policy
+		@exception StandardException Standard Derby Error Policy
 	 */
 	int encrypt(byte[] cleartext, int offset, int length,
 				byte[] ciphertext, int outputOffset)
@@ -86,7 +86,7 @@
 		If cleartext and ciphertext are the same array, caller must be careful
 		to not overwrite the ciphertext before it is un-scrambled.
 
-		@exception StandardException Standard Cloudscape Error Policy
+		@exception StandardException Standard Derby Error Policy
 	 */
 	int decrypt(byte[] ciphertext, int offset, int length,
 				byte[] cleartext, int outputOffset)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonFactory.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonFactory.java Thu Mar  8 14:15:34 2007
@@ -59,7 +59,7 @@
 	/**
 		Create a new DaemonService with the default daemon timer delay.
 
-		@exception StandardException Standard cloudscape error policy
+		@exception StandardException Standard Derby error policy
 	 */
 	public DaemonService createNewDaemon(String name) throws StandardException;
 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/Serviceable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/Serviceable.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/Serviceable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/Serviceable.java Thu Mar  8 14:15:34 2007
@@ -72,7 +72,7 @@
 		serviceASAP, although no harm is done if this still maintains that this
 		should be serviced ASAP ...
 
-	    @exception StandardException  Standard cloudscape exception policy
+	    @exception StandardException  Standard Derby exception policy
 
 		<P>MT - depends on the work.  Be wary of multiple DaemonService thread
 		calling at the same time if you subscribe or enqueue multiple times.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticUtil.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticUtil.java Thu Mar  8 14:15:34 2007
@@ -24,7 +24,7 @@
 /**
 
 The Diagnostic framework is meant to provide a way to include as much
-diagnostic capability within the distributed release of the cloudscape
+diagnostic capability within the distributed release of the Derby
 product without adversely affecting the runtime speed or foot print of
 a running configuration that needs not use this information.
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Diagnosticable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Diagnosticable.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Diagnosticable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Diagnosticable.java Thu Mar  8 14:15:34 2007
@@ -52,7 +52,7 @@
      *
 	 * @return A string with diagnostic information about the object.
      *
-     * @exception StandardException  Standard cloudscape exception policy
+     * @exception StandardException  Standard Derby exception policy
      **/
     public String diag() throws StandardException;
 
@@ -86,7 +86,7 @@
      * be provided by a real implementation.
      * <p>
      *
-     * @exception StandardException  Standard cloudscape exception policy
+     * @exception StandardException  Standard Derby exception policy
      **/
     public void diag_detail(Properties prop) throws StandardException;
 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/MessageService.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/MessageService.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/MessageService.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/MessageService.java Thu Mar  8 14:15:34 2007
@@ -105,8 +105,7 @@
 	}
 
 	/**
-	  Method used by Cloudscape Network Server to get localized message (original call
-	  from jcc.
+	  Method used by Derby Network Server to get localized message
 
 	  @param sqlcode	sqlcode, not used.
 	  @param errmcLen	sqlerrmc length
@@ -198,7 +197,7 @@
 	}
 	
 	/**
-	  Method used by Cloudscape Network Server to get localized message 
+	  Method used by Derby Network Server to get localized message 
 
 	  @param locale		locale
 	  @param messageId	message id

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java Thu Mar  8 14:15:34 2007
@@ -22,23 +22,22 @@
 package org.apache.derby.iapi.services.info;
 
 /**
-  Holder class for cloudscape genus names.
+  Holder class for Derby genus names.
 
   <P>
-  A product genus defines a product's category (tools, DBMS etc). For
-  some categories, Cloudscape ships more than one product. Each product,
-  within the genus has a unique product species.
+  A product genus defines a product's category (tools, DBMS etc). 
+  Currently, Derby only ships one jar file per genus. The info file
+  defined in this file is used by sysinfo to determine version information.
 
   <P>
-  A correct run time environment should include at most one Cloudscape
-  product of a given genus. This helps avoid situations in which the
-  environment loads classes from more than one product. a user runs
-  with a mix of classes from different
+  A correct run time environment should include at most one Derby
+  jar file of a given genus. This helps avoid situations in which the
+  environment loads classes from more than one version. 
 
   <P>
-  Please not that the list provided here serves to document product
-  genus names and to facile consistent naming in code. Because the
-  list of supported Cloudscape genus names will change with time, the
+  Please note that the list provided here serves to document product
+  genus names and to facilitate consistent naming in code. Because the
+  list of supported Derby genus names may change with time, the
   code in this package does *NOT* restrict users to the product genus
   names listed here.
   */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java Thu Mar  8 14:15:34 2007
@@ -27,7 +27,7 @@
 
 
 /**
-  Class to hold a cloudscape Product version.
+  Class to hold a Derby Product version.
 
   This class includes the following product version features.
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java Thu Mar  8 14:15:34 2007
@@ -365,7 +365,7 @@
     }
 
     /**
-     * read in a cloudscape UTF formated string into a char[].
+     * read in a Derby UTF formated string into a char[].
      * <p>
      * This routine inline's the code to read a UTF format string from a
      * byte[] array (pageData), into a char[] array.  The string will
@@ -374,7 +374,7 @@
      * a new char[] will be alocated and returned to the caller by putting
      * it into rawData_array[0].
      * <p>
-     * To see detailed description of the cloudscape UTF format see
+     * To see detailed description of the Derby UTF format see
      * the writeExternal() routine of SQLChar.
      * <p>
      * The routine returns the number of char's read into the returned
@@ -395,7 +395,7 @@
      *
 	 * @exception  StandardException  Standard exception policy.
      **/
-    public final int readCloudscapeUTF(char[][] rawData_array) 
+    public final int readDerbyUTF(char[][] rawData_array) 
         throws IOException
 	{
         // copy globals locally, to give compiler chance to optimize.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Formatable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Formatable.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Formatable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Formatable.java Thu Mar  8 14:15:34 2007
@@ -24,7 +24,7 @@
 import java.io.Externalizable;
 
 /**
-  Cloudscape interface for creating a stored form for
+  Derby interface for creating a stored form for
   an object and re-constructing an equivalent object
   from this stored form. The object which creates the
   stored form and the re-constructed object need not be

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java Thu Mar  8 14:15:34 2007
@@ -48,7 +48,7 @@
 
   <P>When you add a format id to this file, please include the list
   of interfaces an implementaion must support when it supports
-  the format id. When Cloudscape code reads a stored form it returns an 
+  the format id. When Derby code reads a stored form it returns an 
   object of a Class which supports the stored form. A reader may
   cast this object to any interface listed in this file. It is an error for
   the reader to cast the object to a class or interface not listed in this
@@ -58,7 +58,7 @@
   states the name of the class. The first implementation of a format defines
   the stored form.
 
-  <P>This interface defines all the format ids for Cloudscape software.
+  <P>This interface defines all the format ids for Derby.
   If you define a format id please be sure to declare it in this
   file. If you remove support for a one please document that the
   format id is deprecated. Never remove or re-use a format id.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/TypedFormat.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/TypedFormat.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/TypedFormat.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/TypedFormat.java Thu Mar  8 14:15:34 2007
@@ -21,7 +21,7 @@
 
 package org.apache.derby.iapi.services.io;
 /**
-  Cloudscape interface for identifying the format id for the
+  Derby interface for identifying the format id for the
   stored form of an object. Objects of different classes may
   have the same format id if:
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactory.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactory.java Thu Mar  8 14:15:34 2007
@@ -38,7 +38,7 @@
 	/**
 		Add a generated class to the class manager's class repository.
 
-		@exception 	StandardException	Standard Cloudscape error policy
+		@exception 	StandardException	Standard Derby error policy
 
 	*/
 	public GeneratedClass loadGeneratedClass(String fullyQualifiedName, ByteArray classDump)
@@ -70,7 +70,7 @@
 	/**
 		Was the passed in class loaded by a ClassManager.
 
-		@return true if the class was loaded by a Cloudscape class manager,
+		@return true if the class was loaded by a Derby class manager,
 		false it is was loaded by the system class loader, or another class loader.
 	*/
 	public boolean isApplicationClass(Class theClass);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedClass.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedClass.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedClass.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedClass.java Thu Mar  8 14:15:34 2007
@@ -42,7 +42,7 @@
 		constructor of the represneted class.
 		(Similar to java.lang.Class.newInstance).
 
-		@exception 	StandardException	Standard Cloudscape error policy
+		@exception 	StandardException	Standard Derby error policy
 
 	*/
 	public Object newInstance(Context context)
@@ -52,7 +52,7 @@
 		Obtain a handle to the method with the given name
 		that takes no arguments.
 
-		@exception 	StandardException	Standard Cloudscape error policy
+		@exception 	StandardException	Standard Derby error policy
 	*/
 	public GeneratedMethod getMethod(String simpleName)
 		throws StandardException;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedMethod.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedMethod.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedMethod.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedMethod.java Thu Mar  8 14:15:34 2007
@@ -38,7 +38,7 @@
 
 		Returns the value returned by the method.
 
-		@exception 	StandardException	Standard Cloudscape error policy
+		@exception 	StandardException	Standard Derby error policy
 	*/
 
 	public Object invoke(Object ref)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Limit.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Limit.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Limit.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Limit.java Thu Mar  8 14:15:34 2007
@@ -43,7 +43,7 @@
 		@param lockList the list of Lockable's in the group
 		@param lockCount the number of locks in the group
 
-        @exception StandardException Standard Cloudscape error policy.
+        @exception StandardException Standard Derby error policy.
 	*/
 	public void reached(CompatibilitySpace compatibilitySpace, Object group,
 						int limit, Enumeration lockList, int lockCount)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/LockFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/LockFactory.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/LockFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/LockFactory.java Thu Mar  8 14:15:34 2007
@@ -80,7 +80,7 @@
 		@exception org.apache.derby.iapi.error.StandardException Another thread interupted this thread while
 		it was waiting for the lock. This will be a StandardException with a nested java.lang.InterruptedException exception,
 		(message id will be LockFactory.InterruptedExceptionId)
-		@exception StandardException Standard Cloudscape error policy.
+		@exception StandardException Standard Derby error policy.
 
 	*/
 	public boolean lockObject(CompatibilitySpace compatibilitySpace,
@@ -175,7 +175,7 @@
 		@exception org.apache.derby.iapi.error.StandardException Another thread interupted this thread while
 		it was waiting for the lock. This will be a StandardException with a nested java.lang.InterruptedException exception,
 		(message id will be LockFactory.InterruptedExceptionId)
-		@exception StandardException Standard Cloudscape error policy.
+		@exception StandardException Standard Derby error policy.
 
 	*/
 	public boolean zeroDurationlockObject(CompatibilitySpace compatibilitySpace,

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleControl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleControl.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleControl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleControl.java Thu Mar  8 14:15:34 2007
@@ -56,7 +56,7 @@
 		This attributes properties set has the second default properties set as
 		its default. This set (which could be null) contains the properties
 		that the user set on their DriverManager.getConnection() call, and are thus
-		not owned by cloudscape code, and thus must not be modified by cloudscape
+		not owned by Derby code, and thus must not be modified by Derby 
 		code.
 		<P>
 		When create is false the properties object contains all the properties

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleFactory.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleFactory.java Thu Mar  8 14:15:34 2007
@@ -85,7 +85,7 @@
 		Set the locale for the service at boot time. The passed-in
 		properties must be the one passed to the boot method.
 
-		@exception StandardException	Cloudscape error.
+		@exception StandardException	Derby error.
 	 */
 	public Locale setLocale(Properties serviceProperties,
 							String userDefinedLocale)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/Monitor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/Monitor.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/Monitor.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/Monitor.java Thu Mar  8 14:15:34 2007
@@ -171,7 +171,7 @@
 	<LI>The properties set of the service (i.e. that passed into Monitor.createPersistentService()
 	or Monitor.startService()).
 	<LI>The System (JVM) properties set (i.e. java.lang.System.getProperties()).
-	<LI>The application properties set (i.e. obtained from the cloudscape.properties file).
+	<LI>The application properties set (i.e. obtained from the derby.properties file).
 	<LI>The default implementation properties set (i.e. obtained from the
 	/org/apache/derby/modules.properties resource).
 	</OL>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyUtil.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyUtil.java Thu Mar  8 14:15:34 2007
@@ -160,7 +160,7 @@
 		</OL>
 
 		<P>
-		This method can be used by a system that is not running Cloudscape,
+		This method can be used by a system that is not running Derby,
 		just to maintain the same lookup logic and security manager concerns
 		for finding derby.properties and reading system properties.
 
@@ -263,7 +263,7 @@
 	/**
 		Get a property only looking in the Persistent Transactional (database) set.
 
-		@exception StandardException Standard Cloudscape error handling. 
+		@exception StandardException Standard Derby error handling. 
 	*/
 	public static String getDatabaseProperty(PersistentSet set, String key) 
 		throws StandardException {
@@ -284,7 +284,7 @@
 
 		@return the value of the property or defaultValue if it does not exist.
 
-		@exception StandardException Standard Cloudscape error handling. 
+		@exception StandardException Standard Derby error handling. 
 	*/
 	public static String getServiceProperty(PersistentSet set, String key, String defaultValue) 
 		throws StandardException {
@@ -324,7 +324,7 @@
 
 		@return the value of the property or null if it does not exist.
 
-			@exception StandardException Standard Cloudscape error handling. 
+			@exception StandardException Standard Derby error handling. 
 	*/
 	public static String getServiceProperty(PersistentSet set, String key)
 		throws StandardException {
@@ -350,7 +350,7 @@
 
 		@return true of the property is set to 'true, TRUE', false otherwise
 
-		@exception StandardException Standard Cloudscape error handling. 
+		@exception StandardException Standard Derby error handling. 
 	*/
 	public static boolean getServiceBoolean(PersistentSet set, String key, boolean defValue) 
 		throws StandardException {
@@ -376,7 +376,7 @@
 		@return value of the property if set subject to min and max, defaultValue if
 		it is not set or set to a non-integer value.
 
-		@exception StandardException Standard Cloudscape error handling. 
+		@exception StandardException Standard Derby error handling. 
 
 	*/
 	public static int getServiceInt(PersistentSet set, String key, int min, int max, int defaultValue)
@@ -392,7 +392,7 @@
 		@return value of the property if set subject to min and max, defaultValue if
 		it is not set or set to a non-integer value.
 
-		@exception StandardException Standard Cloudscape error handling. 
+		@exception StandardException Standard Derby error handling. 
 
 	*/
 	public static int getServiceInt(PersistentSet set, Properties props, String key, int min, int max, int defaultValue)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ParameterValueSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ParameterValueSet.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ParameterValueSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ParameterValueSet.java Thu Mar  8 14:15:34 2007
@@ -169,7 +169,7 @@
 	/**
 		Check that there are not output parameters defined
 		by the parameter set. If there are unknown parameter
-		types they are forced to input types. i.e. Cloudscape static method
+		types they are forced to input types. i.e. Derby static method
 		calls with parameters that are array.
 
 		@return true if a declared Java Procedure INOUT or OUT parameter is in the set, false otherwise.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java Thu Mar  8 14:15:34 2007
@@ -237,7 +237,7 @@
 		 throws StandardException;
 
 	/**
-		Do a commit, as internally needed by Cloudscape.  E.g.
+		Do a commit, as internally needed by Derby.  E.g.
 	 	a commit for sync, or a commit for autocommit.  Skips
 		checks that a user isn't doing something bad like issuing
 		a commit in a nested xact.
@@ -279,7 +279,7 @@
 
 
 	/**
-		Do a rollback, as internally needed by Cloudscape.  E.g.
+		Do a rollback, as internally needed by Derby.  E.g.
 	 	a rollback for sync, or a rollback for an internal error.  Skips
 		checks that a user isn't doing something bad like issuing
 		a rollback in a nested xact.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DDUtils.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DDUtils.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DDUtils.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DDUtils.java Thu Mar  8 14:15:34 2007
@@ -711,7 +711,7 @@
 	**   one path and tries to update  through another path. 
 	**   Nothing in standard that say whether we are suppose to delete the row
 	**   or update the row.  DB2UDB raises error when we try to create the
-	**   foreign key fkey4, cloudscape also does the same.
+	**   foreign key fkey4, Derby also does the same.
 	** 
 	**   How we catch the error case ?
 	**   Point to note here is the table(t4) we are  adding the foreign key does

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java Thu Mar  8 14:15:34 2007
@@ -178,7 +178,7 @@
 	/**
 	 * Clear all of the DataDictionary caches.
 	 *
-	 * @exception StandardException Standard Cloudscape error policy
+	 * @exception StandardException Standard Derby error policy
 	 */
 	public void clearCaches() throws StandardException;
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java Thu Mar  8 14:15:34 2007
@@ -57,9 +57,7 @@
 	*/
     /**
      * STD_SYSTEM_SCHEMA_NAME is the name of the system schema in databases that
-     * use ANSI standard identifier casing. In LSA and in Cloudscape target 
-     * databases the name will use the same case as the source database 
-     * identifiers.
+     * use ANSI standard identifier casing. 
      *
      * See org.apache.derby.impl.sql.conn.GenericLanguageConnectionContext#getSystemSchemaName
      */
@@ -70,7 +68,7 @@
     /*
      * Names of system schemas.
      * The following schemas exist in a standard empty DB2 database.  For
-     * now creating them in the cloudscape database but not actually putting
+     * now creating them in the Derby database but not actually putting
      * any objects in them.  Users should not be able to create any objects
      * in these schemas.
      **/
@@ -86,22 +84,20 @@
     public static final	String	STD_SQLJ_SCHEMA_NAME      = "SQLJ";
      
     /**
-     * This schema is for cloudscape specific system diagnostic procedures and 
+     * This schema is for Derby specific system diagnostic procedures and 
      * functions which are not available in DB2.  
      **/
     public static final	String	STD_SYSTEM_DIAG_SCHEMA_NAME     = "SYSCS_DIAG";
 
     /**
-     * This schema is for cloudscape specific system diagnostic procedures and 
+     * This schema is for Derby specific system diagnostic procedures and 
      * functions which are not available in DB2.  
      **/
     public static final	String	STD_SYSTEM_UTIL_SCHEMA_NAME     = "SYSCS_UTIL";
 
     /**
      * STD_DEFAULT_SCHEMA_NAME is the name of the default schema in databases 
-     * that use ANSI standard identifier casing. In LSA and in Cloudscape 
-     * target databases the name will use the same case as the source database 
-     * identifiers.
+     * that use ANSI standard identifier casing. 
      *
      * See org.apache.derby.impl.sql.conn.GenericLanguageConnectionContext#getDefaultSchemaName
      */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GlobalXact.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GlobalXact.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GlobalXact.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GlobalXact.java Thu Mar  8 14:15:34 2007
@@ -33,7 +33,7 @@
 <LI> org.apache.derby.iapi.store.access.xa.XAXactId : 
 this class is a specific implementation of the JTA Xid interface
 <LI> org.apache.derby.impl.store.access.GlobalXactId : 
-this class represents internal cloudscape transaction ids
+this class represents internal Derby transaction ids
 </UL>
 <P>
 The main reason for this class is to ensure that equality etc. works in a

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowSource.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowSource.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowSource.java Thu Mar  8 14:15:34 2007
@@ -68,7 +68,7 @@
         nextRow call.  In this case the client should severe all references to 
         the row after returning it from getNextRowFromRowSource().
 
-		@exception StandardException Cloudscape Standard Error Policy
+		@exception StandardException Standard Derby Error Policy
 	 */
 	public DataValueDescriptor[] getNextRowFromRowSource() 
         throws StandardException;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/TransactionController.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/TransactionController.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/TransactionController.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/TransactionController.java Thu Mar  8 14:15:34 2007
@@ -407,7 +407,7 @@
 
 	All temporary conglomerate is removed by store when the
 	conglomerate controller is destroyed, or if it is dropped by an explicit
-	dropConglomerate.  If cloudscape reboots, all temporary
+	dropConglomerate.  If Derby reboots, all temporary
 	conglomerates are removed.
 
 	@exception  StandardException  if the conglomerate could
@@ -1505,7 +1505,7 @@
 
     @see org.apache.derby.iapi.store.raw.Loggable
     @see org.apache.derby.iapi.store.raw.Transaction#logAndDo
-    @exception StandardException  Standard cloudscape exception policy
+    @exception StandardException  Standard Derby exception policy
 	**/
 	public void logAndDo(Loggable operation) throws StandardException;
 
@@ -1874,7 +1874,7 @@
                     A JDBC Savepoint object value for kindOfSavepoint would mean it is JDBC savepoint
     @return returns savepoint position in the stack.
 
-	@exception StandardException  Standard cloudscape exception policy.  A 
+	@exception StandardException  Standard Derby exception policy.  A 
                                   statement level exception is thrown if
                                   no savepoint exists with the given name.
 	**/
@@ -1907,7 +1907,7 @@
 	  A JDBC Savepoint object value for kindOfSavepoint would mean it is JDBC savepoint
     @return returns savepoint position in the stack.
 
-	@exception StandardException  Standard cloudscape exception policy.  A 
+	@exception StandardException  Standard Derby exception policy.  A 
                                   statement level exception is thrown if
                                   no savepoint exists with the given name.
 	**/
@@ -1931,7 +1931,7 @@
 	  A JDBC Savepoint object value for kindOfSavepoint would mean it is JDBC savepoint
 	@return returns savepoint position in the stack.
 
-	@exception StandardException  Standard cloudscape exception policy.  A 
+	@exception StandardException  Standard Derby exception policy.  A 
                                   statement level exception is thrown if
                                   no savepoint exists with the given name.
 	**/

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/LogicalUndo.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/LogicalUndo.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/LogicalUndo.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/LogicalUndo.java Thu Mar  8 14:15:34 2007
@@ -122,7 +122,7 @@
 		@param in data stored in the log stream that contains the record data
 				necessary to restore the row.
 
-		@exception StandardException Standard Cloudscape error policy
+		@exception StandardException Standard Derby error policy
 		@exception IOException Method may read from InputStream		
 	*/
 	public Page findUndo(

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerHandle.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerHandle.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerHandle.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerHandle.java Thu Mar  8 14:15:34 2007
@@ -189,7 +189,7 @@
 
 		@see Page#unlatch
 
-		@exception StandardException	Standard Cloudscape error policy
+		@exception StandardException	Standard Derby error policy
 		@exception StandardException If a page could not be allocated.
 	*/
 	public Page addPage() throws StandardException;
@@ -202,7 +202,7 @@
         will usually mean releasing any free pages located at the end of the
         file using the java truncate() interface.
 
-		@exception StandardException	Standard Cloudscape error policy
+		@exception StandardException	Standard Derby error policy
 	*/
 	public void compressContainer() throws StandardException;
 
@@ -228,7 +228,7 @@
 
 		@see Page#unlatch
 
-		@exception StandardException	Standard Cloudscape error policy
+		@exception StandardException	Standard Derby error policy
 		@exception StandardException If a page could not be allocated.
 
 	*/
@@ -269,7 +269,7 @@
 		@see LockingPolicy
 		@see RecordHandle
 
-		@exception StandardException Standard Cloudscape error policy 
+		@exception StandardException Standard Derby error policy 
 	*/
 	public void removePage(Page page) throws StandardException;
 
@@ -288,7 +288,7 @@
         valid (i.e, it has been deallocated or freed or never initialized)
 		Note that an overflow page will be returned since it is a valid page.
 
-		@exception StandardException	Standard Cloudscape error policy
+		@exception StandardException	Standard Derby error policy
 	*/
 	public Page getPage(long pageNumber)
 		throws StandardException;
@@ -300,7 +300,7 @@
 		@return the required Page or null if the page does not exist or the page
 		is already latched.
 
-		@exception StandardException	Standard Cloudscape error policy
+		@exception StandardException	Standard Derby error policy
 
 	*/
 	public Page getPageNoWait(long pageNumber) throws StandardException;
@@ -324,7 +324,7 @@
         valid (i.e, it has been deallocated, freed, never initialized, or is
         an allocation page or overflow page)
 
-		@exception StandardException	Standard Cloudscape error policy
+		@exception StandardException	Standard Derby error policy
 	*/
 	public Page getUserPageNoWait(long pageNumber) throws StandardException;
 	/**
@@ -346,7 +346,7 @@
         valid (i.e, it has been deallocated, freed, never initialized, or is
         an allocation page or overflow page)
 
-		@exception StandardException	Standard Cloudscape error policy
+		@exception StandardException	Standard Derby error policy
 	*/
 	public Page getUserPageWait(long pageNumber) throws StandardException;
 
@@ -367,7 +367,7 @@
 		the pages.
 
 		@return latched page or null if there is no page in the container
-		@exception StandardException	Standard Cloudscape error policy
+		@exception StandardException	Standard Derby error policy
 
 		@see ContainerHandle#getPage
 	*/
@@ -410,7 +410,7 @@
 		then the behavior of this routine is undefined.
 
 		@return latched page or null if there is no next page in the container
-		@exception StandardException	Standard Cloudscape error policy
+		@exception StandardException	Standard Derby error policy
 
 		@see ContainerHandle#getPage
 	*/
@@ -430,7 +430,7 @@
 
 		@param flag a GET_PAGE_* flag.
 
-		@exception StandardException Standard Cloudscape error policy 
+		@exception StandardException Standard Derby error policy 
 	*/
 	public Page getPageForInsert(int flag) 
 		 throws StandardException;
@@ -513,7 +513,7 @@
 		overflow rows.  This number is a rough estimate and may be grossly off.
 
 		@param flag different flavors of row count (reserved for future use)
-		@exception StandardException	Standard Cloudscape error policy
+		@exception StandardException	Standard Derby error policy
 	 */
 	public long getEstimatedRowCount(int flag) throws StandardException;
 
@@ -528,7 +528,7 @@
 		@param count the estimated number of rows in the container.
 		@param flag different flavors of row count (reserved for future use)
 
-		@exception StandardException	Standard Cloudscape error policy
+		@exception StandardException	Standard Derby error policy
 	 */
 	public void setEstimatedRowCount(long count, int flag) throws StandardException;
 
@@ -539,7 +539,7 @@
 
 		@param flag different flavors of page count (reserved for future use)
 
-		@exception StandardException	Standard Cloudscape error policy
+		@exception StandardException	Standard Derby error policy
 	 */
 	public long getEstimatedPageCount(int flag) throws StandardException;
 
@@ -548,7 +548,7 @@
 		Flush all dirty pages of the container to disk.  Used mainly for
 		UNLOGGED or CREATE_UNLOGGED operation.
 
-		@exception StandardException	Standard Cloudscape error policy
+		@exception StandardException	Standard Derby error policy
 	*/
 	public void flushContainer() throws StandardException;
 
@@ -566,7 +566,7 @@
 		Return a record handle that is initialized to the given segment id,
         container id, page number and record id.
 
-		@exception StandardException Standard cloudscape exception policy.
+		@exception StandardException Standard Derby exception policy.
 
 		@param pageNumber   the page number of the RecordHandle.
 		@param recordId     the record id of the RecordHandle.
@@ -582,13 +582,13 @@
 		or compact it.
 
 		@param record	The record handle, the record must have been locked execlusively already.
-		@exception StandardException Standard cloudscape exception policy.
+		@exception StandardException Standard Derby exception policy.
 	*/
 	public void compactRecord(RecordHandle record) throws StandardException;
 
 	/**
 		Return true if this containerHandle refers to a temporary container.
-		@exception StandardException Standard cloudscape exception policy.
+		@exception StandardException Standard Derby exception policy.
 	 */
 	public boolean isTemporaryContainer() throws StandardException;
 
@@ -599,7 +599,7 @@
 
 	/**
 	   Backup the container to the specified path.
-	   @exception StandardException	Standard Cloudscape error policy
+	   @exception StandardException	Standard Derby error policy
 	*/
 	public void backupContainer(String backupContainerPath) throws StandardException;
 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_ContainerLock.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_ContainerLock.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_ContainerLock.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_ContainerLock.java Thu Mar  8 14:15:34 2007
@@ -45,7 +45,7 @@
      *
 	 * @return A string of the form: ContainerKey(segment_id, container_id)
      *
-     * @exception StandardException	Standard Cloudscape error policy
+     * @exception StandardException	Standard Derby error policy
      **/
     public String diag()
         throws StandardException

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_RowLock.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_RowLock.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_RowLock.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_RowLock.java Thu Mar  8 14:15:34 2007
@@ -42,7 +42,7 @@
     /**
 		Return the string for the qualifier.
      *
-     * @exception StandardException	Standard Cloudscape error policy
+     * @exception StandardException	Standard Derby error policy
      **/
     public String diag()
         throws StandardException

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/LockingPolicy.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/LockingPolicy.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/LockingPolicy.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/LockingPolicy.java Thu Mar  8 14:15:34 2007
@@ -87,7 +87,7 @@
         False should only be returned if the waitForLock policy was set to
         "false," and the lock was unavailable.
 
-		@exception StandardException	Standard Cloudscape error policy
+		@exception StandardException	Standard Derby error policy
 
 		@see ContainerHandle
 
@@ -120,7 +120,7 @@
         @param forUpdate    Should container be locked for update, or read?
 
 
-		@exception StandardException	Standard Cloudscape error policy
+		@exception StandardException	Standard Derby error policy
 
 		@see Page
 
@@ -145,7 +145,7 @@
         False should only be returned if the waitForLock argument was set to
         "false," and the lock was unavailable.
 
-		@exception StandardException	Standard Cloudscape error policy
+		@exception StandardException	Standard Derby error policy
 
 		@see Page
 	*/
@@ -171,7 +171,7 @@
         False should only be returned if the waitForLock argument was set to
         "false," and the lock was unavailable.
 
-		@exception StandardException	Standard Cloudscape error policy
+		@exception StandardException	Standard Derby error policy
 
 		@see Page
 	*/
@@ -185,7 +185,7 @@
 	/**
 		Called after a record has been fetched.
 
-		@exception StandardException	Standard Cloudscape error policy
+		@exception StandardException	Standard Derby error policy
 
   		@see Page
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Loggable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Loggable.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Loggable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Loggable.java Thu Mar  8 14:15:34 2007
@@ -65,7 +65,7 @@
 		@param in			optional data
 
 		@exception IOException Can be thrown by any of the methods of in.
-		@exception StandardException Standard Cloudscape policy.
+		@exception StandardException Standard Derby policy.
 	*/
 	public void doMe(Transaction xact, LogInstant instant, LimitObjectInput in)
 		 throws StandardException, IOException;
@@ -81,7 +81,7 @@
 		which contains optional data that will be available in to doMe() 
         methods.
 
-		@exception StandardException Standard Cloudscape policy.
+		@exception StandardException Standard Derby policy.
 	
 	*/
 	public ByteArray getPreparedLog() throws StandardException;
@@ -109,7 +109,7 @@
 		@param xact		The transaction trying to redo this operation
 		@return true if operation needs redoing, false if not.
 
-		@exception StandardException Standard Cloudscape policy.
+		@exception StandardException Standard Derby policy.
 
 		@see Loggable#releaseResource
 	*/

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/LogicalUndoable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/LogicalUndoable.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/LogicalUndoable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/LogicalUndoable.java Thu Mar  8 14:15:34 2007
@@ -50,7 +50,7 @@
 		method should only be called by LogicalUndo to extract information from
 		the log record.
 
-		@exception StandardException Standard Cloudscape error policy
+		@exception StandardException Standard Derby error policy
 	*/
 	public ContainerHandle getContainer() throws StandardException;
 
@@ -71,7 +71,7 @@
 		the correct column number and type, the log operation will restore the
 		row with the optional data stored in the log record.
 
-		@exception StandardException Standard Cloudscape error policy
+		@exception StandardException Standard Derby error policy
 		@exception IOException Method may read from in
 
 		@see LogicalUndo

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Page.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Page.java?view=diff&rev=516194&r1=516193&r2=516194
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Page.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Page.java Thu Mar  8 14:15:34 2007
@@ -268,7 +268,7 @@
      *
      * @return A RecordHandle representing the new record.
      *
-     * @exception StandardException	Standard Cloudscape error policy
+     * @exception StandardException	Standard Derby error policy
      * @exception StandardException The container was not opened in update mode.
      * @exception StandardException Row cannot fit on the page or row is null.
      **/
@@ -318,7 +318,7 @@
      *
      * @return the number of rows processed.
      *
-     * @exception StandardException	Standard Cloudscape error policy
+     * @exception StandardException	Standard Derby error policy
      *
      * @see LockingPolicy
      **/
@@ -343,7 +343,7 @@
      *
      * @return the number of fields in the record
      *
-     * @exception StandardException	Standard Cloudscape error policy, a 
+     * @exception StandardException	Standard Derby error policy, a 
      *                              statement level exception is thrown if the 
      *                              record handle does not match a record on 
      *                              the page.
@@ -375,7 +375,7 @@
      *
      * @return the slot number
      *
-     * @exception StandardException	Standard Cloudscape error policy
+     * @exception StandardException	Standard Derby error policy
      **/
     int getSlotNumber(RecordHandle handle) 
         throws StandardException;
@@ -393,7 +393,7 @@
      *
      * @return the record handle.
      *
-     * @exception StandardException	Standard Cloudscape error policy
+     * @exception StandardException	Standard Derby error policy
      **/
 	RecordHandle getRecordHandleAtSlot(int slot) 
         throws StandardException;
@@ -485,7 +485,7 @@
      * @return A RecordHandle representing the new record, or null if the row 
      *         will not fit on a non-empty page.
      *
-     * @exception StandardException	Standard Cloudscape error policy
+     * @exception StandardException	Standard Derby error policy
      * @exception StandardException The container was not opened in update mode.
      * @exception StandardException The row cannot fit on the page
      *
@@ -619,7 +619,7 @@
      *
      * @return A handle to the record.
      *
-     * @exception StandardException	Standard Cloudscape error policy
+     * @exception StandardException	Standard Derby error policy
      *
      * @see LockingPolicy
      **/
@@ -656,7 +656,7 @@
 
 		@return the Handle to the record that is locked
 
-		@exception StandardException	Standard Cloudscape error policy, a 
+		@exception StandardException	Standard Derby error policy, a 
                                         statement level exception is thrown if
                                         the slot is not on the page.
 
@@ -683,7 +683,7 @@
      *
      * @param slot slot of record to be tested.
      *
-     * @exception StandardException	Standard Cloudscape error policy, a 
+     * @exception StandardException	Standard Derby error policy, a 
      *                              statement level exception is thrown if the 
      *                              slot is not on the page.
      **/
@@ -718,7 +718,7 @@
 
 		@return a Handle to the updated record.
 
-		@exception StandardException	Standard Cloudscape error policy, a
+		@exception StandardException	Standard Derby error policy, a
                                         statement level exception is thrown if
 		                                the slot is not on the page, or if the 
                                         record is deleted, or if the fieldId 
@@ -757,7 +757,7 @@
      *
      * @return the number of fields in the record
      *
-     * @exception StandardException	Standard Cloudscape error policy
+     * @exception StandardException	Standard Derby error policy
      **/
 	public int fetchNumFieldsAtSlot(int slot)
 		 throws StandardException;
@@ -787,7 +787,7 @@
      *                  the access code where the logical undo logic resides.
      *                  Null if logical undo is not necessary.
      * 
-     * @exception StandardException	Standard Cloudscape error policy
+     * @exception StandardException	Standard Derby error policy
      * @exception StandardException The container was not opened in update mode.
      * @exception StandardException A statement level exception is thrown when 
      *                              trying to delete an already deleted record,
@@ -860,7 +860,7 @@
 	 * @param needDataLogged    if set to true data is logged for purges else 
      *                          only headers.
 	 *
-     * @exception StandardException	Standard Cloudscape error policy
+     * @exception StandardException	Standard Derby error policy
      * @see LockingPolicy
      **/
 	public void purgeAtSlot(
@@ -920,7 +920,7 @@
      * @param num_rows copy and purge this many rows from this page
      * @param dest_slot copying into this slot of destPage
      *
-     * @exception StandardException Standard Cloudscape error policy
+     * @exception StandardException Standard Derby error policy
      **/
 	public void copyAndPurge(
     Page    destPage, 
@@ -947,7 +947,7 @@
 		@param validColumns a bit map of which columns in the row is valid.
 		ValidColumns will not be changed by RawStore.
 
-		@exception StandardException	Standard Cloudscape error policy
+		@exception StandardException	Standard Derby error policy
 		@exception StandardException The container was not opened in update mode.
 		@exception StandardException if the slot is not on the page.
 
@@ -991,7 +991,7 @@
 		<BR>
 		MT - latched
 
-		@exception StandardException	Standard Cloudscape error policy
+		@exception StandardException	Standard Derby error policy
 	*/
 
 	public int recordCount() throws StandardException;
@@ -1002,7 +1002,7 @@
 		 <BR>
 		MT - latched
 
-		@exception StandardException	Standard Cloudscape error policy
+		@exception StandardException	Standard Derby error policy
 	*/
 
 	public int nonDeletedRecordCount() throws StandardException;
@@ -1082,7 +1082,7 @@
 		Set the time stamp to what is on page at this instance.  No op if this
 		page does not support time stamp.
 
-		@exception StandardException Standard Cloudscape error policy.
+		@exception StandardException Standard Derby error policy.
 	*/
 	void setTimeStamp(PageTimeStamp ts) throws StandardException;
 
@@ -1102,7 +1102,7 @@
 		@param ts the time stamp gotten from an earlier call to this page's
 		getTimeStamp
 		@return true if timestamp is the same
-		@exception StandardException Standard Cloudscape error policy.
+		@exception StandardException Standard Derby error policy.
 
 		@see PageTimeStamp
 	*/



Mime
View raw message