db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r446709 - in /db/derby/code/branches/10.2: ./ bin/ java/drda/org/apache/derby/impl/drda/ java/engine/org/apache/derby/iapi/store/access/ java/engine/org/apache/derby/impl/io/ java/testing/org/apache/derbyTesting/functionTests/master/ java/t...
Date Fri, 15 Sep 2006 20:02:28 GMT
Author: rhillegas
Date: Fri Sep 15 13:02:27 2006
New Revision: 446709

URL: http://svn.apache.org/viewvc?view=rev&rev=446709
Log:
DERBY-1725: Merge the following patches from the trunk to the 10.2 branch: No JIRA (443076,
442761), DERBY-1853 (446672), DERBY-1729 (446652), DERBY-1326 (446538), DERBY-1665 (446536),
DERBY-1741 (446527), DERBY-1846 (443169), DERBY-1846 (443167), DERBY-1618 (443038), DERBY-1833
(442958), DERBY-1032 (442674).

Added:
    db/derby/code/branches/10.2/RELEASE-NOTES.html
      - copied unchanged from r446673, db/derby/code/trunk/RELEASE-NOTES.html
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/grantRevokeDDL2.out
      - copied unchanged from r446673, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/grantRevokeDDL2.out
    db/derby/code/branches/10.2/tools/jdbc4/
      - copied from r446673, db/derby/code/trunk/tools/jdbc4/
    db/derby/code/branches/10.2/tools/jdbc4/client.list
      - copied unchanged from r446673, db/derby/code/trunk/tools/jdbc4/client.list
    db/derby/code/branches/10.2/tools/jdbc4/engine.list
      - copied unchanged from r446673, db/derby/code/trunk/tools/jdbc4/engine.list
    db/derby/code/branches/10.2/tools/jdbc4/update-with-jdbc4
      - copied unchanged from r446673, db/derby/code/trunk/tools/jdbc4/update-with-jdbc4
    db/derby/code/branches/10.2/tools/jdbc4/update-with-jdbc4.bat
      - copied unchanged from r446673, db/derby/code/trunk/tools/jdbc4/update-with-jdbc4.bat
Modified:
    db/derby/code/branches/10.2/bin/derby_common.sh
    db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
    db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
    db/derby/code/branches/10.2/java/engine/org/apache/derby/iapi/store/access/Qualifier.java
    db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/io/DirStorageFactory.java
    db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/io/DirStorageFactory4.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/GetPropertyInfoTest.out
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GetPropertyInfoTest.java
    db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_de_DE.properties
    db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_es.properties
    db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_fr.properties
    db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_it.properties
    db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_ja_JP.properties
    db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_ko_KR.properties
    db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties
    db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_zh_TW.properties
    db/derby/code/branches/10.2/tools/release/build.xml

Modified: db/derby/code/branches/10.2/bin/derby_common.sh
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/bin/derby_common.sh?view=diff&rev=446709&r1=446708&r2=446709
==============================================================================
--- db/derby/code/branches/10.2/bin/derby_common.sh (original)
+++ db/derby/code/branches/10.2/bin/derby_common.sh Fri Sep 15 13:02:27 2006
@@ -162,6 +162,8 @@
 fi
 
 # Readjust classpath for MKS
-if [ `expr index $SHELL sh.exe` -gt 0 ]; then
-  LOCALCLASSPATH=`echo $LOCALCLASSPATH | sed -E 's/([\d\w]*):([\d\w]*)/\1;\2/g'`
+# expr match 
+if [ \( "`expr $SHELL : '.*sh.exe$'`" -gt 0 \) -a \( "$cygwin" = "false" \) ]; then
+  LOCALCLASSPATH=`echo $LOCALCLASSPATH | sed -E 's/([\d\w]*):([\d\w]*)/\1;\2/g
+'`
 fi

