You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by fu...@apache.org on 2007/03/08 23:25:48 UTC
svn commit: r516196 [1/3] - in
/db/derby/code/trunk/java/engine/org/apache/derby/impl: jdbc/
jdbc/authentication/ load/ services/bytecode/ services/cache/ services/jce/
services/locks/ services/monitor/ services/reflect/ sql/ sql/catalog/
sql/compile/ ...
Author: fuzzylogic
Date: Thu Mar 8 14:25:41 2007
New Revision: 516196
URL: http://svn.apache.org/viewvc?view=rev&rev=516196
Log:
DERBY-2400 (partial): Replace Cloudscape references with Derby where appropriate.
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/BinaryToRawStream.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection30.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSQLWarning.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSavepoint30.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/UTF8Reader.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationService.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Export.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/load/LoadError.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/d_BCValidate.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/Clock.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_ActiveLock.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSet.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/SinglePool.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStatement.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/C_NodeNames.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AutoincrementCounter.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CallStatementResultSet.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteVTIResultSet.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertVTIResultSet.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MiscResultSet.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetTransactionResultSet.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateVTIResultSet.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/CacheableConglomerate.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/D_HeapController.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocExtent.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocPage.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocationActions.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseContainer.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseContainerHandle.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BasePage.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ContainerBasicOperation.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ContainerOperation.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ContainerUndoOperation.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CopyRowsOperation.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/D_BaseContainerHandle.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/D_RecordId.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DeleteOperation.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DirectAllocActions.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/EncryptContainerOperation.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InitPageOperation.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InputStreamContainer.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InsertOperation.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InvalidatePageOperation.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LoggableAllocActions.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalPageOperation.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalUndoOperation.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageActions.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalPageOperation.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalUndoOperation.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PurgeOperation.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RAFContainer.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RAFContainer4.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RemoveFileOperation.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/SetReservedSpaceOperation.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainerHandle.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/SyncOnCommit.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/TempRAFContainer.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/TruncateOnCommit.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateFieldOperation.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateOperation.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FileLogger.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FlushedScan.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogAccessFile.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/ReadOnly.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/Scan.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/ContainerLocking2.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/ContainerLocking3.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/D_Xact.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactContext.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactFactory.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/BinaryToRawStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/BinaryToRawStream.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/BinaryToRawStream.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/BinaryToRawStream.java Thu Mar 8 14:25:41 2007
@@ -28,7 +28,7 @@
import java.io.EOFException;
/**
- Converts a stream containing the Cloudscape stored binary form
+ Converts a stream containing the Derby stored binary form
to one that just contains the application's data.
Simply read and save the length information.
*/
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java Thu Mar 8 14:25:41 2007
@@ -593,7 +593,7 @@
// look for first character
byte[] b;
try
- { // pattern is not necessarily a cloudscape Blob
+ { // pattern is not necessarily a Derby Blob
b = pattern.getBytes(1,1);
}
catch (SQLException e)
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection30.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection30.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection30.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection30.java Thu Mar 8 14:25:41 2007
@@ -122,7 +122,7 @@
/**
* Creates a savepoint with the given name(if it is a named savepoint else we will generate a name
- * becuase Cloudscape only supports named savepoints internally) in the current transaction and
+ * because Derby only supports named savepoints internally) in the current transaction and
* returns the new Savepoint object that represents it.
*
* @param name A String containing the name of the savepoint. Will be null if this is an unnamed savepoint
@@ -174,7 +174,7 @@
verifySavepointCommandIsAllowed();
verifySavepointArg(savepoint);
//Need to cast and get the name because JDBC3 spec doesn't support names for
- //unnamed savepoints but Cloudscape keeps names for named & unnamed savepoints.
+ //unnamed savepoints but Derby keeps names for named & unnamed savepoints.
getLanguageConnection().internalRollbackToSavepoint(((EmbedSavepoint30)savepoint).getInternalName(),true, savepoint);
} catch (StandardException e) {
throw handleException(e);
@@ -205,7 +205,7 @@
verifySavepointCommandIsAllowed();
verifySavepointArg(savepoint);
//Need to cast and get the name because JDBC3 spec doesn't support names for
- //unnamed savepoints but Cloudscape keeps name for named & unnamed savepoints.
+ //unnamed savepoints but Derby keeps name for named & unnamed savepoints.
getLanguageConnection().releaseSavePoint(((EmbedSavepoint30)savepoint).getInternalName(), savepoint);
} catch (StandardException e) {
throw handleException(e);
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java Thu Mar 8 14:25:41 2007
@@ -210,7 +210,7 @@
private boolean[] streamUsedFlags;
/**
- * This class provides the glue between the Cloudscape
+ * This class provides the glue between the Derby
* resultset and the JDBC resultset, mapping calls-to-calls.
*/
public EmbedResultSet(EmbedConnection conn, ResultSet resultsToWrap,
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSQLWarning.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSQLWarning.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSQLWarning.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSQLWarning.java Thu Mar 8 14:25:41 2007
@@ -34,7 +34,7 @@
messages can be localized.
REMIND: May want to investigate putting some of this in the protocol
- side, for the errors that any Cloudscape JDBC driver might return.
+ side, for the errors that any Derby JDBC driver might return.
The ASSERT mechanism is a wrapper of the basic services,
to ensure that failed asserts at this level will behave
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSavepoint30.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSavepoint30.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSavepoint30.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSavepoint30.java Thu Mar 8 14:25:41 2007
@@ -110,7 +110,7 @@
return savepointName.substring(2);
}
- //Cloudscape internally keeps name for both named and unnamed savepoints
+ // Derby internally keeps name for both named and unnamed savepoints
String getInternalName() {
return savepointName;
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java Thu Mar 8 14:25:41 2007
@@ -1506,7 +1506,7 @@
java.sql.ResultSet rs = param[0];
param[0] = null;
- // ignore non-cloudscape result sets or results sets from another connection
+ // ignore non-Derby result sets or results sets from another connection
if (!(rs instanceof EmbedResultSet))
continue;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/UTF8Reader.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/UTF8Reader.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/UTF8Reader.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/UTF8Reader.java Thu Mar 8 14:25:41 2007
@@ -151,7 +151,7 @@
}
/*
- ** Methods just for Cloudscape's JDBC driver
+ ** Methods just for Derby's JDBC driver
*/
public int readInto(StringBuffer sb, int len) throws IOException {
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java Thu Mar 8 14:25:41 2007
@@ -47,7 +47,7 @@
messages can be localized.
REMIND: May want to investigate putting some of this in the protocol
- side, for the errors that any Cloudscape JDBC driver might return.
+ side, for the errors that any Derby JDBC driver might return.
The ASSERT mechanism is a wrapper of the basic services,
to ensure that failed asserts at this level will behave
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java Thu Mar 8 14:25:41 2007
@@ -59,7 +59,7 @@
/**
* This is the authentication service base class.
* <p>
- * There can be 1 Authentication Service for the whole Cloudscape
+ * There can be 1 Authentication Service for the whole Derby
* system and/or 1 authentication per database.
* In a near future, we intend to allow multiple authentication services
* per system and/or per database.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java Thu Mar 8 14:25:41 2007
@@ -43,7 +43,7 @@
import java.util.Dictionary;
/**
- * This authentication service is the basic Cloudscape User authentication
+ * This authentication service is the basic Derby user authentication
* level support.
*
* It is activated upon setting derby.authentication.provider database
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationService.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationService.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationService.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationService.java Thu Mar 8 14:25:41 2007
@@ -35,7 +35,7 @@
* This is the JNDI Authentication Service base class.
* <p>
* It instantiates the JNDI authentication scheme defined by the user/
- * administrator. Cloudscape supports LDAP JNDI providers.
+ * administrator. Derby supports LDAP JNDI providers.
* <p>
* The user can configure its own JNDI provider by setting the
* system or database property derby.authentication.provider .
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java Thu Mar 8 14:25:41 2007
@@ -40,7 +40,7 @@
import java.sql.SQLException;
/**
- * This is the Cloudscape LDAP authentication scheme implementation.
+ * This is the Derby LDAP authentication scheme implementation.
*
* JNDI system/environment properties can be set at the database
* level as database properties. They will be picked-up and set in
@@ -58,7 +58,7 @@
* hard to tell/guess in advance a users' full DN's.
*
* NOTE: In a future release, we will cache/maintain the user DN within
- * the the cloudscape database or system to avoid the initial lookup.
+ * the the Derby database or system to avoid the initial lookup.
* Also note that LDAP search/retrieval operations are usually very fast.
*
* The default LDAP url is ldap:/// (ldap://localhost:389/)
@@ -85,7 +85,7 @@
private static final String[] attrDN = {"dn"}; ;
//
- // Cloudscape LDAP Configuration properties
+ // Derby LDAP Configuration properties
//
private static final String LDAP_SEARCH_BASE =
"derby.authentication.ldap.searchBase";
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Export.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Export.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Export.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Export.java Thu Mar 8 14:25:41 2007
@@ -99,7 +99,7 @@
/**
* SYSCS_EXPORT_TABLE system Procedure from ij or from a Java application
* invokes this method to perform export of a table data to a file.
- * @param con The Cloudscape database connection URL for the database containing the table
+ * @param con The Derby database connection URL for the database containing the table
* @param schemaName schema name of the table data is being exported from
* @param tableName Name of the Table from which data has to be exported.
* @param outputFileName Name of the file to which data has to be exported.
@@ -130,7 +130,7 @@
* export of a table data to a file. Large object data is exported
* to a different file and the reference to it is stored in the
* main output file.
- * @param con The Cloudscape database connection URL for the
+ * @param con The Derby database connection URL for the
* database containing the table
* @param schemaName schema name of the table data is being exported from
* @param tableName Name of the Table from which data has to be exported.
@@ -164,7 +164,7 @@
/**
* SYSCS_EXPORT_QUERY system Procedure from ij or from a Java application
* invokes this method to perform export of the data retrieved by select statement to a file.
- * @param con The Cloudscape database connection URL for the database containing the table
+ * @param con The Derby database connection URL for the database containing the table
* @param selectStatement select query that is used to export the data
* @param outputFileName Name of the file to which data has to be exported.
* @param columnDelimeter Delimiter that seperates columns in the output file
@@ -191,7 +191,7 @@
* export of the data retrieved by select statement to a file.
* Large object data is exported to a different file and the reference
* to it is stored in the main output file.
- * @param con The Cloudscape database connection URL for
+ * @param con The Derby database connection URL for
* the database containing the table
* @param selectStatement select query that is used to export the data
* @param outputFileName Name of the file to which data has to be exported.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java Thu Mar 8 14:25:41 2007
@@ -83,7 +83,7 @@
/**
* SYSCS_IMPORT_TABLE system Procedure from ij or from a Java application
* invokes this method to perform import to a table from a file.
- * @param connection The Cloudscape database connection URL for the database containing the table
+ * @param connection The Derby database connection URL for the database containing the table
* @param schemaName The name of the schema where table to import exists
* @param tableName Name of the Table the data has to be imported to.
* @param inputFileName Name of the file from which data has to be imported.
@@ -117,7 +117,7 @@
/**
* SYSCS_IMPORT_DATA system Procedure from ij or from a Java application
* invokes this method to perform import to a table from a file.
- * @param connection The Cloudscape database connection URL for the database containing the table
+ * @param connection The Derby database connection URL for the database containing the table
* @param schemaName The name of the schema where table to import exists
* @param tableName Name of the Table the data has to be imported to.
* @param insertColumnList Comma Seperated column name list to which data
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/load/LoadError.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/load/LoadError.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/load/LoadError.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/load/LoadError.java Thu Mar 8 14:25:41 2007
@@ -36,7 +36,7 @@
class LoadError {
/**
- Raised if, the Cloudscape database connection is null.
+ Raised if, the Derby database connection is null.
*/
static SQLException connectionNull() {
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java Thu Mar 8 14:25:41 2007
@@ -156,7 +156,7 @@
/**
Start this module. We need a read/write version of the class utilities
- @exception StandardException standard cloudscape policy
+ @exception StandardException standard Derby policy
*/
public void boot(boolean create, Properties properties) throws StandardException {
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/d_BCValidate.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/d_BCValidate.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/d_BCValidate.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/d_BCValidate.java Thu Mar 8 14:25:41 2007
@@ -64,7 +64,7 @@
if (declaringClass.startsWith("org.apache.derby.exe."))
return;
- // only validate against Cloudscape engine or Java classes. Not user defined classes
+ // only validate against Derby engine or Java classes. Not user defined classes
int p;
for (p = 0; p < csPackages.length; p++) {
if (declaringClass.startsWith(csPackages[p]))
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/Clock.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/Clock.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/Clock.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/Clock.java Thu Mar 8 14:25:41 2007
@@ -199,7 +199,7 @@
@param key the key to the object
@return a cacheable object that is kept in the cache.
- @exception StandardException Cloudscape Standard error policy
+ @exception StandardException Standard Derby error policy
*/
public Cacheable find(Object key) throws StandardException {
CachedItem item;
@@ -409,7 +409,7 @@
@param key the key to the object
@return a cacheable object that is kept in the cache.
- @exception StandardException Cloudscape Standard error policy
+ @exception StandardException Standard Derby error policy
*/
public Cacheable create(Object key, Object createParameter) throws StandardException {
@@ -554,7 +554,7 @@
remove state of the item, the actual removal of the cacheable is
synchronized on the cachedItem itself.
- @exception StandardException Standard Cloudscape error policy.
+ @exception StandardException Standard Derby error policy.
*/
public void remove(Cacheable entry) throws StandardException {
@@ -678,7 +678,7 @@
/**
MT - synchronization provided by caller
- @exception StandardException Standard Cloudscape error policy.
+ @exception StandardException Standard Derby error policy.
*/
public void shutdown() throws StandardException {
@@ -849,7 +849,7 @@
// However, if the cache contains a large number of invalid
// items then we should see if we can avoid growing.
- // This avoids simple use of Cloudscape looking like
+ // This avoids simple use of Derby looking like
// a memory leak, as the page cache fills the holders array
// with page objects including the 4k (or 32k) pages.
// size() is the number of valid entries in the hash table
@@ -1658,7 +1658,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
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java Thu Mar 8 14:25:41 2007
@@ -186,7 +186,7 @@
and encrypting the secretKey
@return hexadecimal string of the encrypted secretKey
- @exception StandardException Standard Cloudscape error policy
+ @exception StandardException Standard Derby error policy
*/
private String encryptKey(byte[] secretKey, byte[] bootPassword)
throws StandardException
@@ -247,7 +247,7 @@
retrieve the encryptedKey, generate the muck from the boot password and generate an appropriate IV using
the muck,and using the key and IV decrypt the encryptedKey
@return decrypted key
- @exception StandardException Standard Cloudscape error policy
+ @exception StandardException Standard Derby error policy
*/
private byte[] decryptKey(String encryptedKey, int encodedKeyCharLength, byte[] bootPassword)
throws StandardException
@@ -298,7 +298,7 @@
Generate a Key object using the input secretKey that can be used by
JCECipherProvider to encrypt or decrypt.
- @exception StandardException Standard Cloudscape Error Policy
+ @exception StandardException Standard Derby Error Policy
*/
private SecretKey generateKey(byte[] secretKey) throws StandardException
{
@@ -488,7 +488,7 @@
// jce environment is not 1.2.1. The ExemptionMechanism class
// exists in jce1.2.1 and not in jce1.2, so try and load the
// class and if you can't find it don't allow the encryption.
- // This is a requirement from the government to give cloudscape
+ // This is a requirement from the government to give Cloudscape
// export clearance for 3.6. Note that the check is not needed
// if no provider/algo is specified, in that case we default to
// a DES weak encryption algorithm which also is allowed for
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java Thu Mar 8 14:25:41 2007
@@ -194,7 +194,7 @@
/**
@see CipherProvider#encrypt
- @exception StandardException Standard Cloudscape Error Policy
+ @exception StandardException Standard Derby Error Policy
*/
public int encrypt(byte[] cleartext, int offset, int length,
byte[] ciphertext, int outputOffset)
@@ -274,7 +274,7 @@
/**
@see CipherProvider#decrypt
- @exception StandardException Standard Cloudscape Error Policy
+ @exception StandardException Standard Derby Error Policy
*/
public int decrypt(byte[] ciphertext, int offset, int length,
byte[] cleartext, int outputOffset)
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_ActiveLock.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_ActiveLock.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_ActiveLock.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_ActiveLock.java Thu Mar 8 14:25:41 2007
@@ -29,7 +29,7 @@
public class D_ActiveLock extends D_Lock {
/**
- @exception StandardException Standard cloudscape policy
+ @exception StandardException Standard Derby policy
*/
public String diag()
throws StandardException
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSet.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSet.java Thu Mar 8 14:25:41 2007
@@ -125,7 +125,7 @@
*
* @return Object that represents the lock.
*
- * @exception StandardException Standard Cloudscape policy.
+ * @exception StandardException Standard Derby policy.
*/
public Lock lockObject(CompatibilitySpace compatibilitySpace, Lockable ref,
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/SinglePool.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/SinglePool.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/SinglePool.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/SinglePool.java Thu Mar 8 14:25:41 2007
@@ -79,7 +79,7 @@
<BR>
MT - thread safe
- @exception StandardException Standard Cloudscape error policy
+ @exception StandardException Standard Derby error policy
@see LockFactory#lockObject
*/
@@ -148,7 +148,7 @@
<BR>
MT - thread safe
- @exception StandardException Standard Cloudscape error policy
+ @exception StandardException Standard Derby error policy
@see LockFactory#lockObject
*/
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java Thu Mar 8 14:25:41 2007
@@ -473,7 +473,7 @@
/**
Set the locale for the service *outside* of boot time.
- @exception StandardException Standard Cloudscape error.
+ @exception StandardException Standard Derby error.
*/
public Locale setLocale(Object serviceModule, String userDefinedLocale)
throws StandardException {
@@ -501,7 +501,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 Standard Cloudscape error.
+ @exception StandardException Standard Derby error.
*/
public Locale setLocale(Properties serviceProperties, String userDefinedLocale)
throws StandardException {
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java Thu Mar 8 14:25:41 2007
@@ -88,11 +88,11 @@
// when trying to find our own classes for aggregates.
// 1) If using the URLClassLoader a ClassNotFoundException may be
// thrown (Beetle 5002).
- // 2) If cloudscape is loaded with JNI, getContextClassLoader()
+ // 2) If Derby is loaded with JNI, getContextClassLoader()
// may return null. (Beetle 5171)
//
// If this happens we need to user the class loader of this object
- // (the classLoader that loaded Cloudscape).
+ // (the classLoader that loaded Derby).
// So we call Class.forName to ensure that we find the class.
try {
ClassLoader cl;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java Thu Mar 8 14:25:41 2007
@@ -391,7 +391,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/impl/sql/GenericPreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java Thu Mar 8 14:25:41 2007
@@ -694,7 +694,7 @@
@param action The action causing the invalidation
- @exception StandardException Standard Cloudscape error policy.
+ @exception StandardException Standard Derby error policy.
*/
public void makeInvalid(int action, LanguageConnectionContext lcc)
throws StandardException
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStatement.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStatement.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStatement.java Thu Mar 8 14:25:41 2007
@@ -143,7 +143,7 @@
* b) add the prepared statement to the cache.
*
* In cases where the statement cache has been disabled (by setting the
- * relevant cloudscape property) then the value of cacheMe is irrelevant.
+ * relevant Derby property) then the value of cacheMe is irrelevant.
*/
boolean foundInCache = false;
if (preparedStmt == null)
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java Thu Mar 8 14:25:41 2007
@@ -256,7 +256,7 @@
* @param fromMajorVersionNumber version of the on-disk database
@param lastSoftUpgradeVersion last engine to perform a soft upgrade that made changes.
*
- * @exception StandardException Standard Cloudscape error policy.
+ * @exception StandardException Standard Derby error policy.
*/
private void applySafeChanges(TransactionController tc, int fromMajorVersionNumber, int lastSoftUpgradeVersion)
throws StandardException
@@ -321,7 +321,7 @@
* @param fromMajorVersionNumber version of the on-disk database
* @param aid AuthorizationID of current user to be made Database Owner
*
- * @exception StandardException Standard Cloudscape error policy.
+ * @exception StandardException Standard Derby error policy.
*/
private void doFullUpgrade(TransactionController tc, int fromMajorVersionNumber, String aid)
throws StandardException
@@ -406,7 +406,7 @@
*
* @param tc the xact
*
- * @exception StandardException Standard Cloudscape error policy.
+ * @exception StandardException Standard Derby error policy.
*/
private void handleMinorRevisionChange(TransactionController tc, DD_Version fromVersion, boolean softUpgradeRun)
throws StandardException
@@ -463,7 +463,7 @@
* remove stored prepared statements in all system schemas
* (including SYSIBM)
*
- * @exception StandardException Standard Cloudscape error policy.
+ * @exception StandardException Standard Derby error policy.
*/
protected void dropJDBCMetadataSPSes(TransactionController tc, boolean removeSYSIBMonly)
throws StandardException
@@ -495,7 +495,7 @@
/**
* Make a catalog.
* @param tc TransactionController
- * @exception StandardException Standard Cloudscape error policy.
+ * @exception StandardException Standard Derby error policy.
*/
protected void makeSystemCatalog(TransactionController tc,
TabInfoImpl ti)
@@ -511,7 +511,7 @@
its indexes.
@param tc TransactionController
@param td Table descriptor for the catalog to drop.
- @exception StandardException Standard Cloudscape error policy.
+ @exception StandardException Standard Derby error policy.
*/
protected void
dropSystemCatalogDescription(TransactionController tc, TableDescriptor td)
@@ -532,7 +532,7 @@
* Drop a System catalog.
* @param tc TransactionController
* @param crf CatalogRowFactory for the catalog to drop.
- * @exception StandardException Standard Cloudscape error policy.
+ * @exception StandardException Standard Derby error policy.
*/
protected void dropSystemCatalog(TransactionController tc,
CatalogRowFactory crf)
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java Thu Mar 8 14:25:41 2007
@@ -6269,7 +6269,7 @@
}
</PRE>
- @exception StandardException Standard Cloudscape error policy
+ @exception StandardException Standard Derby error policy
*/
protected void createDictionaryTables(Properties params, TransactionController tc,
DataDescriptorGenerator ddg)
@@ -6421,7 +6421,7 @@
// Add the following system Schema's to be compatible with DB2,
- // currently Cloudscape does not use them, but by creating them as
+ // currently Derby does not use them, but by creating them as
// system schema's it will insure applications can't create them,
// drop them, or create objects in them. This set includes:
// SYSCAT
@@ -6534,7 +6534,7 @@
* @param sd Schema to create catalogs in.
* @param tc Transaction context.
*
- * @exception StandardException Standard Cloudscape error policy
+ * @exception StandardException Standard Derby error policy
*/
public void makeCatalog( TabInfoImpl ti,
SchemaDescriptor sd,
@@ -6568,7 +6568,7 @@
* @param nullability true if nullable
* @param tc Transaction controller
*
- * @exception StandardException Standard Cloudscape error policy
+ * @exception StandardException Standard Derby error policy
*/
public void upgrade_setNullability(CatalogRowFactory rowFactory,
int columnNumber,
@@ -6606,7 +6606,7 @@
* @param newColumnIDs Array of 1-based column ids.
* @param tc Transaction controller
*
- * @exception StandardException Standard Cloudscape error policy
+ * @exception StandardException Standard Derby error policy
*/
public void upgrade_addColumns( CatalogRowFactory rowFactory,
int[] newColumnIDs,
@@ -6675,7 +6675,7 @@
* @param newColumnIDs Array of 1-based column ids.
* @param tc Transaction controller
*
- * @exception StandardException Standard Cloudscape error policy
+ * @exception StandardException Standard Derby error policy
*/
public void upgrade_addInvisibleColumns
(
@@ -6701,7 +6701,7 @@
* @param conglomID heap id
* @param tc Transaction controller
*
- * @exception StandardException Standard Cloudscape error policy
+ * @exception StandardException Standard Derby error policy
*/
private void widenConglomerate
(
@@ -6937,7 +6937,7 @@
/**
* Infrastructure work for indexes on catalogs.
*
- @exception StandardException Standard Cloudscape error policy
+ @exception StandardException Standard Derby error policy
*/
private void bootStrapSystemIndexes(
@@ -7201,7 +7201,7 @@
/**
* Populate SYSDUMMY1 table with a single row.
*
- * @exception StandardException Standard Cloudscape error policy
+ * @exception StandardException Standard Derby error policy
*/
protected void populateSYSDUMMY1(
TransactionController tc)
@@ -7216,7 +7216,7 @@
/**
* Clear all of the DataDictionary caches.
*
- * @exception StandardException Standard Cloudscape error policy
+ * @exception StandardException Standard Derby error policy
*/
public void clearCaches() throws StandardException
{
@@ -7313,7 +7313,7 @@
*
* @return a ColumnDes*criptor
*
- * @exception StandardException Standard Cloudscape error policy
+ * @exception StandardException Standard Derby error policy
*/
private ColumnDescriptor makeColumnDescriptor( SystemColumn column,
int columnPosition,
@@ -7339,7 +7339,7 @@
*
* @return Conglomerate id.
- @exception StandardException Standard Cloudscape error policy.
+ @exception StandardException Standard Derby error policy.
*/
private long createConglomerate(String name, TransactionController tc,
ExecRow rowTemplate,
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java Thu Mar 8 14:25:41 2007
@@ -28,8 +28,7 @@
/**
* An AggregateDefinition defines an aggregate.
*
- * It is used
- * by Cloudscape during query compilation to determine what
+ * It is used by Derby during query compilation to determine what
* Aggregator is used to aggregate a particular data type
* and what datatype the Aggregator will emit. A single
* AggregateDefinition may map to one or more Aggregators
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/C_NodeNames.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/C_NodeNames.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/C_NodeNames.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/C_NodeNames.java Thu Mar 8 14:25:41 2007
@@ -30,7 +30,7 @@
* Class.forName calls.
*
* WARNING: WHEN ADDING NODE TYPES HERE, YOU MUST ALSO ADD
- * THEM TO $WS/tools/release/config/dbms/cloudscapenodes.properties
+ * THEM TO tools/jar/DBMSnodes.properties
*
*/
@@ -40,7 +40,7 @@
// The names are in alphabetic order.
//
// WARNING: WHEN ADDING NODE TYPES HERE, YOU MUST ALSO ADD
- // THEM TO $WS/tools/release/config/dbms/cloudscapenodes.properties
+ // THEM TO tools/jar/DBMSnodes.properties
static final String AGGREGATE_NODE_NAME = "org.apache.derby.impl.sql.compile.AggregateNode";
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java Thu Mar 8 14:25:41 2007
@@ -55,7 +55,7 @@
* I have constructed following table based on various tables and information under "Rules for result data types"
* This table has FOR BIT DATA TYPES broken out into separate columns for clarity
*
- * Note that are few differences between Cloudscape and DB2
+ * Note that are few differences between Derby and DB2
* 1)there are few differences between what datatypes are consdiered compatible
* In DB2, CHAR FOR BIT DATA datatypes are compatible with CHAR datatypes
* ie in addition to following table, CHAR is compatible with CHAR FOR BIT DATA, VARCHAR FOR BIT DATA and LONG VARCHAR FOR BIT DATA
@@ -64,13 +64,13 @@
* ie in addition to following table, CHAR FOR BIT DATA is compatible with DATE, TIME, TIMESTAMP
* ie in addition to following table, VARCHAR FOR BIT DATA is compatible with DATE, TIME, TIMESTAMP
*
- * 2)few datatypes donot have matching precision in Cloudscape and DB2
- * In DB2, precision of TIME is 8. In Cloudscape, precision of TIME is 0.
- * In DB2, precision,scale of TIMESTAMP is 26,6. In Cloudscape, precision of TIMESTAMP is 0,0.
- * In DB2, precision of DOUBLE is 15. In Cloudscape, precision of DOUBLE is 52.
- * In DB2, precision of REAL is 23. In Cloudscape, precision of REAL is 7.
+ * 2)few datatypes donot have matching precision in Derby and DB2
+ * In DB2, precision of TIME is 8. In Derby, precision of TIME is 0.
+ * In DB2, precision,scale of TIMESTAMP is 26,6. In Derby, precision of TIMESTAMP is 0,0.
+ * In DB2, precision of DOUBLE is 15. In Derby, precision of DOUBLE is 52.
+ * In DB2, precision of REAL is 23. In Derby, precision of REAL is 7.
* In DB2, precision calculation equation is incorrect when we have int and decimal arguments.
- * The equation should be p=x+max(w-x,10) since precision of integer is 10 in both db2 and cloudscape. Instead, DB2 has p=x+max(w-x,11)
+ * The equation should be p=x+max(w-x,10) since precision of integer is 10 in both DB2 and Derby. Instead, DB2 has p=x+max(w-x,11)
*
* Types. S I B D R D C V L C V L C D T T B
* M N I E E O H A O H A O L A I I L
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java Thu Mar 8 14:25:41 2007
@@ -783,7 +783,7 @@
case StoredFormatIds.TIME_TYPE_ID:
case StoredFormatIds.TIMESTAMP_TYPE_ID:
// For these types, validity checks will be performed
- // by Cloudscape at insertion time--see beetle 5585 regarding
+ // by Derby at insertion time--see beetle 5585 regarding
// the need to do such checks here instead of later. For now,
// just assume we're okay.
return true;
@@ -791,9 +791,9 @@
default:
// All other default type checks either
// (TINYINT, NATIONAL_CHAR, etc), or 2) require a DB2 cast-
- // function (ex. blob(...), which Cloudscape doesn't
+ // function (ex. blob(...), which Derby doesn't
// support yet--see Beetle 5281), and so they are not
- // valid for Cloudscape running in DB2 compatibility mode.
+ // valid for Derby running in DB2 compatibility mode.
return false;
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java Thu Mar 8 14:25:41 2007
@@ -129,7 +129,7 @@
/**
* CurrentDatetimeOperatorNode is used in expressions.
* The expression generated for it invokes a static method
- * on a special Cloudscape type to get the system time and
+ * on a special Derby type to get the system time and
* wrap it in the right java.sql type, and then wrap it
* into the right shape for an arbitrary value, i.e. a column
* holder. This is very similar to what constants do.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java Thu Mar 8 14:25:41 2007
@@ -64,12 +64,12 @@
constant or parameter LIKE pattern with prefix followed by optional wild card
- e.g. Cloudscape%
+ e.g. Derby%
CHAR(n), VARCHAR(n) where n < 255
- >= prefix padded with '\u0000' to length n -- e.g. Cloudscape\u0000\u0000
- <= prefix appended with '\uffff' -- e.g. Cloudscape\uffff
+ >= prefix padded with '\u0000' to length n -- e.g. Derby\u0000\u0000
+ <= prefix appended with '\uffff' -- e.g. Derby\uffff
[ can eliminate LIKE if constant. ]
@@ -102,7 +102,7 @@
Note that the Unicode value is '\uffff' is defined as not a character value
and can be used by a program for any purpose. We use it to set an upper
bound on a character range with a less than predicate. We only need a single
- '\uffff' appended because the string 'Cloudscape\uffff\uffff' is not a valid
+ '\uffff' appended because the string 'Derby\uffff\uffff' is not a valid
String because '\uffff' is not a valid character.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj Thu Mar 8 14:25:41 2007
@@ -10684,10 +10684,10 @@
ValueNode constantNode;
}
{
-// RESOLVE: There is an incompatibility between Cloudscape and DB2 here. The DB2 SQL parser does not recognize
-// JDBC date/time escapes. They are handled in a JDBC pre-processor. However embedded Cloudscape does not have
-// a separate pre-processor. JDBC date/time escapes are handled by the Cloudscape SQL parser. This will only
-// be visible if Cloudscape is accessed through a non-JDBC pathway. (ODBC?) In that case Cloudscape will allow
+// RESOLVE: There is an incompatibility between Derby and DB2 here. The DB2 SQL parser does not recognize
+// JDBC date/time escapes. They are handled in a JDBC pre-processor. However embedded Derby does not have
+// a separate pre-processor. JDBC date/time escapes are handled by the Derby SQL parser. This will only
+// be visible if Derby is accessed through a non-JDBC pathway. (ODBC?) In that case Derby will allow
// the JDBC date/time escape while DB2 will not.
(
( <LEFT_BRACE> constantNode = escapedDateTimeLiteral() <RIGHT_BRACE> )
@@ -10860,7 +10860,7 @@
}
/*
- * DB2 requires column check constraints to refer to only that column. Cloudscape currently
+ * DB2 requires column check constraints to refer to only that column. Derby
* doesn't care if check constraints are column level or table level. For DB2 compatibility
* check that column check constraints only refer to that column.
*/
@@ -11334,7 +11334,7 @@
<NULLIF> <LEFT_PAREN> leftExpression = additiveExpression(null, 0, false) <COMMA> rightExpression = additiveExpression(null, 0, false) <RIGHT_PAREN>
{
// "NULLIF(L, R)" is the same as "L=R ? untyped NULL : L"
- // An impl assumption here is that Cloudscape can promote CHAR to any comparable datatypes such as numeric
+ // An impl assumption here is that Derby can promote CHAR to any comparable datatypes such as numeric
ContextManager cm = getContextManager();
ValueNodeList thenElseList = (ValueNodeList) nodeFactory.getNode(C_NodeTypes.VALUE_NODE_LIST, cm);
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java Thu Mar 8 14:25:41 2007
@@ -1280,7 +1280,7 @@
* marked as invalide and they will get recompiled internally on their next
* execution. This is okay because truncate makes the number of rows to zero
* it may be good idea to recompile them becuase plans are likely to be
- * incorrect. Recompile is done internally by cloudscape, user does not have
+ * incorrect. Recompile is done internally by Derby, user does not have
* any effect.
*/
private void truncateTable(Activation activation)
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AutoincrementCounter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AutoincrementCounter.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AutoincrementCounter.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AutoincrementCounter.java Thu Mar 8 14:25:41 2007
@@ -193,7 +193,7 @@
* @param dd DataDictionary to use.
* @param tableUUID I might have the table name but I need more
* information
- * @exception StandardException standard cloudscape exception.
+ * @exception StandardException standard Derby exception.
*/
public void flushToDisk(TransactionController tc, DataDictionary dd,
UUID tableUUID)
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CallStatementResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CallStatementResultSet.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CallStatementResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CallStatementResultSet.java Thu Mar 8 14:25:41 2007
@@ -60,7 +60,7 @@
}
/**
- @exception StandardException Standard Cloudscape error policy
+ @exception StandardException Standard Derby error policy
*/
public void open() throws StandardException
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java Thu Mar 8 14:25:41 2007
@@ -82,7 +82,7 @@
}
/**
- @exception StandardException Standard Cloudscape error policy
+ @exception StandardException Standard Derby error policy
*/
public void open() throws StandardException
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java Thu Mar 8 14:25:41 2007
@@ -110,7 +110,7 @@
/**
- @exception StandardException Standard Cloudscape error policy
+ @exception StandardException Standard Derby error policy
*/
public void open() throws StandardException
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java Thu Mar 8 14:25:41 2007
@@ -152,7 +152,7 @@
}
/**
- @exception StandardException Standard Cloudscape error policy
+ @exception StandardException Standard Derby error policy
*/
public void open() throws StandardException
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteVTIResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteVTIResultSet.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteVTIResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteVTIResultSet.java Thu Mar 8 14:25:41 2007
@@ -71,7 +71,7 @@
}
/**
- @exception StandardException Standard Cloudscape error policy
+ @exception StandardException Standard Derby error policy
*/
protected void openCore() throws StandardException
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java Thu Mar 8 14:25:41 2007
@@ -668,7 +668,7 @@
*
* @param row the row to initialize
*
- * @exception standard cloudscape exception
+ * @exception standard Derby exception
*/
private void initializeVectorAggregation(ExecRow row)
throws StandardException
@@ -700,7 +700,7 @@
* @param newRow the row to merge
* @param currRow the row to merge into
*
- * @exception standard cloudscape exception
+ * @exception standard Derby exception
*/
private void mergeVectorAggregates(ExecRow newRow, ExecRow currRow)
throws StandardException
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java Thu Mar 8 14:25:41 2007
@@ -384,7 +384,7 @@
}
/**
- @exception StandardException Standard Cloudscape error policy
+ @exception StandardException Standard Derby error policy
*/
public void open() throws StandardException
{
@@ -694,7 +694,7 @@
* multiple row insert, or insert with sub-select, the return value is non-
* deterministic, and is the previous return value of the IDENTITY_VAL_LOCAL
* function, before the insert statement. Also, DB2 can have at most 1 identity
- * column per table. The return value won't be affected either if Cloudscape
+ * column per table. The return value won't be affected either if Derby
* table has more than one identity columns.
*/
setIdentity = (! autoincrementGenerated) && isSourceRowResultSet();
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertVTIResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertVTIResultSet.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertVTIResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertVTIResultSet.java Thu Mar 8 14:25:41 2007
@@ -72,7 +72,7 @@
}
/**
- @exception StandardException Standard Cloudscape error policy
+ @exception StandardException Standard Derby error policy
*/
protected void openCore() throws StandardException
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MiscResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MiscResultSet.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MiscResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MiscResultSet.java Thu Mar 8 14:25:41 2007
@@ -42,7 +42,7 @@
*
* @param activation Describes run-time environment.
*
- * @exception StandardException Standard Cloudscape error policy.
+ * @exception StandardException Standard Derby error policy.
*/
MiscResultSet(Activation activation)
throws StandardException
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java Thu Mar 8 14:25:41 2007
@@ -312,7 +312,7 @@
switch (isolationLevel)
{
// Even though we preserve the isolation level at READ UNCOMMITTED,
- // Cloudscape Store will overwrite it to READ COMMITTED for update.
+ // Store will overwrite it to READ COMMITTED for update.
case ExecutionContext.READ_UNCOMMITTED_ISOLATION_LEVEL:
isolationLevel =
TransactionController.ISOLATION_READ_UNCOMMITTED;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java Thu Mar 8 14:25:41 2007
@@ -479,7 +479,7 @@
**
** @return Nothing.
**
- ** @exception standard cloudscape exception
+ ** @exception standard Derby exception
*/
private void initializeScalarAggregation(ExecRow row)
throws StandardException
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetTransactionResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetTransactionResultSet.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetTransactionResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetTransactionResultSet.java Thu Mar 8 14:25:41 2007
@@ -41,7 +41,7 @@
*
* @param activation Describes run-time environment.
*
- * @exception StandardException Standard Cloudscape error policy.
+ * @exception StandardException Standard Derby error policy.
*/
SetTransactionResultSet(Activation activation)
throws StandardException
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java Thu Mar 8 14:25:41 2007
@@ -989,7 +989,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/impl/sql/execute/UpdateResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java Thu Mar 8 14:25:41 2007
@@ -250,7 +250,7 @@
}
/**
- @exception StandardException Standard Cloudscape error policy
+ @exception StandardException Standard Derby error policy
*/
public void open() throws StandardException
{
@@ -285,7 +285,7 @@
/**
- @exception StandardException Standard Cloudscape error policy
+ @exception StandardException Standard Derby error policy
*/
void setup() throws StandardException
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateVTIResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateVTIResultSet.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateVTIResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateVTIResultSet.java Thu Mar 8 14:25:41 2007
@@ -64,7 +64,7 @@
/**
- @exception StandardException Standard Cloudscape error policy
+ @exception StandardException Standard Derby error policy
*/
protected void openCore() throws StandardException
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/CacheableConglomerate.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/CacheableConglomerate.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/CacheableConglomerate.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/CacheableConglomerate.java Thu Mar 8 14:25:41 2007
@@ -85,7 +85,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 org.apache.derby.iapi.services.cache.CacheManager#find
@@ -199,7 +199,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/impl/store/access/RAMAccessManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java Thu Mar 8 14:25:41 2007
@@ -611,7 +611,7 @@
/**
Database creation finished. Tell RawStore.
- @exception StandardException cloudscape standard error policy
+ @exception StandardException standard Derby error policy
*/
public void createFinished() throws StandardException
{
@@ -985,7 +985,7 @@
rawstore = (RawStoreFactory) Monitor.bootServiceModule(
create, this, RawStoreFactory.MODULE, serviceProperties);
- // Note: we also boot this module here since we may start cloudscape
+ // Note: we also boot this module here since we may start Derby
// system from store access layer, as some of the unit test case,
// not from JDBC layer.(See
// /protocol/Database/Storage/Access/Interface/T_AccessFactory.java)
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java Thu Mar 8 14:25:41 2007
@@ -864,7 +864,7 @@
Create a conglomerate and populate it with rows from rowSource.
@see TransactionController#createAndLoadConglomerate
- @exception StandardException Standard Cloudscape Error Policy
+ @exception StandardException Standard Derby Error Policy
*/
public long createAndLoadConglomerate(
String implementation,
@@ -893,7 +893,7 @@
recreate a conglomerate and populate it with rows from rowSource.
@see TransactionController#createAndLoadConglomerate
- @exception StandardException Standard Cloudscape Error Policy
+ @exception StandardException Standard Derby Error Policy
*/
public long recreateAndLoadConglomerate(
String implementation,
@@ -1232,7 +1232,7 @@
@return true The number of rows loaded.
- @exception StandardException Standard Cloudscape Error Policy
+ @exception StandardException Standard Derby Error Policy
*/
public long loadConglomerate(
long conglomId,
@@ -1255,7 +1255,7 @@
@param conglomId the conglomerate Id
@param rowSource where the rows to be loaded comes from
- @exception StandardException Standard Cloudscape Error Policy
+ @exception StandardException Standard Derby Error Policy
*/
public void loadConglomerate(
long conglomId,
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java Thu Mar 8 14:25:41 2007
@@ -386,7 +386,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
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java Thu Mar 8 14:25:41 2007
@@ -625,7 +625,7 @@
Bulk Load a B-tree secondary index.
@see Conglomerate#load
- @exception StandardException Standard Cloudscape Error policy.
+ @exception StandardException Standard Derby Error policy.
raise SQLState.STORE_CONGLOMERATE_DUPLICATE_KEY_EXCEPTION if a duplicate
key is detected in the load.
**/
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java Thu Mar 8 14:25:41 2007
@@ -104,7 +104,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
*
*/
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/D_HeapController.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/D_HeapController.java?view=diff&rev=516196&r1=516195&r2=516196
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/D_HeapController.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/D_HeapController.java Thu Mar 8 14:25:41 2007
@@ -213,7 +213,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