-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Hello all,
Here's a large but largely uninteresting patch that cleans up a bunch of leftover IBM and Cloudscape references in java/tools. The most interesting bit is this:
- -IJ_IjVers30C199=ij version {0} (C) Copyright IBM Corp. 1997, 2004.
+IJ_IjVers30C199=ij version {0} (C) Copyright 2004 Apache Software Foundation.
I'm not even sure that we need a copyright banner when ij starts up, but since we have one now, I decided to just replace it with a more appropriate copyright banner. I also would like to point out that the files in impl/tools/cslook have been moved to impl/tools/dblook.
If no one has any objections, I'll submit this in a couple of days.
andrew
Index: java/tools/org/apache/derby/tools/URLCheck.java =================================================================== - --- java/tools/org/apache/derby/tools/URLCheck.java (revision 55635) +++ java/tools/org/apache/derby/tools/URLCheck.java (working copy) @@ -98,7 +98,7 @@ else if( url.startsWith( "jdbc:derby:")) { protocol = "jdbc:derby:"; - - validProps = getValidCloudscapeProps(); + validProps = getValidDerbyProps(); } else validProps = null; @@ -143,10 +143,10 @@ return booleanAttributes; }
- - private static Vector validCloudscapeProps;
- - private Vector getValidCloudscapeProps()
+ private static Vector validDerbyProps;
+ private Vector getValidDerbyProps()
{
- - if( validCloudscapeProps == null)
+ if( validDerbyProps == null)
{
try
{
@@ -161,14 +161,14 @@
Field aField = (Field)fields[i];
props.addElement(aField.get(att));
}
- - validCloudscapeProps = props;
+ validDerbyProps = props;
}
catch (Exception ex)
{
ex.printStackTrace();
}
}
- - return validCloudscapeProps;
- - } // end of getValidCloudscapeProps
+ return validDerbyProps;
+ } // end of getValidDerbyProps} Index: java/tools/org/apache/derby/tools/ij.java =================================================================== - --- java/tools/org/apache/derby/tools/ij.java (revision 55635) +++ java/tools/org/apache/derby/tools/ij.java (working copy) @@ -18,8 +18,8 @@
/**
- - ij is Cloudscape's interactive JDBC scripting tool.
- - It is a simple utility for running scripts against a Cloudscape database.
+ ij is Derby's interactive JDBC scripting tool.
+ It is a simple utility for running scripts against a Derby database.
You can also use it interactively to run ad hoc queries.
ij provides several commands for ease in accessing a variety of JDBC features.
<P>
Index: java/tools/org/apache/derby/tools/dblook.java
===================================================================
- --- java/tools/org/apache/derby/tools/dblook.java (revision 55635)
+++ java/tools/org/apache/derby/tools/dblook.java (working copy)
@@ -28,16 +28,16 @@
import org.apache.derby.iapi.tools.i18n.LocalizedResource;
- -import org.apache.derby.impl.tools.cslook.DB_Check; - -import org.apache.derby.impl.tools.cslook.DB_Index; - -import org.apache.derby.impl.tools.cslook.DB_Jar; - -import org.apache.derby.impl.tools.cslook.DB_Key; - -import org.apache.derby.impl.tools.cslook.DB_Table; - -import org.apache.derby.impl.tools.cslook.DB_Schema; - -import org.apache.derby.impl.tools.cslook.DB_StoredProcedure; - -import org.apache.derby.impl.tools.cslook.DB_Trigger; - -import org.apache.derby.impl.tools.cslook.DB_View; - -import org.apache.derby.impl.tools.cslook.Logs; +import org.apache.derby.impl.tools.dblook.DB_Check; +import org.apache.derby.impl.tools.dblook.DB_Index; +import org.apache.derby.impl.tools.dblook.DB_Jar; +import org.apache.derby.impl.tools.dblook.DB_Key; +import org.apache.derby.impl.tools.dblook.DB_Table; +import org.apache.derby.impl.tools.dblook.DB_Schema; +import org.apache.derby.impl.tools.dblook.DB_StoredProcedure; +import org.apache.derby.impl.tools.dblook.DB_Trigger; +import org.apache.derby.impl.tools.dblook.DB_View; +import org.apache.derby.impl.tools.dblook.Logs;
public class dblook {@@ -101,7 +101,7 @@
/* ************************************************
* Constructor:
* Parse the command line, initialize logs, echo program variables,
- - * and load the Cloudscape driver.
+ * and load the Derby driver.
* @param args args[0] is the database URL. All other command-line
* parameters are read as system properties.
* ****/
Index: java/tools/org/apache/derby/tools/sysinfo.java
===================================================================
- --- java/tools/org/apache/derby/tools/sysinfo.java (revision 55635)
+++ java/tools/org/apache/derby/tools/sysinfo.java (working copy)
@@ -25,9 +25,9 @@
<p>
Also available on this class are methods which allow you to determine
the version of the code for the system without actually booting a database.
- - Please note that this is the Cloudscape version of the .jar files, not of your databases.
+ Please note that this is the Derby version of the .jar files, not of your databases.
<p>
- - The numbering scheme for released Cloudscape products is <b><code>m1.m2.m3 </code></b>
+ The numbering scheme for released Derby products is <b><code>m1.m2.m3 </code></b>
where <b><code>m1</code></b> is the major release version, <b><code>m2</code></b> is the minor release version,
and <b><code>m3</code></b> is the maintenance level. Versions of the product with the same
major and minor version numbers are considered feature compatible.
@@ -50,8 +50,8 @@
}
/**
- - The genus name for the IBM Cloudscape code. Use this to determine the version of the
- - IBM Cloudscape embedded code in cs.jar.
+ The genus name for the Apache Derby code. Use this to determine the version of the
+ Apache Derby embedded code in cs.jar.
*/
public static final String DBMS="DBMS";
@@ -63,7 +63,7 @@
/** - - gets the major version of the IBM Cloudscape embedded code. + gets the major version of the Apache Derby embedded code. @return the major version. Returns -1 if not found. */ static public int getMajorVersion() @@ -91,7 +91,7 @@
/** - - gets the minor version of the IBM Cloudscape embedded code. + gets the minor version of the Apache Derby embedded code. @return the minor version. Returns -1 if not found. */ static public int getMinorVersion() @@ -117,7 +117,7 @@ }
/**
- - gets the build number for the IBM Cloudscape embedded library
+ gets the build number for the Apache Derby embedded library
@return the build number, or -1 if the information is not found.
*/
static public String getBuildNumber()
@@ -144,7 +144,7 @@
/** - - gets the product name for the IBM Cloudscape embedded library + gets the product name for the Apache Derby embedded library @return the name */ static public String getProductName() @@ -177,7 +177,7 @@ }
/**
- - Return the version information string for the IBM Cloudscape embedded library including alpha or beta indicators.
+ Return the version information string for the Apache Derby embedded library including alpha or beta indicators.
*/
static public String getVersionString(String genus) {
Index: java/tools/org/apache/derby/impl/tools/sysinfo/Main.java
===================================================================
- --- java/tools/org/apache/derby/impl/tools/sysinfo/Main.java (revision 55635)
+++ java/tools/org/apache/derby/impl/tools/sysinfo/Main.java (working copy)
@@ -53,7 +53,7 @@
This class can be used to print out system information at the
command line by issuing the command:
<PRE>
- - java com.ibm.db2j.tools.SysInfo.main
+ java org.apache.derby.tools.sysinfo
</PRE>
Alternatively, you can use SysInfo within your program to display
Cloudscape information; a Cloudscape version string is returned by this Java code:
Index: java/tools/org/apache/derby/impl/tools/dblook/DB_View.java
===================================================================
- --- java/tools/org/apache/derby/impl/tools/dblook/DB_View.java (revision 55635)
+++ java/tools/org/apache/derby/impl/tools/dblook/DB_View.java (working copy)
@@ -1,14 +1,14 @@
/*
Licensed Materials - Property of IBM
- - Cloudscape - Package org.apache.derby.impl.tools.cslook
+ Cloudscape - Package org.apache.derby.impl.tools.dblook
(C) Copyright IBM Corp. 2004. All Rights Reserved.
US Government Users Restricted Rights - Use, duplication or
disclosure restricted by GSA ADP Schedule Contract with IBM Corp.*/
- -package org.apache.derby.impl.tools.cslook; +package org.apache.derby.impl.tools.dblook;
import java.sql.Connection; import java.sql.Statement; @@ -58,7 +58,7 @@
if (firstTime) {
Logs.reportString("----------------------------------------------");
- - Logs.reportMessage("CSLOOK_ViewsHeader");
+ Logs.reportMessage("DBLOOK_ViewsHeader");
Logs.reportString("---------------------------------------------- \n");
}
@@ -81,7 +81,7 @@
// Set schema back to default ("APP").
if (!firstTime) {
- - Logs.reportMessage("CSLOOK_DefaultSchema");
+ Logs.reportMessage("DBLOOK_DefaultSchema");
Logs.writeToNewDDL("SET SCHEMA \"APP\"");
Logs.writeStmtEndToNewDDL();
Logs.writeNewlineToNewDDL();
Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Jar.java
===================================================================
- --- java/tools/org/apache/derby/impl/tools/dblook/DB_Jar.java (revision 55635)
+++ java/tools/org/apache/derby/impl/tools/dblook/DB_Jar.java (working copy)
@@ -1,14 +1,14 @@
/*
Licensed Materials - Property of IBM
- - Cloudscape - Package org.apache.derby.impl.tools.cslook
+ Cloudscape - Package org.apache.derby.impl.tools.dblook
(C) Copyright IBM Corp. 2004. All Rights Reserved.
US Government Users Restricted Rights - Use, duplication or
disclosure restricted by GSA ADP Schedule Contract with IBM Corp.*/
- -package org.apache.derby.impl.tools.cslook; +package org.apache.derby.impl.tools.dblook;
import java.sql.Connection; import java.sql.Statement; @@ -67,8 +67,8 @@
if (firstTime) {
Logs.reportString("----------------------------------------------");
- - Logs.reportMessage("CSLOOK_JarsHeader");
- - Logs.reportMessage("CSLOOK_Jar_Note");
+ Logs.reportMessage("DBLOOK_JarsHeader");
+ Logs.reportMessage("DBLOOK_Jar_Note");
Logs.reportString("---------------------------------------------- \n");
}
@@ -88,13 +88,13 @@
oldJarPath.append(schemaWithoutQuotes);
oldJarPath.append(jarFullName);- - // Copy jar file to CSJARS directory.
+ // Copy jar file to DBJARS directory.
String absJarDir = null;
try {- - // Create the CSJARS directory.
+ // Create the DBJARS directory.
File jarDir = new
File(System.getProperty("user.dir") +
- - separator + "CSJARS" + separator +
schemaWithoutQuotes);
+ separator + "DBJARS" + separator +
schemaWithoutQuotes);
absJarDir = jarDir.getAbsolutePath();
jarDir.mkdirs();@@ -118,14 +118,14 @@
oldJarFile.close(); } catch (Exception e) {
- - Logs.debug("CSLOOK_FailedToLoadJar",
+ Logs.debug("DBLOOK_FailedToLoadJar",
absJarDir + jarFullName.toString());
Logs.debug(e);
firstTime = false;
continue;
}- - // Now, add the DDL to read the jar from CSJARS.
+ // Now, add the DDL to read the jar from DBJARS.
StringBuffer loadJarString = new StringBuffer();
loadJarString.append("CALL SQLJ.INSTALL_JAR('file:");
loadJarString.append(absJarDir);
Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Check.java
===================================================================
- --- java/tools/org/apache/derby/impl/tools/dblook/DB_Check.java (revision 55635)
+++ java/tools/org/apache/derby/impl/tools/dblook/DB_Check.java (working copy)
@@ -1,14 +1,14 @@
/*
Licensed Materials - Property of IBM
- - Cloudscape - Package org.apache.derby.impl.tools.cslook
+ Cloudscape - Package org.apache.derby.impl.tools.dblook
(C) Copyright IBM Corp. 2004. All Rights Reserved.
US Government Users Restricted Rights - Use, duplication or
disclosure restricted by GSA ADP Schedule Contract with IBM Corp.*/
- -package org.apache.derby.impl.tools.cslook; +package org.apache.derby.impl.tools.dblook;
import java.sql.Connection; import java.sql.Statement; @@ -62,7 +62,7 @@
if (firstTime) {
Logs.reportString("----------------------------------------------");
- - Logs.reportMessage("CSLOOK_ChecksHeader");
+ Logs.reportMessage("DBLOOK_ChecksHeader");
Logs.reportString("---------------------------------------------- \n");
}
Index: java/tools/org/apache/derby/impl/tools/dblook/Logs.java
===================================================================
- --- java/tools/org/apache/derby/impl/tools/dblook/Logs.java (revision 55635)
+++ java/tools/org/apache/derby/impl/tools/dblook/Logs.java (working copy)
@@ -1,14 +1,14 @@
/*
Licensed Materials - Property of IBM
- - Cloudscape - Package org.apache.derby.impl.tools.cslook
+ Cloudscape - Package org.apache.derby.impl.tools.dblook
(C) Copyright IBM Corp. 2004. All Rights Reserved.
US Government Users Restricted Rights - Use, duplication or
disclosure restricted by GSA ADP Schedule Contract with IBM Corp.*/
- -package org.apache.derby.impl.tools.cslook; +package org.apache.derby.impl.tools.dblook;
import java.io.PrintWriter;
import java.io.FileOutputStream;
@@ -290,7 +290,7 @@
try {
if (atLeastOneDebug)
dblook.writeVerboseOutput(
- - "CSLOOK_AtLeastOneDebug", null);
+ "DBLOOK_AtLeastOneDebug", null);
logFile.close();
if (ddlFile != null)
ddlFile.close();
Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Schema.java
===================================================================
- --- java/tools/org/apache/derby/impl/tools/dblook/DB_Schema.java (revision 55635)
+++ java/tools/org/apache/derby/impl/tools/dblook/DB_Schema.java (working copy)
@@ -1,14 +1,14 @@
/*
Licensed Materials - Property of IBM
- - Cloudscape - Package org.apache.derby.impl.tools.cslook
+ Cloudscape - Package org.apache.derby.impl.tools.dblook
(C) Copyright IBM Corp. 2004. All Rights Reserved.
US Government Users Restricted Rights - Use, duplication or
disclosure restricted by GSA ADP Schedule Contract with IBM Corp.*/
- -package org.apache.derby.impl.tools.cslook; +package org.apache.derby.impl.tools.dblook;
import java.sql.Connection; import java.sql.Statement; @@ -63,7 +63,7 @@
if (firstTime) {
Logs.reportString("----------------------------------------------");
- - Logs.reportMessage("CSLOOK_SchemasHeader");
+ Logs.reportMessage("DBLOOK_SchemasHeader");
Logs.reportString("---------------------------------------------- \n");
}
Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Trigger.java
===================================================================
- --- java/tools/org/apache/derby/impl/tools/dblook/DB_Trigger.java (revision 55635)
+++ java/tools/org/apache/derby/impl/tools/dblook/DB_Trigger.java (working copy)
@@ -1,14 +1,14 @@
/*
Licensed Materials - Property of IBM
- - Cloudscape - Package org.apache.derby.impl.tools.cslook
+ Cloudscape - Package org.apache.derby.impl.tools.dblook
(C) Copyright IBM Corp. 2004. All Rights Reserved.
US Government Users Restricted Rights - Use, duplication or
disclosure restricted by GSA ADP Schedule Contract with IBM Corp.*/
- -package org.apache.derby.impl.tools.cslook; +package org.apache.derby.impl.tools.dblook;
import java.sql.Connection; import java.sql.Statement; @@ -73,7 +73,7 @@
if (firstTime) {
Logs.reportString("----------------------------------------------");
- - Logs.reportMessage("CSLOOK_TriggersHeader");
+ Logs.reportMessage("DBLOOK_TriggersHeader");
Logs.reportString("---------------------------------------------- \n");
}
Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Table.java
===================================================================
- --- java/tools/org/apache/derby/impl/tools/dblook/DB_Table.java (revision 55635)
+++ java/tools/org/apache/derby/impl/tools/dblook/DB_Table.java (working copy)
@@ -1,14 +1,14 @@
/*
Licensed Materials - Property of IBM
- - Cloudscape - Package org.apache.derby.impl.tools.cslook
+ Cloudscape - Package org.apache.derby.impl.tools.dblook
(C) Copyright IBM Corp. 2004. All Rights Reserved.
US Government Users Restricted Rights - Use, duplication or
disclosure restricted by GSA ADP Schedule Contract with IBM Corp.*/
- -package org.apache.derby.impl.tools.cslook; +package org.apache.derby.impl.tools.dblook;
import java.sql.Connection; import java.sql.Statement; @@ -85,7 +85,7 @@
if (firstTime) {
Logs.reportString("----------------------------------------------");
- - Logs.reportMessage("CSLOOK_TablesHeader");
+ Logs.reportMessage("DBLOOK_TablesHeader");
Logs.reportString("---------------------------------------------- \n");
}
Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Index.java
===================================================================
- --- java/tools/org/apache/derby/impl/tools/dblook/DB_Index.java (revision 55635)
+++ java/tools/org/apache/derby/impl/tools/dblook/DB_Index.java (working copy)
@@ -1,14 +1,14 @@
/*
Licensed Materials - Property of IBM
- - Cloudscape - Package org.apache.derby.impl.tools.cslook
+ Cloudscape - Package org.apache.derby.impl.tools.dblook
(C) Copyright IBM Corp. 2004. All Rights Reserved.
US Government Users Restricted Rights - Use, duplication or
disclosure restricted by GSA ADP Schedule Contract with IBM Corp.*/
- -package org.apache.derby.impl.tools.cslook; +package org.apache.derby.impl.tools.dblook;
import java.sql.Connection; import java.sql.Statement; @@ -72,7 +72,7 @@
if (firstTime) {
Logs.reportString("----------------------------------------------");
- - Logs.reportMessage("CSLOOK_IndexesHeader");
+ Logs.reportMessage("DBLOOK_IndexesHeader");
Logs.reportString("---------------------------------------------- \n");
}
Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Key.java
===================================================================
- --- java/tools/org/apache/derby/impl/tools/dblook/DB_Key.java (revision 55635)
+++ java/tools/org/apache/derby/impl/tools/dblook/DB_Key.java (working copy)
@@ -1,14 +1,14 @@
/*
Licensed Materials - Property of IBM
- - Cloudscape - Package org.apache.derby.impl.tools.cslook
+ Cloudscape - Package org.apache.derby.impl.tools.dblook
(C) Copyright IBM Corp. 2004. All Rights Reserved.
US Government Users Restricted Rights - Use, duplication or
disclosure restricted by GSA ADP Schedule Contract with IBM Corp.*/
- -package org.apache.derby.impl.tools.cslook; +package org.apache.derby.impl.tools.dblook;
import java.sql.Connection;
import java.sql.Statement;
@@ -110,9 +110,9 @@
if (firstTime) {
printHeader();
if (rs.getString(2).equals("F"))
- -
Logs.reportMessage("CSLOOK_ForeignHeader");
+
Logs.reportMessage("DBLOOK_ForeignHeader");
else
- -
Logs.reportMessage("CSLOOK_PrimUniqueHeader");
+
Logs.reportMessage("DBLOOK_PrimUniqueHeader");
} StringBuffer kString = createKeyString(tableId,
tableName, rs);
@@ -260,7 +260,7 @@
return;Logs.reportString("----------------------------------------------");
- - Logs.reportMessage("CSLOOK_KeysHeader");
+ Logs.reportMessage("DBLOOK_KeysHeader");
Logs.reportString("---------------------------------------------- \n");
printedHeader = true;
Index: java/tools/org/apache/derby/impl/tools/dblook/DB_StoredProcedure.java
===================================================================
- --- java/tools/org/apache/derby/impl/tools/dblook/DB_StoredProcedure.java (revision 55635)
+++ java/tools/org/apache/derby/impl/tools/dblook/DB_StoredProcedure.java (working copy)
@@ -1,14 +1,14 @@
/*
Licensed Materials - Property of IBM
- - Cloudscape - Package org.apache.derby.impl.tools.cslook
+ Cloudscape - Package org.apache.derby.impl.tools.dblook
(C) Copyright IBM Corp. 2004. All Rights Reserved.
US Government Users Restricted Rights - Use, duplication or
disclosure restricted by GSA ADP Schedule Contract with IBM Corp.*/
- -package org.apache.derby.impl.tools.cslook; +package org.apache.derby.impl.tools.dblook;
import java.sql.Connection; import java.sql.Statement; @@ -75,7 +75,7 @@
if (firstTime) {
Logs.reportString("----------------------------------------------");
- - Logs.reportMessage("CSLOOK_StoredProcHeader");
+ Logs.reportMessage("DBLOOK_StoredProcHeader");
Logs.reportString("---------------------------------------------- \n");
}
Index: java/tools/org/apache/derby/loc/toolsmessages.properties
===================================================================
- --- java/tools/org/apache/derby/loc/toolsmessages.properties (revision 55635)
+++ java/tools/org/apache/derby/loc/toolsmessages.properties (working copy)
@@ -1,5 +1,4 @@
- -# Directory com/ibm/db2j/tools
- -# Directory com/ibm/db2j/util
+# Directory org/apache/derby/tools
# From JDBCDisplayUtil.java
UT_Error0=\ (errorCode = {0})
UT_NoSqlst=(no SQLState)
@@ -19,10 +18,7 @@
UT_NoCurreRow=No current row
UT_NoCurreRow_19=No current row
UT_Resul0_20=ResultSet #{0}
- -# Directory com/ibm/db2j/internalUtil
- -# From AppStreamReader.java
- -UT_InvaEscaChar=Invalid escape character.
- -# Directory com/ibm/db2j/tools/ijImpl
+# Directory org/apache/derby/impl/tools/ij
# From Main.java
IJ_IjErroResoNo=IJ ERROR: resource not found: {0}
IJ_IjErroFileNo=IJ ERROR: file not found: {0}
@@ -144,7 +140,7 @@
IJ_UsageJavaComCloudToolsIjPPropeInput=Usage: java org.apache.derby.tools.ij [-p propertyfile] [-ca connectionAttributePropertyFile] [inputfile]
IJ_IjWarniAutocMayCloseUsingResulSet=IJ WARNING: Autocommit may close using result set
# From utilMain.java
- -IJ_IjVers30C199=ij version {0} (C) Copyright IBM Corp. 1997, 2004.
+IJ_IjVers30C199=ij version {0} (C) Copyright 2004 Apache Software Foundation.
IJ_ElapTime0Mil=ELAPSED TIME = {0} milliseconds
IJ_IjErro0=IJ ERROR: {0}
IJ_JavaErro0=JAVA ERROR: {0}
@@ -162,21 +158,21 @@
IJ_IlleValu=ILLEGAL VALUE
IJ_01SeeClouLog={0} : {1} (see cloudcape.LOG)
IJ_Pool=PooledConnection
- -IJ_XAClass=EmbeddedXADataSource not in classpath, please put cs.jar file in your classpath
- -IJ_XANoI=EmbeddedXADataSource cannot be instantiated, please put cs.jar file in your classpath
+IJ_XAClass=EmbeddedXADataSource not in classpath, please put derby.jar file in your classpath
+IJ_XANoI=EmbeddedXADataSource cannot be instantiated, please put derby.jar file in your classpath
# From ParseException.java
IJ_EncoAtLineColu=Encountered "{0}" at line {1}, column {2}
# From TokenMgrError.java
IJ_LexiErroAtLine0Colu1=Lexical error at line {0}, column {1}. Encountered: {2}after :"{3}"
- -TL_incorCase=Case of the Cloudscape attribute is incorrect.
- -TL_unknownAtt=Attribute is unknown to Cloudscape.
+TL_incorCase=Case of the Derby attribute is incorrect.
+TL_unknownAtt=Attribute is unknown to Derby.
TL_trueFalse=Value should be set to true/false.
TL_dupAtt=Attribute is a duplicate.
TL_urlLabel1=URL Attribute {0}{1}{2}
- -# Directory com/ibm/db2j/tools
- -# From cslook.java
- -CSLOOK_MissingLocale=Resources not found for current locale; switching to {0}.
- -CSLOOK_Usage=\
+# Directory org/apache/derby/tools
+# From dblook.java
+DBLOOK_MissingLocale=Resources not found for current locale; switching to {0}.
+DBLOOK_Usage=\
\ \n\
\ USAGE:\n\ java org.apache.derby.tools.dblook -d <sourceDBUrl> [OPTIONS]\n\n\
\ \twhere the source URL is the full URL, including the connection protocol\n\
@@ -199,38 +195,38 @@
\ \t will be written.\n\
\ \t\tIf not specified, default is the console.\
\ \n
- -CSLOOK_FileCreation=This file was created using Derby's dblook utility.
- -CSLOOK_OutputLocation=Output will be sent to file {0}\n
- -CSLOOK_Timestamp=Timestamp: {0}
- -CSLOOK_DBName=Source database is: {0}
- -CSLOOK_DBUrl=Connection URL is: {0}
- -CSLOOK_TargetTables=The dblook utility will consider only specified tables.
- -CSLOOK_TargetSchema=Specified schema is: {0}
- -# Directory com/ibm/db2j/tools/cslookImpl/...
- -CSLOOK_TablesHeader=DDL Statements for tables
- -CSLOOK_ChecksHeader=DDL Statements for checks
- -CSLOOK_IndexesHeader=DDL Statements for indexes
- -CSLOOK_JarsHeader=DDL Statements for jars
- -CSLOOK_KeysHeader=DDL Statements for keys
- -CSLOOK_PrimUniqueHeader=primary/unique
- -CSLOOK_ForeignHeader=foreign
- -CSLOOK_SchemasHeader=DDL Statements for schemas
- -CSLOOK_StoredProcHeader=DDL Statements for stored procedures
- -CSLOOK_TriggersHeader=DDL Statements for triggers
- -CSLOOK_ViewsHeader=DDL Statements for views
- -CSLOOK_Jar_Note=\
+DBLOOK_FileCreation=This file was created using Derby's dblook utility.
+DBLOOK_OutputLocation=Output will be sent to file {0}\n
+DBLOOK_Timestamp=Timestamp: {0}
+DBLOOK_DBName=Source database is: {0}
+DBLOOK_DBUrl=Connection URL is: {0}
+DBLOOK_TargetTables=The dblook utility will consider only specified tables.
+DBLOOK_TargetSchema=Specified schema is: {0}
+# Directory org/apache/derby/tools/impl/dblook
+DBLOOK_TablesHeader=DDL Statements for tables
+DBLOOK_ChecksHeader=DDL Statements for checks
+DBLOOK_IndexesHeader=DDL Statements for indexes
+DBLOOK_JarsHeader=DDL Statements for jars
+DBLOOK_KeysHeader=DDL Statements for keys
+DBLOOK_PrimUniqueHeader=primary/unique
+DBLOOK_ForeignHeader=foreign
+DBLOOK_SchemasHeader=DDL Statements for schemas
+DBLOOK_StoredProcHeader=DDL Statements for stored procedures
+DBLOOK_TriggersHeader=DDL Statements for triggers
+DBLOOK_ViewsHeader=DDL Statements for views
+DBLOOK_Jar_Note=\
**** NOTE **** In order for jar files to be loaded correctly,\n\
- --- you must either 1) ensure that the CSJARS directory (created\n\
+-- you must either 1) ensure that the DBJARS directory (created\n\
-- automatically by dblook) exists where it was created (i.e. at\n\
-- the path shown in the statements below), or else 2) change the\n\
-- path in the statements below to reflect the current location of\n\
- --- CSJARS. If the CSJARS directory does not exist, or if it\n\
+-- DBJARS. If the DBJARS directory does not exist, or if it\n\
-- has been moved and the path is not correct, the following DDL\n\
-- statements will throw errors, and the jar files will NOT be\n\
-- loaded.
- -CSLOOK_FailedToLoadJar=Failed to load jar file {0}
- -CSLOOK_DefaultSchema=Reverting back to default schema 'APP'
- -CSLOOK_AtLeastOneDebug=\
+DBLOOK_FailedToLoadJar=Failed to load jar file {0}
+DBLOOK_DefaultSchema=Reverting back to default schema 'APP'
+DBLOOK_AtLeastOneDebug=\
-- Note: At least one unexpected error/warning message was\n\
-- encountered during DDL generation. See dblook.log\n\
-- to review the message(s).\n\
Index: java/tools/org/apache/derby/loc/sysinfoMessages.properties
===================================================================
- --- java/tools/org/apache/derby/loc/sysinfoMessages.properties (revision 55635)
+++ java/tools/org/apache/derby/loc/sysinfoMessages.properties (working copy)
@@ -5,7 +5,7 @@
######################################################################## #######
# Sysinfo, SysInfoWriter, and PropertyNames messages are SIF01.*
- -SIF01.B=Please contact Cloudscape Technical Support.
+SIF01.B=Please contact Technical Support.
SIF01.C=Press <return> to continue
SIF01.D=No Derby System info found!
SIF01.H=<info unavailable>
@@ -50,7 +50,7 @@
SIF08.H=user-specified class ({0})
SIF08.I=Derby Network Server library ({0})
SIF08.J=Derby embedded engine library ({0})
- -SIF08.L=Cloudscape Client libraries ({0})
+SIF08.L=Derby Client libraries ({0})
SIF08.Q=Derby tools library ({0})
SIF08.U=({0} not found.)
SIF08.A=USAGE: {0} anyClass{1}
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)iD8DBQFBfthyDfB0XauCH7wRAkWpAJ4oYHHyU3jcBMAkGnp02lGJd/RbogCghtOD Vs8+SKp82QPYf+bOmo4kJEI= =dDO1 -----END PGP SIGNATURE-----