Modified: db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java?view=diff&rev=446709&r1=446708&r2=446709
==============================================================================
--- db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java (original)
+++ db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java Fri
Sep 15 13:02:27 2006
@@ -7491,46 +7491,46 @@
 	 */
 	private void handleException(Exception e)
 	{
-		String dbname = null;
-		if (database != null)
-			dbname = database.dbName;
-		
-		// protocol error - write error message and close session
-		if (e instanceof DRDAProtocolException)
-		{
-			try
-			{
-				DRDAProtocolException de = (DRDAProtocolException) e;
-				println2Log(dbname,session.drdaID, 
-							e.getMessage());
+		try {
+			if (e instanceof DRDAProtocolException) {
+				// protocol error - write error message
+				sendProtocolException((DRDAProtocolException) e);
+			} else {
+				// something unexpected happened
+				sendUnexpectedException(e);
 				server.consoleExceptionPrintTrace(e);
-				reader.clearBuffer();
-				de.write(writer);
-				finalizeChain();
-				closeSession();
-				close();
-			}
-			catch (DRDAProtocolException ioe)
-			{
-				// There may be an IO exception in the write.
-				println2Log(dbname,session.drdaID, 
-							e.getMessage());
-				server.consoleExceptionPrintTrace(ioe);
-				closeSession();
-				close();
 			}
-		}
-		else
-		{
-			// something unexpected happened so let's kill this thread
-			sendUnexpectedException(e);
-
-			server.consoleExceptionPrintTrace(e);
+		} finally {
+			// always close the session and stop the thread after handling
+			// these exceptions
 			closeSession();
 			close();
 		}
 	}
 	
+	/**
+	 * Notice the client about a protocol error.
+	 *
+	 * @param de <code>DRDAProtocolException</code> to be sent
+	 */
+	private void sendProtocolException(DRDAProtocolException de) {
+		String dbname = null;
+		if (database != null) {
+			dbname = database.dbName;
+		}
+
+		try {
+			println2Log(dbname, session.drdaID, de.getMessage());
+			server.consoleExceptionPrintTrace(de);
+			reader.clearBuffer();
+			de.write(writer);
+			finalizeChain();
+		} catch (DRDAProtocolException ioe) {
+			// There may be an IO exception in the write.
+			println2Log(dbname, session.drdaID, de.getMessage());
+			server.consoleExceptionPrintTrace(ioe);
+		}
+	}
 
 	/**
 	 * Send unpexpected error to the client

Modified: db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?view=diff&rev=446709&r1=446708&r2=446709
==============================================================================
--- db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
(original)
+++ db/derby/code/branches/10.2/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
Fri Sep 15 13:02:27 2006
@@ -743,9 +743,14 @@
 					// exception), so we need to clean up first.
 
 						// Close and remove sessions on runQueue.
-						for (int i = 0; i < runQueue.size(); i++)
-							((Session)runQueue.get(i)).close();
-						runQueue.clear();
+						synchronized (runQueue) {
+							for (int i = 0; i < runQueue.size(); i++) {
+								Session s = (Session) runQueue.get(i);
+								s.close();
+								removeFromSessionTable(s.getConnNum());
+							}
+							runQueue.clear();
+						}
 
 						// Close and remove DRDAConnThreads on threadList.
 						for (int i = 0; i < threadList.size(); i++)

Modified: db/derby/code/branches/10.2/java/engine/org/apache/derby/iapi/store/access/Qualifier.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/engine/org/apache/derby/iapi/store/access/Qualifier.java?view=diff&rev=446709&r1=446708&r2=446709
==============================================================================
--- db/derby/code/branches/10.2/java/engine/org/apache/derby/iapi/store/access/Qualifier.java
(original)
+++ db/derby/code/branches/10.2/java/engine/org/apache/derby/iapi/store/access/Qualifier.java
Fri Sep 15 13:02:27 2006
@@ -26,7 +26,7 @@
 import org.apache.derby.iapi.error.StandardException;
 
 /**
-
+  <p>
   A structure which is used to "qualify" a column.  Specifies
   that the column value in a given column identified by column
   id is to be compared via a specific operator to a particular
@@ -45,36 +45,32 @@
   <blockquote><pre>
   if (qualifier.negateCompareResult())
   {
-      <blockquote><pre>
       compare_result = 
       row[(qualifier.getColumnId())].compare(
-      <blockquote><pre>
         qualifier.getOperator(), 
         qualifier.getOrderable(),
         qualifier.getOrderedNulls(), 
         qualifier.getUnknownRV()) 
-      </blockquote></pre>
       if (qualifier.negateCompareResult())
       {
-          <blockquote><pre>
           compare_result = !(compare_result);
-          </blockquote></pre>
       }
-      </blockquote></pre>
   }
   </blockquote></pre>
-
+  <p>
   Qualifiers are often passed through interfaces as a set of Qualifiers,
   rather than one at a time, for example see the qualifier argument in 
-  @see TransactionController#openScan 
-
+  TransactionController.openScan(). 
+  <p>
   To make this consistent the following protocols are to be used when passing
   around sets of Qualifiers.
-
+  <p>
   A single dimensional array is to be used to pass around a set of AND'd 
   qualifiers.  Thus qualifier[] argument is to be treated as:
+  <blockquote><pre>
       qualifier[0] AND qualifer[1] ... AND qualifier[qualifer.length - 1]
-
+  </blockquote></pre>
+  <p>
   A two dimensional array is to be used to pass around a AND's and OR's in
   conjunctive normal form.  The top slot of the 2 dimensional array is optimized
   for the more frequent where no OR's are present.  The first array slot is 
@@ -83,48 +79,50 @@
   of OR's.  Thus the 2 dimensional array qual[][] argument is to be treated as 
   the following, note if qual.length = 1 then only the first array is valid and
   it is and an array of AND clauses:
-
-  (qual[0][0]               AND qual[0][0] ... AND qual[0][qual[0].length - 1])
+  <blockquote><pre>
+  (qual[0][0] AND qual[0][0] ... AND qual[0][qual[0].length - 1])
   AND
-  (qual[1][0]               OR  qual[1][1] ... OR  qual[1][qual[1].length - 1])
+  (qual[1][0] OR  qual[1][1] ... OR  qual[1][qual[1].length - 1])
   AND
-  (qual[2][0]               OR  qual[2][1] ... OR  qual[2][qual[2].length - 1])
+  (qual[2][0] OR  qual[2][1] ... OR  qual[2][qual[2].length - 1])
   ...
-  AND
-  (qual[qual.length - 1][0] OR  qual[1][1] ... OR  qual[1][2])
-
+  AND (qual[qual.length - 1][0] OR  qual[1][1] ... OR  qual[1][2])
+  </blockquote></pre>
+  <p>
   If any of the array's qual[0].length ... qual[qual.length -1] are 0 length
   they will be evaluated as TRUE; but they must be not NULL.  See Example 4 for
   encoding of (a or b) that takes advantage of this.
-
+  <p>
   Note that any of the arrays qual[0].length ... qual[qual.length -1] may also
   be of length 1, thus no guarantee is made the presence of OR
   predicates if qual.length > 1. See example 1a.
-
+  <p>
   The following give pseudo-code examples of building Qualifier arrays:
-
-  </blockquote><pre>
+  <p>
   Example 1: "a AND b AND c"
+  <blockquote><pre>
     qualifier = new Qualifier[1][3]; // 3 AND clauses
 
     qualifier[0][0] = a
     qualifier[0][1] = b
     qualifier[0][2] = c
-
+  </blockquote></pre>
+  <p>
   Example 1a "a AND b AND c" - less efficient than example 1 but legal
+  <blockquote><pre>
     qualifier = new Qualifier[3]; // 3 AND clauses
-	qualifier[0] = new Qualifier[1];
-	qualifier[1] = new Qualifier[1];
-	qualifier[2] = new Qualifier[1];
+    qualifier[0] = new Qualifier[1];
+    qualifier[1] = new Qualifier[1];
+    qualifier[2] = new Qualifier[1];
 	
-	qualifier[0][0] = a
-	qualifier[1][0] = b
-	qualifier[2][0] = c
-
-
+    qualifier[0][0] = a
+    qualifier[1][0] = b
+    qualifier[2][0] = c
+  </blockquote></pre>
+  <p>
   Example 2: "(f) AND (a OR b) AND (c OR d OR e)"
-
     Would be represented by an array that looks like the following:
+  <blockquote><pre>
     qualifier = new Qualifier[3]; // 3 and clauses
     qualifier[0] = new Qualifier[1]; // to be intitialized to f
     qualifier[1] = new Qualifier[2]; // to be initialized to (a OR b)
@@ -136,8 +134,11 @@
     qualifier[2][0] = c
     qualifier[2][1] = d
     qualifier[2][2] = e
-
+  </blockquote></pre>
+  <p>
   Example 3: "(a OR b) AND (c OR d) AND (e OR f)" 
+  <blockquote><pre>
+    qualifier = new Qualifier[3]; // 3 and clauses
     qualifier = new Qualifier[4]; // 4 and clauses
     qualifier[0] = new Qualifier[1]; // to be intitialized to TRUE
     qualifier[1] = new Qualifier[2]; // to be initialized to (a OR b)
@@ -151,18 +152,20 @@
     qualifier[2][1] = d
     qualifier[3][0] = e
     qualifier[3][1] = f
-
+  </blockquote></pre>
+  <p>
   Example 4: "(a OR b)" 
+  <blockquote><pre>
     qualifier = new Qualifier[2]; // 2 and clauses
     qualifier[0] = new Qualifier[0]; // 0 length array is TRUE
     qualifier[1] = new Qualifier[2]; // to be initialized to (a OR b)
 
     qualifier[1][0] = a
     qualifier[1][1] = b
-
   </blockquote></pre>
 
   @see ScanController
+  @see TransactionController#openScan 
   @see DataValueDescriptor#compare
 **/
 

Modified: db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/io/DirStorageFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/io/DirStorageFactory.java?view=diff&rev=446709&r1=446708&r2=446709
==============================================================================
--- db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/io/DirStorageFactory.java
(original)
+++ db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/io/DirStorageFactory.java
Fri Sep 15 13:02:27 2006
@@ -187,7 +187,11 @@
             else if( home != null && dataDirectory.startsWith( home))
                 databaseRoot = dataDirectoryFile;
             else
+            {
                 databaseRoot = new File( home, dataDirectory);
+                if (home != null)
+                    dataDirectory = home + getSeparator() +  dataDirectory;
+            }
             canonicalName = databaseRoot.getCanonicalPath();
             createTempDir();
             separatedDataDirectory = dataDirectory + getSeparator();

Modified: db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/io/DirStorageFactory4.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/io/DirStorageFactory4.java?view=diff&rev=446709&r1=446708&r2=446709
==============================================================================
--- db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/io/DirStorageFactory4.java
(original)
+++ db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/io/DirStorageFactory4.java
Fri Sep 15 13:02:27 2006
@@ -53,14 +53,9 @@
      */
     StorageFile newPersistentFile( String path)
     {
-        String dir = dataDirectory;
-        if (canonicalName != null && path != null && home != null &&

-                !path.startsWith(home)) {
-            dir = canonicalName;
-        }
         if( path == null)
-            return new DirFile4(dir, rwsOK);
-        return new DirFile4(dir, path, rwsOK);
+            return new DirFile4(dataDirectory, rwsOK);
+        return new DirFile4(dataDirectory, path, rwsOK);
     }
 
     /**

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/GetPropertyInfoTest.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/GetPropertyInfoTest.out?view=diff&rev=446709&r1=446708&r2=446709
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/GetPropertyInfoTest.out
(original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/GetPropertyInfoTest.out
Fri Sep 15 13:02:27 2006
@@ -1,36 +1,36 @@
 Test GetPropertyInfoTest starting
-databaseName: EncryptedDB
-encryptionProvider: null
-encryptionAlgorithm: null
-encryptionKeyLength: null
-encryptionKey: null
-territory: null
-user: null
-logDevice: null
-rollForwardRecoveryFrom: null
-createFrom: null
-restoreFrom: null
-bootPassword: 
-password: 
-shutdown: false
-create: true
-dataEncryption: true
-upgrade: false
-databaseName: 
-encryptionProvider: null
-encryptionAlgorithm: null
-encryptionKeyLength: null
-encryptionKey: null
-territory: null
-user: null
-logDevice: null
-rollForwardRecoveryFrom: null
-createFrom: null
-restoreFrom: null
-bootPassword: ****
-password: 
-shutdown: false
-create: true
-dataEncryption: true
-upgrade: false
+databaseName - value: EncryptedDB - description: database identity - required false
+encryptionProvider - value: null - description: cryptographic service provider - required
false - choices null 
+encryptionAlgorithm - value: null - description: cryptographic algorithm - required false
- choices null 
+encryptionKeyLength - value: null - description: cryptographic key length - required false
- choices null 
+encryptionKey - value: null - description: external cryptographic key - required false -
choices null 
+territory - value: null - description: territory for the database - required false - choices
null 
+user - value: null - description: user name - required false - choices null 
+logDevice - value: null - description: log directory path - required false - choices null

+rollForwardRecoveryFrom - value: null - description: backup path for rollforward recovery
- required false - choices null 
+createFrom - value: null - description: J029 :  - required false - choices null 
+restoreFrom - value: null - description: J030 :  - required false - choices null 
+bootPassword - value:  - description: secret cryptographic key - required false - choices
null 
+password - value:  - description: user password - required false - choices null 
+shutdown - value: false - description: shut down Derby - required false     - choices [0]
: false     - choices [1] : true
+create - value: true - description: create database - required false     - choices [0] :
false     - choices [1] : true
+dataEncryption - value: true - description: encrypt database on disk - required false   
 - choices [0] : false     - choices [1] : true
+upgrade - value: false - description: upgrade database - required false     - choices [0]
: false     - choices [1] : true
+databaseName - value:  - description: database identity - required false     - choices [0]
: EncryptedDB
+encryptionProvider - value: null - description: cryptographic service provider - required
false - choices null 
+encryptionAlgorithm - value: null - description: cryptographic algorithm - required false
- choices null 
+encryptionKeyLength - value: null - description: cryptographic key length - required false
- choices null 
+encryptionKey - value: null - description: external cryptographic key - required false -
choices null 
+territory - value: null - description: territory for the database - required false - choices
null 
+user - value: null - description: user name - required false - choices null 
+logDevice - value: null - description: log directory path - required false - choices null

+rollForwardRecoveryFrom - value: null - description: backup path for rollforward recovery
- required false - choices null 
+createFrom - value: null - description: J029 :  - required false - choices null 
+restoreFrom - value: null - description: J030 :  - required false - choices null 
+bootPassword - value: **** - description: secret cryptographic key - required false - choices
null 
+password - value:  - description: user password - required false - choices null 
+shutdown - value: false - description: shut down Derby - required false     - choices [0]
: false     - choices [1] : true
+create - value: true - description: create database - required false     - choices [0] :
false     - choices [1] : true
+dataEncryption - value: true - description: encrypt database on disk - required false   
 - choices [0] : false     - choices [1] : true
+upgrade - value: false - description: upgrade database - required false     - choices [0]
: false     - choices [1] : true
 Test GetPropertyInfoTest finished

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GetPropertyInfoTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GetPropertyInfoTest.java?view=diff&rev=446709&r1=446708&r2=446709
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GetPropertyInfoTest.java
(original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GetPropertyInfoTest.java
Fri Sep 15 13:02:27 2006
@@ -73,7 +73,22 @@
 
 				for (int j = 0; j < attributes.length; j++)
 				{
-					System.out.println(attributes[j].name + ": " + attributes[j].value);
+					System.out.print(attributes[j].name + " - value: " + attributes[j].value);
+					// Also check on the other PropertyInfo fields
+					String[] choices = attributes[j].choices;
+					System.out.print(" - description: " 
+						+ attributes[j].description +
+						" - required " + attributes[j].required);
+					if (choices != null)
+					{
+						for (int k = 0; k < choices.length; k++)
+						{
+							System.out.print("     - choices [" + k + "] : " + choices[k]);
+						}
+						System.out.print("\n");
+					}
+					else
+						System.out.print(" - choices null \n");
 				}
 
 				// Now set bootPassword and call getPropertyInfo again.  
@@ -121,8 +136,24 @@
 
 				for (int j = 0; j < attributes.length; j++)
 				{
-					System.out.println(attributes[j].name + ": " + attributes[j].value);
+					System.out.print(attributes[j].name + " - value: " + attributes[j].value);
+					// Also check on the other PropertyInfo fields
+					String[] choices = attributes[j].choices;
+					System.out.print(" - description: " 
+						+ attributes[j].description +
+						" - required " + attributes[j].required);
+					if (choices != null)
+					{
+						for (int k = 0; k < choices.length; k++)
+						{
+							System.out.print("     - choices [" + k + "] : " + choices[k]);
+						}
+						System.out.print("\n");
+					}
+					else
+						System.out.print(" - choices null \n");
 				}
+
 				// Now set database name and call getPropertyInfo again.  
 				// This time attribute length should be zero, sice we pass all
 				// minimum required properties. 

Modified: db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_de_DE.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_de_DE.properties?view=diff&rev=446709&r1=446708&r2=446709
==============================================================================
--- db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_de_DE.properties
(original)
+++ db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_de_DE.properties
Fri Sep 15 13:02:27 2006
@@ -169,7 +169,7 @@
 IJ_Reco0InDoubT={0} unentschiedene Transaktionen wurden wiederhergestellt
 IJ_Tran01=Transaktion {0} : {1}
 IJ_IlleValu=UNG\u00dcLTIGER WERT
-IJ_01SeeClouLog={0} : {1} (siehe cloudscape.LOG)
+IJ_01SeeClouLog={0} : {1} (siehe derby.log)
 IJ_Pool=PooledConnection
 IJ_XAClass=EmbeddedXADataSource ist nicht im Klassenpfad enthalten. Nehmen Sie die Datei
derby.jar in den Klassenpfad auf.
 IJ_XANoI=Es kann keine Instanz von EmbeddedXADataSource erstellt werden. Stellen Sie die
Datei derby.jar in den Klassenpfad.

Modified: db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_es.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_es.properties?view=diff&rev=446709&r1=446708&r2=446709
==============================================================================
--- db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_es.properties
(original)
+++ db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_es.properties
Fri Sep 15 13:02:27 2006
@@ -172,7 +172,7 @@
 IJ_Reco0InDoubT=Recuperadas {0} transacciones dudosas
 IJ_Tran01=Transacci\u00f3n {0} : {1}
 IJ_IlleValu=VALOR NO PERMITIDO
-IJ_01SeeClouLog={0} : {1} (consulte cloudcape.LOG)
+IJ_01SeeClouLog={0} : {1} (consulte derby.log)
 IJ_Pool=Conexi\u00f3nAgrupada
 IJ_XAClass=EmbeddedXADataSource no est\u00e1 en la classpath; sit\u00fae el archivo derby.jar
en la classpath
 IJ_XANoI=No se puede crear una instancia de EmbeddedXADataSource; sit\u00fae el archivo derby.jar
en la classpath

Modified: db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_fr.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_fr.properties?view=diff&rev=446709&r1=446708&r2=446709
==============================================================================
--- db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_fr.properties
(original)
+++ db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_fr.properties
Fri Sep 15 13:02:27 2006
@@ -169,7 +169,7 @@
 IJ_Reco0InDoubT={0} a \u00e9t\u00e9 r\u00e9cup\u00e9r\u00e9 dans des transactions incertaines
 IJ_Tran01=Transaction {0} : {1}
 IJ_IlleValu=VALEUR INCORRECTE
-IJ_01SeeClouLog={0} : {1} (voir cloudcape.LOG)
+IJ_01SeeClouLog={0} : {1} (voir derby.log)
 IJ_Pool=ConnexionRegroup\u00e9e
 IJ_XAClass=EmbeddedXADataSource ne se trouve pas dans le chemin de classes ; veuillez placer
le fichier derby.jar dans votre chemin de classes.
 IJ_XANoI=EmbeddedXADataSource ne peut pas \u00eatre instanci\u00e9 ; veuillez placer le fichier
derby.jar dans votre chemin de classes.

Modified: db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_it.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_it.properties?view=diff&rev=446709&r1=446708&r2=446709
==============================================================================
--- db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_it.properties
(original)
+++ db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_it.properties
Fri Sep 15 13:02:27 2006
@@ -169,7 +169,7 @@
 IJ_Reco0InDoubT=Ripristinato {0} nelle transazioni dubbie
 IJ_Tran01=Transazione {0} : {1}
 IJ_IlleValu=VALORE NON VALIDO
-IJ_01SeeClouLog={0} : {1} (consultare cloudcape.LOG)
+IJ_01SeeClouLog={0} : {1} (consultare derby.log)
 IJ_Pool=PooledConnection
 IJ_XAClass=EmbeddedXADataSource non presente nel percorso classe, inserire il file derby.jar
nel percorso classe
 IJ_XANoI=Impossibile creare l'istanza EmbeddedXADataSource, inserire il file derby.jar nel
percorso classe

Modified: db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_ja_JP.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_ja_JP.properties?view=diff&rev=446709&r1=446708&r2=446709
==============================================================================
--- db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_ja_JP.properties
(original)
+++ db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_ja_JP.properties
Fri Sep 15 13:02:27 2006
@@ -169,7 +169,7 @@
 IJ_Reco0InDoubT=\u672a\u78ba\u5b9a\u30c8\u30e9\u30f3\u30b6\u30af\u30b7\u30e7\u30f3\u3067
{0} \u3092\u30ea\u30ab\u30d0\u30ea\u30fc\u3057\u307e\u3057\u305f
 IJ_Tran01=\u30c8\u30e9\u30f3\u30b6\u30af\u30b7\u30e7\u30f3 {0} : {1}
 IJ_IlleValu=\u6b63\u3057\u304f\u306a\u3044\u5024
-IJ_01SeeClouLog={0} : {1} (cloudcape.LOG \u3092\u53c2\u7167)
+IJ_01SeeClouLog={0} : {1} (derby.log \u3092\u53c2\u7167)
 IJ_Pool=PooledConnection
 IJ_XAClass=EmbeddedXADataSource \u304c\u30af\u30e9\u30b9\u30d1\u30b9\u306b\u3042\u308a\u307e\u305b\u3093\u3002derby.jar
\u30d5\u30a1\u30a4\u30eb\u3092\u30af\u30e9\u30b9\u30d1\u30b9\u306b\u5165\u308c\u3066\u304f\u3060\u3055\u3044\u3002
 IJ_XANoI=EmbeddedXADataSource \u306f\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u5316\u3067\u304d\u307e\u305b\u3093\u3002derby.jar
\u30d5\u30a1\u30a4\u30eb\u3092\u30af\u30e9\u30b9\u30d1\u30b9\u306b\u5165\u308c\u3066\u304f\u3060\u3055\u3044\u3002

Modified: db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_ko_KR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_ko_KR.properties?view=diff&rev=446709&r1=446708&r2=446709
==============================================================================
--- db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_ko_KR.properties
(original)
+++ db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_ko_KR.properties
Fri Sep 15 13:02:27 2006
@@ -169,7 +169,7 @@
 IJ_Reco0InDoubT={0} \uc778\ub2e4\uc6b0\ud2b8(in-doubt) \ud2b8\ub79c\uc7ad\uc158\uc744 \ubcf5\uad6c\ud588\uc2b5\ub2c8\ub2e4.
 IJ_Tran01=\ud2b8\ub79c\uc7ad\uc158 {0} : {1}
 IJ_IlleValu=\uc798\ubabb\ub41c \uac12
-IJ_01SeeClouLog={0} : {1} (cloudcape.LOG \ucc38\uc870)
+IJ_01SeeClouLog={0} : {1} (derby.log \ucc38\uc870)
 IJ_Pool=PooledConnection
 IJ_XAClass=EmbeddedXADataSource\uac00 \ud074\ub798\uc2a4 \uacbd\ub85c\uc5d0 \uc5c6\uc2b5\ub2c8\ub2e4.
\ud074\ub798\uc2a4 \uacbd\ub85c\uc5d0 derby.jar \ud30c\uc77c\uc744 \ub123\uc73c\uc2ed\uc2dc\uc624.
 IJ_XANoI=EmbeddedXADataSource\ub97c \uc778\uc2a4\ud134\uc2a4\ud654\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
\ud074\ub798\uc2a4 \uacbd\ub85c\uc5d0 derby.jar \ud30c\uc77c\uc744 \ub123\uc73c\uc2ed\uc2dc\uc624.

Modified: db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties?view=diff&rev=446709&r1=446708&r2=446709
==============================================================================
--- db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties
(original)
+++ db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties
Fri Sep 15 13:02:27 2006
@@ -169,7 +169,7 @@
 IJ_Reco0InDoubT=\u5728\u672a\u786e\u5b9a\u4e8b\u52a1\u4e2d\u6062\u590d {0}
 IJ_Tran01=\u4e8b\u52a1 {0} : {1}
 IJ_IlleValu=\u975e\u6cd5\u503c
-IJ_01SeeClouLog={0} : {1}\uff08\u8bf7\u53c2\u9605 cloudcape.LOG\uff09
+IJ_01SeeClouLog={0} : {1}\uff08\u8bf7\u53c2\u9605 derby.log\uff09
 IJ_Pool=PooledConnection
 IJ_XAClass=EmbeddedXADataSource \u4e0d\u5728\u7c7b\u8def\u5f84\u4e2d\uff0c\u8bf7\u5c06 derby.jar
\u6587\u4ef6\u653e\u5165\u60a8\u7684\u7c7b\u8def\u5f84
 IJ_XANoI=\u65e0\u6cd5\u5b9e\u4f8b\u5316 EmbeddedXADataSource\uff0c\u8bf7\u5c06 deryby.jar
\u6587\u4ef6\u653e\u5165\u60a8\u7684\u7c7b\u8def\u5f84

Modified: db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_zh_TW.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_zh_TW.properties?view=diff&rev=446709&r1=446708&r2=446709
==============================================================================
--- db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_zh_TW.properties
(original)
+++ db/derby/code/branches/10.2/java/tools/org/apache/derby/loc/toolsmessages_zh_TW.properties
Fri Sep 15 13:02:27 2006
@@ -169,7 +169,7 @@
 IJ_Reco0InDoubT=\u5728\u4e0d\u78ba\u5b9a\u7684\u4ea4\u6613\u4e2d\u56de\u5fa9 {0}
 IJ_Tran01=\u4ea4\u6613 {0}\uff1a{1}
 IJ_IlleValu=\u503c\u4e0d\u5408\u6cd5
-IJ_01SeeClouLog={0}\uff1a{1}\uff08\u8acb\u53c3\u95b1 cloudcape.LOG\uff09
+IJ_01SeeClouLog={0}\uff1a{1}\uff08\u8acb\u53c3\u95b1 derby.log\uff09
 IJ_Pool=PooledConnection
 IJ_XAClass=EmbeddedXADataSource \u4e0d\u5728\u985e\u5225\u8def\u5f91\u4e2d\uff0c\u8acb\u5c07
derby.jar \u6a94\u6848\u653e\u5230\u985e\u5225\u8def\u5f91\u4e2d
 IJ_XANoI=\u7121\u6cd5\u5be6\u4f8b\u5316 EmbeddedXADataSource\uff0c\u8acb\u5c07 derby.jar
\u6a94\u6848\u653e\u5230\u985e\u5225\u8def\u5f91\u4e2d

Modified: db/derby/code/branches/10.2/tools/release/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/tools/release/build.xml?view=diff&rev=446709&r1=446708&r2=446709
==============================================================================
--- db/derby/code/branches/10.2/tools/release/build.xml (original)
+++ db/derby/code/branches/10.2/tools/release/build.xml Fri Sep 15 13:02:27 2006
@@ -60,9 +60,9 @@
     <mkdir dir="${crlf.dir}"/>
     <mkdir dir="${lf.dir}"/>
     <fixcrlf srcdir="${basedir}" destdir="${crlf.dir}" eol="crlf"
-             includes="CHANGES,COPYRIGHT,LICENSE,KEYS,NOTICE"/>
+             includes="CHANGES,COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"/>
     <fixcrlf srcdir="${basedir}" destdir="${lf.dir}" eol="lf"
-             includes="CHANGES,COPYRIGHT,LICENSE,KEYS,NOTICE"/>
+             includes="CHANGES,COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"/>
 
   </target>
 
@@ -72,7 +72,7 @@
     <zip destfile="${release.dir}/${derby.bin}.zip"
          compress="true">
       <!-- top-level -->
-      <zipfileset dir="${crlf.dir}" includes="CHANGES,COPYRIGHT,LICENSE,KEYS,NOTICE"
+      <zipfileset dir="${crlf.dir}" includes="CHANGES,COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"
                   prefix="${derby.bin}/"/>
       <zipfileset dir="${basedir}" includes="index.html" prefix="${derby.bin}/"/>
       <!-- bin -->
@@ -121,7 +121,7 @@
     <tar destfile="${release.dir}/${derby.bin}.tar.gz"
          compression="gzip" longfile="gnu">
       <!-- top-level -->
-      <tarfileset dir="${lf.dir}" includes="CHANGES,COPYRIGHT,LICENSE,KEYS,NOTICE"
+      <tarfileset dir="${lf.dir}" includes="CHANGES,COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"
                   prefix="${derby.bin}/"/>
       <tarfileset dir="${basedir}" includes="index.html" prefix="${derby.bin}/"/>
       <!-- bin -->
@@ -170,7 +170,7 @@
   <target name="lib.zip" depends="init">
     <zip destfile="${release.dir}/${derby.lib}.zip"
 	     compress="true">
-      <zipfileset dir="${crlf.dir}" includes="CHANGES,COPYRIGHT,LICENSE,KEYS,NOTICE"
+      <zipfileset dir="${crlf.dir}" includes="CHANGES,COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"
       			  prefix="${derby.lib}/"/>
       <zipfileset dir="${basedir}/jars/insane" prefix="${derby.lib}/lib" includes="derby*.*"
 	              excludes="derby_core_plugin*,derbyTesting.jar"/>
@@ -184,7 +184,7 @@
   <target name="lib.tgz">
     <tar destfile="${release.dir}/${derby.lib}.tar.gz"
 	     compression="gzip">
-      <tarfileset dir="${lf.dir}" includes="CHANGES,COPYRIGHT,LICENSE,KEYS,NOTICE"
+      <tarfileset dir="${lf.dir}" includes="CHANGES,COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"
       			  prefix="${derby.lib}/"/>
       <tarfileset dir="${basedir}/jars/insane" prefix="${derby.lib}/lib" includes="derby*.*"
 	              excludes="derby_core_plugin*,derbyTesting.jar"/>
@@ -201,7 +201,7 @@
   <target name="lib-debug.zip" depends="init">
     <zip destfile="${release.dir}/${derby.lib-debug}.zip"
 	     compress="true">
-      <zipfileset dir="${crlf.dir}" includes="CHANGES,COPYRIGHT,LICENSE,KEYS,NOTICE"
+      <zipfileset dir="${crlf.dir}" includes="CHANGES,COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"
       			  prefix="${derby.lib-debug}/"/>
       <zipfileset dir="${basedir}/jars/sane" prefix="${derby.lib-debug}/lib" includes="derby*.*"
 	              excludes="derby_core_plugin*,derbyTesting.jar"/>
@@ -215,7 +215,7 @@
   <target name="lib-debug.tgz">
     <tar destfile="${release.dir}/${derby.lib-debug}.tar.gz"
 	     compression="gzip">
-      <tarfileset dir="${lf.dir}" includes="CHANGES,COPYRIGHT,LICENSE,KEYS,NOTICE"
+      <tarfileset dir="${lf.dir}" includes="CHANGES,COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"
       			  prefix="${derby.lib-debug}/"/>
       <tarfileset dir="${basedir}/jars/sane" prefix="${derby.lib-debug}/lib" includes="derby*.*"
 	              excludes="derby_core_plugin*,derbyTesting.jar"/>
@@ -232,7 +232,7 @@
   <target name="src.zip" depends="init">
     <zip destfile="${release.dir}/${derby.src}.zip">
       <zipfileset dir="${basedir}" prefix="${derby.src}"
-                  includes="BUILDING,CHANGES,COPYRIGHT,KEYS,LICENSE,NOTICE,STATUS,build.xml,frameworks/**,java/**,plugins/**,tools/**"
+                  includes="BUILDING,CHANGES,COPYRIGHT,KEYS,LICENSE,NOTICE,RELEASE-NOTES.html,STATUS,build.xml,frameworks/**,java/**,plugins/**,tools/**"
          excludes="tools/release/**,tools/**/db2jcc*,tools/**/osgi.jar,tools/**/jdbc2_0*,tools/java/jce*,tools/**/packaging.properties,java/demo/toursdb/toursdb**"/>
     </zip>
   </target>
@@ -240,7 +240,7 @@
     <tar destfile="${release.dir}/${derby.src}.tar.gz"
          compression="gzip" longfile="gnu">
       <tarfileset dir="${basedir}" prefix="${derby.src}"
-                  includes="BUILDING,CHANGES,COPYRIGHT,KEYS,LICENSE,NOTICE,STATUS,build.xml,frameworks/**,java/**,plugins/**,tools/**"
+                  includes="BUILDING,CHANGES,COPYRIGHT,KEYS,LICENSE,NOTICE,RELEASE-NOTES.html,STATUS,build.xml,frameworks/**,java/**,plugins/**,tools/**"
          excludes="tools/release/**,tools/**/db2jcc*,tools/**/osgi.jar,tools/**/jdbc2_0*,tools/java/jce*,tools/**/packaging.properties,java/demo/toursdb/toursdb**"/>
     </tar>
   </target>



Mime
View raw message