[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]
rpms/openoffice.org/devel openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch, 1.3, 1.4
- From: fedora-cvs-commits redhat com
- To: fedora-cvs-commits redhat com
- Subject: rpms/openoffice.org/devel openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch, 1.3, 1.4
- Date: Wed, 20 Jul 2005 07:51:31 -0400
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7489
Modified Files:
openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch
Log Message:
regenerate patch
openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch:
hsqldb_1_8_0 |21456 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 21436 insertions(+), 20 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch
Index: openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch 20 Jul 2005 11:25:46 -0000 1.3
+++ openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch 20 Jul 2005 11:51:27 -0000 1.4
@@ -1,14 +1,45 @@
Index: hsqldb_1_8_0
===================================================================
RCS file: /cvs/external/hsqldb/hsqldb_1_8_0,v
-retrieving revision 1.6
-diff -u -p -r1.6 hsqldb_1_8_0
---- openoffice.org.orig/hsqldb/hsqldb_1_8_0 14 Jul 2005 11:42:23 -0000 1.6
-+++ openoffice.org/hsqldb/hsqldb_1_8_0 17 Jul 2005 11:33:01 -0000
-@@ -1,12 +1,21415 @@
-+diff -cr misc/hsqldb/src/org/hsqldb/BaseMemoryNode.java misc/build/hsqldb/src/org/hsqldb/BaseMemoryNode.java
-+*** misc/hsqldb/src/org/hsqldb/BaseMemoryNode.java 2005-07-17 12:29:06.000000000 +0100
-+--- misc/build/hsqldb/src/org/hsqldb/BaseMemoryNode.java 2005-07-17 12:31:34.000000000 +0100
+retrieving revision 1.7
+diff -u -p -u -r1.7 hsqldb_1_8_0
+--- openoffice.org.orig/hsqldb/hsqldb_1_8_0 18 Jul 2005 14:38:55 -0000 1.7
++++ openoffice.org/hsqldb/hsqldb_1_8_0 20 Jul 2005 11:48:15 -0000
+@@ -1,26 +1,21440 @@
+-*** misc/build/hsqldb/build/build.xml 2005-06-26 19:20:30.000000000 +0200
+---- misc/build/hsqldb/build/build.xml.patched 2005-07-16 17:00:34.000000000 +0200
++diff -r -c misc/hsqldb/build/build.xml misc/build/hsqldb/build/build.xml
++*** misc/hsqldb/build/build.xml 2005-07-20 12:45:02.000000000 +0100
++--- misc/build/hsqldb/build/build.xml 2005-07-20 12:46:13.000000000 +0100
+ ***************
+ *** 16,28 ****
+- <property file='build/build.properties'/>
+- <property name="hsqldb.version" value="1.8.0"/>
++ <property file='build/build.properties'/>
++ <property name="hsqldb.version" value="1.8.0"/>
++
++! <tstamp>
++! <format property="_tmpstamp" pattern="yyyy/MM/dd-hh:mm:ss"
++! locale="en"/>
++! </tstamp>
++!
++! <property name="build.label" value="private-${_tmpstamp}"/>
++! <property name="build.vendor" value="${user.name}"/>
++ <property name="hsqldb.title" value="HSQLDB"/>
++ <property name="hsqldb.vendor" value="The HSQLDB Development Group"/>
++ <property name="src" value="${basedir}/src"/>
++--- 16,23 ----
++ <property file='build/build.properties'/>
++ <property name="hsqldb.version" value="1.8.0"/>
++
++! <property name="build.label" value="replace-me"/>
++! <property name="build.vendor" value="OpenOffice.org"/>
++ <property name="hsqldb.title" value="HSQLDB"/>
++ <property name="hsqldb.vendor" value="The HSQLDB Development Group"/>
++ <property name="src" value="${basedir}/src"/>
++diff -r -c misc/hsqldb/src/org/hsqldb/BaseMemoryNode.java misc/build/hsqldb/src/org/hsqldb/BaseMemoryNode.java
++*** misc/hsqldb/src/org/hsqldb/BaseMemoryNode.java 2005-07-20 12:45:02.000000000 +0100
++--- misc/build/hsqldb/src/org/hsqldb/BaseMemoryNode.java 2005-07-20 12:46:44.000000000 +0100
+***************
+*** 83,91 ****
+ */
@@ -30,9 +61,9 @@
+
+ void delete() {
+ iBalance = -2;
-+diff -cr misc/hsqldb/src/org/hsqldb/CachedRow.java misc/build/hsqldb/src/org/hsqldb/CachedRow.java
-+*** misc/hsqldb/src/org/hsqldb/CachedRow.java 2005-07-17 12:29:06.000000000 +0100
-+--- misc/build/hsqldb/src/org/hsqldb/CachedRow.java 2005-07-17 12:31:33.000000000 +0100
++diff -r -c misc/hsqldb/src/org/hsqldb/CachedRow.java misc/build/hsqldb/src/org/hsqldb/CachedRow.java
++*** misc/hsqldb/src/org/hsqldb/CachedRow.java 2005-07-20 12:45:02.000000000 +0100
++--- misc/build/hsqldb/src/org/hsqldb/CachedRow.java 2005-07-20 12:46:42.000000000 +0100
+***************
+*** 99,111 ****
+ static final int NO_POS = -1;
@@ -113,9 +144,9 @@
+
+ out.writeSize(storageSize);
+
-+diff -cr misc/hsqldb/src/org/hsqldb/Column.java misc/build/hsqldb/src/org/hsqldb/Column.java
-+*** misc/hsqldb/src/org/hsqldb/Column.java 2005-07-17 12:29:06.000000000 +0100
-+--- misc/build/hsqldb/src/org/hsqldb/Column.java 2005-07-17 12:31:35.000000000 +0100
++diff -r -c misc/hsqldb/src/org/hsqldb/Column.java misc/build/hsqldb/src/org/hsqldb/Column.java
++*** misc/hsqldb/src/org/hsqldb/Column.java 2005-07-20 12:45:02.000000000 +0100
++--- misc/build/hsqldb/src/org/hsqldb/Column.java 2005-07-20 12:46:45.000000000 +0100
+***************
+*** 125,137 ****
+ // most variables are final but not declared so because of a bug in
@@ -179,9 +210,9 @@
+ int type) throws HsqlException {
+
+ switch (type) {
-+diff -cr misc/hsqldb/src/org/hsqldb/CompiledStatementExecutor.java misc/build/hsqldb/src/org/hsqldb/CompiledStatementExecutor.java
-+*** misc/hsqldb/src/org/hsqldb/CompiledStatementExecutor.java 2005-07-17 12:29:06.000000000 +0100
-+--- misc/build/hsqldb/src/org/hsqldb/CompiledStatementExecutor.java 2005-07-17 12:31:31.000000000 +0100
++diff -r -c misc/hsqldb/src/org/hsqldb/CompiledStatementExecutor.java misc/build/hsqldb/src/org/hsqldb/CompiledStatementExecutor.java
++*** misc/hsqldb/src/org/hsqldb/CompiledStatementExecutor.java 2005-07-20 12:45:02.000000000 +0100
++--- misc/build/hsqldb/src/org/hsqldb/CompiledStatementExecutor.java 2005-07-20 12:46:40.000000000 +0100
+***************
+*** 54,62 ****
+ */
@@ -339,9 +370,9 @@
+ throws HsqlException {
+ return session.sqlExecuteDirectNoPreChecks(cs.sql);
+ }
-+diff -cr misc/hsqldb/src/org/hsqldb/CompiledStatement.java misc/build/hsqldb/src/org/hsqldb/CompiledStatement.java
-+*** misc/hsqldb/src/org/hsqldb/CompiledStatement.java 2005-07-17 12:29:06.000000000 +0100
-+--- misc/build/hsqldb/src/org/hsqldb/CompiledStatement.java 2005-07-17 12:31:36.000000000 +0100
++diff -r -c misc/hsqldb/src/org/hsqldb/CompiledStatement.java misc/build/hsqldb/src/org/hsqldb/CompiledStatement.java
++*** misc/hsqldb/src/org/hsqldb/CompiledStatement.java 2005-07-20 12:45:02.000000000 +0100
++--- misc/build/hsqldb/src/org/hsqldb/CompiledStatement.java 2005-07-20 12:46:46.000000000 +0100
+***************
+*** 345,351 ****
+ /**
@@ -492,9 +523,9 @@
+
+ return condition == null ? sb.append("CONDITION[]\n")
+ : sb.append("CONDITION[").append(
-+diff -cr misc/hsqldb/src/org/hsqldb/CompiledStatementManager.java misc/build/hsqldb/src/org/hsqldb/CompiledStatementManager.java
-+*** misc/hsqldb/src/org/hsqldb/CompiledStatementManager.java 2005-07-17 12:29:06.000000000 +0100
-+--- misc/build/hsqldb/src/org/hsqldb/CompiledStatementManager.java 2005-07-17 12:31:33.000000000 +0100
++diff -r -c misc/hsqldb/src/org/hsqldb/CompiledStatementManager.java misc/build/hsqldb/src/org/hsqldb/CompiledStatementManager.java
++*** misc/hsqldb/src/org/hsqldb/CompiledStatementManager.java 2005-07-20 12:45:02.000000000 +0100
++--- misc/build/hsqldb/src/org/hsqldb/CompiledStatementManager.java 2005-07-20 12:46:42.000000000 +0100
+***************
+*** 81,108 ****
+ * The Database for which this object is managing
@@ -571,9 +602,9 @@
+
+ next_cs_id++;
+
-+diff -cr misc/hsqldb/src/org/hsqldb/Constraint.java misc/build/hsqldb/src/org/hsqldb/Constraint.java
-+*** misc/hsqldb/src/org/hsqldb/Constraint.java 2005-07-17 12:29:06.000000000 +0100
-+--- misc/build/hsqldb/src/org/hsqldb/Constraint.java 2005-07-17 12:31:31.000000000 +0100
++diff -r -c misc/hsqldb/src/org/hsqldb/Constraint.java misc/build/hsqldb/src/org/hsqldb/Constraint.java
++*** misc/hsqldb/src/org/hsqldb/Constraint.java 2005-07-20 12:45:02.000000000 +0100
++--- misc/build/hsqldb/src/org/hsqldb/Constraint.java 2005-07-20 12:46:40.000000000 +0100
+***************
+*** 193,199 ****
+ core.updateAction = updateAction;
@@ -625,9 +656,9 @@
+ Object[] rowdata, int[] rowColArray,
+ Index mainIndex) throws HsqlException {
+
-+diff -cr misc/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java misc/build/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java
-+*** misc/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java 2005-07-17 12:29:06.000000000 +0100
-+--- misc/build/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java 2005-07-17 12:31:33.000000000 +0100
++diff -r -c misc/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java misc/build/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java
++*** misc/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java 2005-07-20 12:45:02.000000000 +0100
++--- misc/build/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java 2005-07-20 12:46:42.000000000 +0100
+***************
+*** 111,119 ****
+ // fredt users 20041209 - patch by tytar users to set default table type
@@ -1771,9 +1802,9 @@
+ throws HsqlException {
+
+ String token;
-+diff -cr misc/hsqldb/src/org/hsqldb/DatabaseInformationFull.java misc/build/hsqldb/src/org/hsqldb/DatabaseInformationFull.java
-+*** misc/hsqldb/src/org/hsqldb/DatabaseInformationFull.java 2005-07-17 12:29:06.000000000 +0100
-+--- misc/build/hsqldb/src/org/hsqldb/DatabaseInformationFull.java 2005-07-17 12:31:37.000000000 +0100
++diff -r -c misc/hsqldb/src/org/hsqldb/DatabaseInformationFull.java misc/build/hsqldb/src/org/hsqldb/DatabaseInformationFull.java
++*** misc/hsqldb/src/org/hsqldb/DatabaseInformationFull.java 2005-07-20 12:45:02.000000000 +0100
++--- misc/build/hsqldb/src/org/hsqldb/DatabaseInformationFull.java 2005-07-20 12:46:46.000000000 +0100
+***************
+*** 66,72 ****
+ extends org.hsqldb.DatabaseInformationMain {
@@ -1842,9 +1873,9 @@
+ String schem, String pName, Integer ip,
+ Integer op, Integer rs, String remark,
+ Integer pType, String origin,
-+diff -cr misc/hsqldb/src/org/hsqldb/DatabaseInformation.java misc/build/hsqldb/src/org/hsqldb/DatabaseInformation.java
-+*** misc/hsqldb/src/org/hsqldb/DatabaseInformation.java 2005-07-17 12:29:06.000000000 +0100
-+--- misc/build/hsqldb/src/org/hsqldb/DatabaseInformation.java 2005-07-17 12:31:39.000000000 +0100
++diff -r -c misc/hsqldb/src/org/hsqldb/DatabaseInformation.java misc/build/hsqldb/src/org/hsqldb/DatabaseInformation.java
++*** misc/hsqldb/src/org/hsqldb/DatabaseInformation.java 2005-07-20 12:45:02.000000000 +0100
++--- misc/build/hsqldb/src/org/hsqldb/DatabaseInformation.java 2005-07-20 12:46:49.000000000 +0100
+***************
+*** 56,124 ****
+ class DatabaseInformation {
@@ -2049,9 +2080,9 @@
+
+ /**
+ * Factory method retuns the fullest system table producer
-+diff -cr misc/hsqldb/src/org/hsqldb/DatabaseInformationMain.java misc/build/hsqldb/src/org/hsqldb/DatabaseInformationMain.java
-+*** misc/hsqldb/src/org/hsqldb/DatabaseInformationMain.java 2005-07-17 12:29:06.000000000 +0100
-+--- misc/build/hsqldb/src/org/hsqldb/DatabaseInformationMain.java 2005-07-17 12:31:32.000000000 +0100
++diff -r -c misc/hsqldb/src/org/hsqldb/DatabaseInformationMain.java misc/build/hsqldb/src/org/hsqldb/DatabaseInformationMain.java
++*** misc/hsqldb/src/org/hsqldb/DatabaseInformationMain.java 2005-07-20 12:45:02.000000000 +0100
++--- misc/build/hsqldb/src/org/hsqldb/DatabaseInformationMain.java 2005-07-20 12:46:41.000000000 +0100
+***************
+*** 118,157 ****
+ // HsqlName objects for the system tables
@@ -2288,9 +2319,9 @@
+ throws HsqlException {
+ return new Table(database, name, Table.SYSTEM_TABLE);
+ }
-+diff -cr misc/hsqldb/src/org/hsqldb/Database.java misc/build/hsqldb/src/org/hsqldb/Database.java
-+*** misc/hsqldb/src/org/hsqldb/Database.java 2005-07-17 12:29:06.000000000 +0100
-+--- misc/build/hsqldb/src/org/hsqldb/Database.java 2005-07-17 12:31:34.000000000 +0100
++diff -r -c misc/hsqldb/src/org/hsqldb/Database.java misc/build/hsqldb/src/org/hsqldb/Database.java
[...2230 lines suppressed...]
+- <property name="src" value="${basedir}/src"/>
+---- 16,23 ----
+- <property file='build/build.properties'/>
+- <property name="hsqldb.version" value="1.8.0"/>
+! private boolean SchemaToSelect() {
+
+ Vector result = null;
@@ -20651,9 +20695,9 @@
+
+ cleanup();
+ fMain.dispose();
-+diff -cr misc/hsqldb/src/org/hsqldb/util/TransferSQLText.java misc/build/hsqldb/src/org/hsqldb/util/TransferSQLText.java
-+*** misc/hsqldb/src/org/hsqldb/util/TransferSQLText.java 2005-07-17 12:29:06.000000000 +0100
-+--- misc/build/hsqldb/src/org/hsqldb/util/TransferSQLText.java 2005-07-17 12:31:36.000000000 +0100
++diff -r -c misc/hsqldb/src/org/hsqldb/util/TransferSQLText.java misc/build/hsqldb/src/org/hsqldb/util/TransferSQLText.java
++*** misc/hsqldb/src/org/hsqldb/util/TransferSQLText.java 2005-07-20 12:45:02.000000000 +0100
++--- misc/build/hsqldb/src/org/hsqldb/util/TransferSQLText.java 2005-07-20 12:46:46.000000000 +0100
+***************
+*** 52,60 ****
+ String sFileName = null;
@@ -20692,9 +20736,9 @@
+
+ String sLast = "";
+ int len = r.getColumnCount();
-+diff -cr misc/hsqldb/src/org/hsqldb/util/TransferTable.java misc/build/hsqldb/src/org/hsqldb/util/TransferTable.java
-+*** misc/hsqldb/src/org/hsqldb/util/TransferTable.java 2005-07-17 12:29:06.000000000 +0100
-+--- misc/build/hsqldb/src/org/hsqldb/util/TransferTable.java 2005-07-17 12:31:36.000000000 +0100
++diff -r -c misc/hsqldb/src/org/hsqldb/util/TransferTable.java misc/build/hsqldb/src/org/hsqldb/util/TransferTable.java
++*** misc/hsqldb/src/org/hsqldb/util/TransferTable.java 2005-07-20 12:45:02.000000000 +0100
++--- misc/build/hsqldb/src/org/hsqldb/util/TransferTable.java 2005-07-20 12:46:45.000000000 +0100
+***************
+*** 471,477 ****
+ }
@@ -20712,9 +20756,9 @@
+
+ if (hTypes != null) {
+ return;
-+diff -cr misc/hsqldb/src/org/hsqldb/util/Tree.java misc/build/hsqldb/src/org/hsqldb/util/Tree.java
-+*** misc/hsqldb/src/org/hsqldb/util/Tree.java 2005-07-17 12:29:06.000000000 +0100
-+--- misc/build/hsqldb/src/org/hsqldb/util/Tree.java 2005-07-17 12:31:36.000000000 +0100
++diff -r -c misc/hsqldb/src/org/hsqldb/util/Tree.java misc/build/hsqldb/src/org/hsqldb/util/Tree.java
++*** misc/hsqldb/src/org/hsqldb/util/Tree.java 2005-07-20 12:45:02.000000000 +0100
++--- misc/build/hsqldb/src/org/hsqldb/util/Tree.java 2005-07-20 12:46:45.000000000 +0100
+***************
+*** 88,117 ****
+ class Tree extends Panel {
@@ -20795,9 +20839,9 @@
+ return f.getHeight() + 2;
+ }
+ }
-+diff -cr misc/hsqldb/src/org/hsqldb/util/ZaurusChoice.java misc/build/hsqldb/src/org/hsqldb/util/ZaurusChoice.java
-+*** misc/hsqldb/src/org/hsqldb/util/ZaurusChoice.java 2005-07-17 12:29:06.000000000 +0100
-+--- misc/build/hsqldb/src/org/hsqldb/util/ZaurusChoice.java 2005-07-17 12:31:35.000000000 +0100
++diff -r -c misc/hsqldb/src/org/hsqldb/util/ZaurusChoice.java misc/build/hsqldb/src/org/hsqldb/util/ZaurusChoice.java
++*** misc/hsqldb/src/org/hsqldb/util/ZaurusChoice.java 2005-07-20 12:45:02.000000000 +0100
++--- misc/build/hsqldb/src/org/hsqldb/util/ZaurusChoice.java 2005-07-20 12:46:45.000000000 +0100
+***************
+*** 52,58 ****
+ // getContent() answers the value !!
@@ -20832,9 +20876,9 @@
+
+ for (int i = 0; i < values.size(); i++) {
+ if (s.equals(values.elementAt(i))) {
-+diff -cr misc/hsqldb/src/org/hsqldb/util/ZaurusConnectionDialog.java misc/build/hsqldb/src/org/hsqldb/util/ZaurusConnectionDialog.java
-+*** misc/hsqldb/src/org/hsqldb/util/ZaurusConnectionDialog.java 2005-07-17 12:29:06.000000000 +0100
-+--- misc/build/hsqldb/src/org/hsqldb/util/ZaurusConnectionDialog.java 2005-07-17 12:31:36.000000000 +0100
++diff -r -c misc/hsqldb/src/org/hsqldb/util/ZaurusConnectionDialog.java misc/build/hsqldb/src/org/hsqldb/util/ZaurusConnectionDialog.java
++*** misc/hsqldb/src/org/hsqldb/util/ZaurusConnectionDialog.java 2005-07-20 12:45:02.000000000 +0100
++--- misc/build/hsqldb/src/org/hsqldb/util/ZaurusConnectionDialog.java 2005-07-20 12:46:45.000000000 +0100
+***************
+*** 251,257 ****
+ *
@@ -20852,9 +20896,9 @@
+
+ try {
+ mConnection = createConnection(mDriver.getText(), mURL.getText(),
-+diff -cr misc/hsqldb/src/org/hsqldb/util/ZaurusDatabaseManager.java misc/build/hsqldb/src/org/hsqldb/util/ZaurusDatabaseManager.java
-+*** misc/hsqldb/src/org/hsqldb/util/ZaurusDatabaseManager.java 2005-07-17 12:29:06.000000000 +0100
-+--- misc/build/hsqldb/src/org/hsqldb/util/ZaurusDatabaseManager.java 2005-07-17 12:31:35.000000000 +0100
++diff -r -c misc/hsqldb/src/org/hsqldb/util/ZaurusDatabaseManager.java misc/build/hsqldb/src/org/hsqldb/util/ZaurusDatabaseManager.java
++*** misc/hsqldb/src/org/hsqldb/util/ZaurusDatabaseManager.java 2005-07-20 12:45:02.000000000 +0100
++--- misc/build/hsqldb/src/org/hsqldb/util/ZaurusDatabaseManager.java 2005-07-20 12:46:45.000000000 +0100
+***************
+*** 247,253 ****
+ m.connect(c);
@@ -20906,9 +20950,9 @@
+ super.refreshTree();
+ eEditor.refresh(cConn);
+ }
-+diff -cr misc/hsqldb/src/org/hsqldb/util/ZaurusEditor.java misc/build/hsqldb/src/org/hsqldb/util/ZaurusEditor.java
-+*** misc/hsqldb/src/org/hsqldb/util/ZaurusEditor.java 2005-07-17 12:29:06.000000000 +0100
-+--- misc/build/hsqldb/src/org/hsqldb/util/ZaurusEditor.java 2005-07-17 12:31:36.000000000 +0100
++diff -r -c misc/hsqldb/src/org/hsqldb/util/ZaurusEditor.java misc/build/hsqldb/src/org/hsqldb/util/ZaurusEditor.java
++*** misc/hsqldb/src/org/hsqldb/util/ZaurusEditor.java 2005-07-20 12:45:02.000000000 +0100
++--- misc/build/hsqldb/src/org/hsqldb/util/ZaurusEditor.java 2005-07-20 12:46:46.000000000 +0100
+***************
+*** 401,407 ****
+ }
@@ -21053,9 +21097,9 @@
+
+ lForm.show(pForm, "search");
+ lButton.show(pButton, "search");
-+diff -cr misc/hsqldb/src/org/hsqldb/util/ZaurusTableForm.java misc/build/hsqldb/src/org/hsqldb/util/ZaurusTableForm.java
-+*** misc/hsqldb/src/org/hsqldb/util/ZaurusTableForm.java 2005-07-17 12:29:06.000000000 +0100
-+--- misc/build/hsqldb/src/org/hsqldb/util/ZaurusTableForm.java 2005-07-17 12:31:36.000000000 +0100
++diff -r -c misc/hsqldb/src/org/hsqldb/util/ZaurusTableForm.java misc/build/hsqldb/src/org/hsqldb/util/ZaurusTableForm.java
++*** misc/hsqldb/src/org/hsqldb/util/ZaurusTableForm.java 2005-07-20 12:45:02.000000000 +0100
++--- misc/build/hsqldb/src/org/hsqldb/util/ZaurusTableForm.java 2005-07-20 12:46:45.000000000 +0100
+***************
+*** 542,551 ****
+ }
@@ -21266,9 +21310,9 @@
+
+ try {
+ pStmt.clearParameters();
-+diff -cr misc/hsqldb/src/org/hsqldb/View.java misc/build/hsqldb/src/org/hsqldb/View.java
-+*** misc/hsqldb/src/org/hsqldb/View.java 2005-07-17 12:29:06.000000000 +0100
-+--- misc/build/hsqldb/src/org/hsqldb/View.java 2005-07-17 12:31:39.000000000 +0100
++diff -r -c misc/hsqldb/src/org/hsqldb/View.java misc/build/hsqldb/src/org/hsqldb/View.java
++*** misc/hsqldb/src/org/hsqldb/View.java 2005-07-20 12:45:02.000000000 +0100
++--- misc/build/hsqldb/src/org/hsqldb/View.java 2005-07-20 12:46:49.000000000 +0100
+***************
+*** 51,58 ****
+ Table workingTable;
@@ -21288,9 +21332,9 @@
+
+ /** schema at the time of compilation */
+ HsqlName compileTimeSchema;
-+diff -cr misc/hsqldb/src/org/hsqldb/WebServerConnection.java misc/build/hsqldb/src/org/hsqldb/WebServerConnection.java
-+*** misc/hsqldb/src/org/hsqldb/WebServerConnection.java 2005-07-17 12:29:06.000000000 +0100
-+--- misc/build/hsqldb/src/org/hsqldb/WebServerConnection.java 2005-07-17 12:31:33.000000000 +0100
++diff -r -c misc/hsqldb/src/org/hsqldb/WebServerConnection.java misc/build/hsqldb/src/org/hsqldb/WebServerConnection.java
++*** misc/hsqldb/src/org/hsqldb/WebServerConnection.java 2005-07-20 12:45:02.000000000 +0100
++--- misc/build/hsqldb/src/org/hsqldb/WebServerConnection.java 2005-07-20 12:46:41.000000000 +0100
+***************
+*** 76,95 ****
+ class WebServerConnection implements Runnable {
@@ -21416,56 +21460,11 @@
+ * @param code the error condition code
+ */
+! public void processError(int code) {
-
-- <project name="hsqldb" default="help" basedir="../">
--+ <target name="init">
-- <!-- This loads properties in the same exact way as if you ran
-- "ant -Dprop1name=val1 -Dprop2name=val2...", etc. To use all
-- defaults, you should have no 'build.properties' file.
--***************
--*** 13,34 ****
-- rephrase the question to yourself as "Can I run 'ant -Dx=...?"
-- Do not address questions about property file(s) to the
-- hsqldb community. -->
--- <property file='build/build.properties'/>
--- <property name="hsqldb.version" value="1.8.0"/>
--
--! <tstamp>
--! <format property="_tmpstamp" pattern="yyyy/MM/dd-hh:mm:ss"
--! locale="en"/>
--! </tstamp>
--!
--! <property name="build.label" value="private-${_tmpstamp}"/>
--! <property name="build.vendor" value="${user.name}"/>
--! <property name="hsqldb.title" value="HSQLDB"/>
--! <property name="hsqldb.vendor" value="The HSQLDB Development Group"/>
--! <property name="src" value="${basedir}/src"/>
--! <property name="build.debug" value="off"/>
--
--! <target name="init">
-- </target>
--
-- <target name='explainjars'
----- 14,34 ----
-- rephrase the question to yourself as "Can I run 'ant -Dx=...?"
-- Do not address questions about property file(s) to the
-- hsqldb community. -->
--
--! <property file='build/build.properties'/>
--! <property name="hsqldb.version" value="1.8.0"/>
--
--! <tstamp>
--! <format property="_tmpstamp" pattern="yyyy/MM/dd-hh:mm:ss"
--! locale="en"/>
--! </tstamp>
--!
--! <property name="build.label" value="build-${_tmpstamp}"/>
--! <property name="build.vendor" value="OpenOffice.org"/>
--! <property name="hsqldb.title" value="HSQLDB"/>
--! <property name="hsqldb.vendor" value="The HSQLDB Development Group"/>
--! <property name="src" value="${basedir}/src"/>
--! <property name="build.debug" value="off"/>
-- </target>
++
+ String msg;
-- <target name='explainjars'
+-! <property name="build.label" value="replace-me"/>
+-! <property name="build.vendor" value="OpenOffice.org"/>
+- <property name="hsqldb.title" value="HSQLDB"/>
+- <property name="hsqldb.vendor" value="The HSQLDB Development Group"/>
+- <property name="src" value="${basedir}/src"/>
[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]