db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r572058 - in /db/derby/code/trunk/java/tools/org/apache/derby: impl/tools/ impl/tools/ij/ loc/ tools/
Date Sun, 02 Sep 2007 18:03:25 GMT
Author: kahatlen
Date: Sun Sep  2 11:03:22 2007
New Revision: 572058

URL: http://svn.apache.org/viewvc?rev=572058&view=rev
Log:
DERBY-3041 (partial) Removed the classes utilMain14 and Main14.

utilMain14.createStatement() was moved to
utilMain. utilMain.setHoldability() and utilMain.getHoldability() were
removed since they serve no purpose now that we don't support Java 1.3.

Removed:
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/Main14.java
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain14.java
Modified:
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijException.java
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain.java
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_cs.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_de_DE.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_es.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_fr.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_hu.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_it.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ja_JP.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ko_KR.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pl.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pt_BR.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ru.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_TW.properties
    db/derby/code/trunk/java/tools/org/apache/derby/tools/ij.java

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml?rev=572058&r1=572057&r2=572058&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml Sun Sep  2 11:03:22
2007
@@ -33,7 +33,7 @@
   <property file="${properties.dir}/compilepath.properties"/>
 
 <!-- Targets -->
-  <target name="compile" depends="compile_tools_impl_jdk14"/>
+  <target name="compile" depends="compile_tools_impl"/>
 
   <target name="parser">
     <ant antfile="${src.dir}/build.xml" target="genParser">
@@ -73,34 +73,7 @@
         <pathelement path="${compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/impl/tools/**"/>
-      <exclude name="${derby.dir}/impl/tools/ij/mtGrammar.java"/>
-      <exclude name="${derby.dir}/impl/tools/ij/Main14.java"/>
-      <exclude name="${derby.dir}/impl/tools/ij/utilMain14.java"/>
     </javac>
-   </target>
-
-  <target name="compile_tools_impl_jdk14" depends="compile_tools_impl">
-    <javac
-      source="1.4"
-      target="1.4"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="${debug}"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.tools.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${java14compile.classpath}"/>
-      </classpath>
-      <include name="${derby.dir}/impl/tools/ij/mtGrammar.java"/>
-      <include name="${derby.dir}/impl/tools/ij/Main14.java"/>
-      <include name="${derby.dir}/impl/tools/ij/utilMain14.java"/>
-    </javac>
-	
    </target>
 
 </project>

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj?rev=572058&r1=572057&r2=572058&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj Sun Sep  2 11:03:22
2007
@@ -1928,7 +1928,7 @@
 	Token s;
 	Token scrolling = null;
 	Token withtoken = null;
-	int holdType = utilInstance.getHoldability(theConnection);
+	int holdType = theConnection.getHoldability();
 	String c;
 	Statement st = null;
 	String sVal;
@@ -2597,8 +2597,7 @@
 	<NOHOLDFORCONNECTION> 
 	{
 		haveConnection();
-		theConnection = utilInstance.setHoldability(theConnection, JDBC30Translation.CLOSE_CURSORS_AT_COMMIT);
-
+		theConnection.setHoldability(ResultSet.CLOSE_CURSORS_AT_COMMIT);
 		return null;
 	}
 }

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijException.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijException.java?rev=572058&r1=572057&r2=572058&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijException.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijException.java Sun Sep
 2 11:03:22 2007
@@ -59,7 +59,6 @@
 	private final static String ResultSetGetWarningsFailed = "IJ_UnabToGetWar_19";
     private final static String ResourceNotFound = "IJ_ResoNotFoun";
 	private final static String ScrollCursorsNotSupported = "IJ_ScroCursAre1";
-	private final static String HoldCursorsNotSupported = "IJ_HoldCursAre4";
 	private final static String StatementGetWarningsFailed = "IJ_UnabToGetWar_22";
 	private final static String WaitInterrupted = "IJ_WaitForStatI";
 	private final static String ZeroInvalidForAbsolute = "IJ_0IsAnInvaVal";
@@ -140,11 +139,6 @@
 	}
 	static ijException scrollCursorsNotSupported() {
 		return new ijException(LocalizedResource.getMessage(ScrollCursorsNotSupported));
-	}
-	//IJImpl20.utilMain can't throw exception for holdable cursors if
-	//following not declared public
-	public static ijException holdCursorsNotSupported() {
-		return new ijException(LocalizedResource.getMessage(HoldCursorsNotSupported));
 	}
 	static ijException statementGetWarningsFailed() {
 		return new ijException(LocalizedResource.getMessage(StatementGetWarningsFailed));

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain.java?rev=572058&r1=572057&r2=572058&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain.java Sun Sep  2
11:03:22 2007
@@ -57,6 +57,9 @@
  */
 public class utilMain implements java.security.PrivilegedAction {
 
+    private static final String JDBC_NOTSUPPORTED =
+        "JDBC 3 method called - not yet supported";
+
 	private StatementFinder[] commandGrabber;
 	UCode_CharStream charStream;
 	ijTokenManager ijTokMgr;
@@ -656,50 +659,6 @@
 		mtUse = b;
 	}
 
-	// JDBC 2.0 support
-
-
-	/**
-	 * Connections by default create ResultSet objects with holdability true. This method can
be used
-	 * to change the holdability of the connection by passing one of ResultSet.HOLD_CURSORS_OVER_COMMIT
-	 * or ResultSet.CLOSE_CURSORS_AT_COMMIT.
-	 *
-	 * @param conn			The connection.
-	 * @param holdType	The new holdability for the Connection object.
-	 *
-	 * @return	The connection object with holdability set to passed value.
-	 */
-	Connection setHoldability(Connection conn, int holdType)
-		throws SQLException
-	{
-    //Prior to db2 compatibility work, the default holdability for connections was close
cursors over commit and all the tests
-    //were written based on that assumption
-    //Later, as part of db2 compatibility, we changed the default holdability for connection
to hold cursors over commit.
-    //But in order for the existing tests to work fine, the tests needed a way to set the
holdability to close cursors for connections
-        conn.setHoldability(ResultSet.CLOSE_CURSORS_AT_COMMIT);
-        return conn;
-	}
-
-	/**
-	 * Retrieves the current holdability of ResultSet objects created using this
-	 * Connection object.
-	 *
-	 * @return  The holdability, one of ResultSet.HOLD_CURSORS_OVER_COMMIT
-	 * or ResultSet.CLOSE_CURSORS_AT_COMMIT
-	 *
-	 */
-	int getHoldability(Connection conn)
-		throws SQLException
-	{
-    //this method is used to make sure we are not trying to create a statement with holdability
different than the connection holdability
-    //This is because jdk13 and lower does not have support for that.
-    //The holdability of connection and statement can differ if connection holdability is
set to close cursor on commit using reflection
-    //and statement is getting created with holdability true
-    //Another instance of holdability of connection and statement not being same is when
connection holdability is hold cursor
-    //over commit and statement is being created with holdability false
-        return conn.getHoldability();
-	}
-
 	/**
 	 * Create the right kind of statement (scrolling or not)
 	 * off of the specified connection.
@@ -712,27 +671,28 @@
 	Statement createStatement(Connection conn, int scrollType, int holdType)
 		throws SQLException
 	{
-    	//following if is used to make sure we are not trying to create a statement with holdability
different that the connection
-    	//holdability. This is because jdk13 and lower does not have support for that.
-    	//The holdability of connection and statement can differ if connection holdability is
set to close cursor on commit using reflection
-    	//and statement is getting created with holdability true
-    	//Another instance of holdability of connection and statement not being same is when
connection holdability is hold cursor
-    	//over commit and statement is being created with holdability false
-    	if (holdType != getHoldability(conn))
-    	{
-        	throw ijException.holdCursorsNotSupported();
-    	}
-      
-    	Statement stmt;
         try {
-        	stmt = conn.createStatement(scrollType, JDBC20Translation.CONCUR_READ_ONLY);
+            return conn.createStatement(
+                scrollType, ResultSet.CONCUR_READ_ONLY, holdType);
+        } catch(SQLException se) {
+            // since jcc doesn't yet support JDBC3.0 we have to go back to
+            // JDBC2.0
+            if (isJCC && se.getMessage().equals(JDBC_NOTSUPPORTED)) {
+                return conn.createStatement(scrollType,
+                                            ResultSet.CONCUR_READ_ONLY);
+            }
+            throw se;
         } catch(AbstractMethodError ame) {
-        //because weblogic 4.5 doesn't yet implement jdbc 2.0 interfaces, need to go back
-        //to jdbc 1.x functionality
-        	stmt = conn.createStatement();
+            // because weblogic 4.5 doesn't yet implement jdbc 2.0 interfaces,
+            // we need to go back to jdbc 1.x functionality
+            // The jcc obfuscated jar gets this error
+            if (isJCC) {
+                return conn.createStatement(scrollType,
+                                            ResultSet.CONCUR_READ_ONLY);
+            }
+            return conn.createStatement();
         }
-		return stmt;
-	}
+    }
 
 	/**
 	 * Position on the specified row of the specified ResultSet.

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties?rev=572058&r1=572057&r2=572058&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties Sun Sep 
2 11:03:22 2007
@@ -143,7 +143,6 @@
 IJ_UnabToGetWar_19=Unable to get warnings for result set
 IJ_ResoNotFoun=Resource not found
 IJ_ScroCursAre1=Scroll cursors are only supported with JDK1.2 and higher.
-IJ_HoldCursAre4=Holdability can not be changed using jdbc3.0 apis in JDKs lower than JDK1.4.
 IJ_UnabToGetWar_22=Unable to get warnings for statement
 IJ_WaitForStatI=Wait for statement interrupted: {0}
 IJ_0IsAnInvaVal=0 is an invalid value for ABSOLUTE <integer> <cursorname>

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_cs.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_cs.properties?rev=572058&r1=572057&r2=572058&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_cs.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_cs.properties Sun Sep
 2 11:03:22 2007
@@ -142,7 +142,6 @@
 IJ_UnabToGetWar_19=Nezle z\u00edskat varov\u00e1n\u00ed pro mno\u017einu v\u00fdsledk\u016f
 IJ_ResoNotFoun=Prost\u0159edek nebyl nalezen
 IJ_ScroCursAre1=Posuvn\u00e9 kurzory jsou podporov\u00e1ny pouze v JDK 1.2 a vy\u0161\u0161\u00edm.
-IJ_HoldCursAre4=Zadr\u017eitelnost nelze zm\u011bnit pomoc\u00ed API jdbc3.0 v JDK star\u0161\u00edch
n\u011b\u017e JDK 1.4.
 IJ_UnabToGetWar_22=Nelze z\u00edskat varov\u00e1n\u00ed pro p\u0159\u00edkaz
 IJ_WaitForStatI=\u010cek\u00e1n\u00ed na p\u0159\u00edkaz bylo p\u0159eru\u0161eno: {0}
 IJ_0IsAnInvaVal=0 je neplatn\u00e1 hodnota pro ABSOLUTE <cel\u00e9\u010d\u00edslo>
<jm\u00e9nokurzoru>

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_de_DE.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_de_DE.properties?rev=572058&r1=572057&r2=572058&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_de_DE.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_de_DE.properties Sun
Sep  2 11:03:22 2007
@@ -142,7 +142,6 @@
 IJ_UnabToGetWar_19=F\u00fcr die Ergebnisliste k\u00f6nnen keine Warnungen abgerufen werden.
 IJ_ResoNotFoun=Ressource nicht gefunden
 IJ_ScroCursAre1=Scroll-Cursor werden erst ab JDK 1.2 unterst\u00fctzt.
-IJ_HoldCursAre4=Die Lebensdauer kann nicht mit den JDBC-3.0-APIs von Vorversionen des JDK
1.4 ge\u00e4ndert werden.
 IJ_UnabToGetWar_22=F\u00fcr die Anweisung k\u00f6nnen keine Warnungen abgerufen werden.
 IJ_WaitForStatI=Unterbrechung des Wartestatus f\u00fcr Anweisung: {0}
 IJ_0IsAnInvaVal=F\u00fcr ABSOLUTE <ganze Zahl> <Cursor-Name> ist 0 ein ung\u00fcltiger
Wert.

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_es.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_es.properties?rev=572058&r1=572057&r2=572058&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_es.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_es.properties Sun Sep
 2 11:03:22 2007
@@ -142,7 +142,6 @@
 IJ_UnabToGetWar_19=No es posible obtener los avisos del juego de resultados
 IJ_ResoNotFoun=Recurso no encontrado
 IJ_ScroCursAre1=Los cursores de desplazamiento s\u00f3lo est\u00e1n soportados con JDK1.2
y superior.
-IJ_HoldCursAre4=La capacidad de retenci\u00f3n no se puede modificar mediante las api jdbc3.0
en los JDK inferiores a JDK1.4.
 IJ_UnabToGetWar_22=No es posible obtener los avisos de sentencia
 IJ_WaitForStatI=Espera de sentencia interrumpida: {0}
 IJ_0IsAnInvaVal=0 en un valor no v\u00e1lido para ABSOLUTE <entero> <nombrecursor>

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_fr.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_fr.properties?rev=572058&r1=572057&r2=572058&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_fr.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_fr.properties Sun Sep
 2 11:03:22 2007
@@ -139,7 +139,6 @@
 IJ_UnabToGetWar_19=Impossible d'obtenir des avertissements pour l'ensemble de r\u00e9sultats
 IJ_ResoNotFoun=Ressource introuvable
 IJ_ScroCursAre1=Les curseurs de d\u00e9filement sont uniquement pris en charge avec JDK1.2
et version sup\u00e9rieure.
-IJ_HoldCursAre4=La fonction de conservation ne peut pas \u00eatre modifi\u00e9e avec les
API jdbc3.0 pour des JDK dont la version est inf\u00e9rieure \u00e0 1.4.
 IJ_UnabToGetWar_22=Impossible d'obtenir des avertissements pour l'instruction
 IJ_WaitForStatI=Attente de l''instruction interrompue : {0}
 IJ_0IsAnInvaVal=0 n'est pas une valeur correcte pour ABSOLUTE <entier> <nomcurseur>

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_hu.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_hu.properties?rev=572058&r1=572057&r2=572058&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_hu.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_hu.properties Sun Sep
 2 11:03:22 2007
@@ -139,7 +139,6 @@
 IJ_UnabToGetWar_19=Nem k\u00e9rhet\u0151k le figyelmeztet\u00e9sek az eredm\u00e9nyhalmazhoz
 IJ_ResoNotFoun=Az er\u0151forr\u00e1s nem tal\u00e1lhat\u00f3
 IJ_ScroCursAre1=A g\u00f6rget\u0151kurzorok csak a JDK1.2 \u00e9s \u00fajabb v\u00e1ltozataiban
t\u00e1mogatottak.
-IJ_HoldCursAre4=A t\u00e1rolhat\u00f3s\u00e1g nem m\u00f3dos\u00edthat\u00f3 a jdbc3.0 alkalmaz\u00e1s
programoz\u00e1si fel\u00fcletek haszn\u00e1lat\u00e1val a JDK1.4-n\u00e9l r\u00e9gebbi Java
fejleszt\u0151i k\u00f6rnyezetekben.
 IJ_UnabToGetWar_22=Nem k\u00e9rhet\u0151k le figyelmeztet\u00e9sek az utas\u00edt\u00e1shoz
 IJ_WaitForStatI=A v\u00e1rakoz\u00e1s az utas\u00edt\u00e1sra megszak\u00edtva: {0}
 IJ_0IsAnInvaVal=A 0 \u00e9rt\u00e9k \u00e9rv\u00e9nytelen az ABSOLUTE <eg\u00e9sz>
<kurzorn\u00e9v> utas\u00edt\u00e1shoz

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_it.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_it.properties?rev=572058&r1=572057&r2=572058&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_it.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_it.properties Sun Sep
 2 11:03:22 2007
@@ -142,7 +142,6 @@
 IJ_UnabToGetWar_19=Impossibile richiamare le avvertenze per l'insieme di risultati
 IJ_ResoNotFoun=Risorsa non trovata
 IJ_ScroCursAre1=I cursori di scorrimento sono supportati solo con JDK1.2 e versioni superiori.
-IJ_HoldCursAre4=L'elemento holdability non pu\u00f2 essere modificato utilizzando jdbc3.0
apis in JDK versioni inferiori a JDK1.4.
 IJ_UnabToGetWar_22=Impossibile richiamare le avvertenze per l'istruzione
 IJ_WaitForStatI=Attendere istruzione interrotta: {0}
 IJ_0IsAnInvaVal=0 \u00e8 un valore non valido per ABSOLUTE <numerointero> <nomecursore>

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ja_JP.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ja_JP.properties?rev=572058&r1=572057&r2=572058&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ja_JP.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ja_JP.properties Sun
Sep  2 11:03:22 2007
@@ -142,7 +142,6 @@
 IJ_UnabToGetWar_19=\u7d50\u679c\u30bb\u30c3\u30c8\u306b\u5bfe\u3059\u308b\u8b66\u544a\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093
 IJ_ResoNotFoun=\u30ea\u30bd\u30fc\u30b9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
 IJ_ScroCursAre1=\u30b9\u30af\u30ed\u30fc\u30eb\u30fb\u30ab\u30fc\u30bd\u30eb\u306f\u3001JDK1.2
\u4ee5\u4e0a\u3067\u306e\u307f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u3059\u3002
-IJ_HoldCursAre4=JDK1.4 \u4ee5\u4e0b\u306e JDK \u3067\u306f jdbc3.0 API \u3092\u4f7f\u7528\u3057\u3066\u3082\u4fdd\u6301\u6a5f\u80fd\u306e\u5909\u66f4\u306f\u3067\u304d\u307e\u305b\u3093\u3002
 IJ_UnabToGetWar_22=\u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8\u306b\u5bfe\u3059\u308b\u8b66\u544a\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093
 IJ_WaitForStatI=\u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8\u306e\u5272\u308a\u8fbc\u307f\u3092\u5f85\u6a5f\u3057\u307e\u3059:
{0}
 IJ_0IsAnInvaVal=0 \u306f\u3001ABSOLUTE <integer> <cursorname> \u306b\u306f\u7121\u52b9\u306a\u5024\u3067\u3059

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ko_KR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ko_KR.properties?rev=572058&r1=572057&r2=572058&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ko_KR.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ko_KR.properties Sun
Sep  2 11:03:22 2007
@@ -142,7 +142,6 @@
 IJ_UnabToGetWar_19=\uacb0\uacfc \uc138\ud2b8\uc5d0 \ub300\ud55c \uacbd\uace0\ub97c \ubc1b\uc744
\uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 IJ_ResoNotFoun=\uc790\uc6d0\uc744 \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 IJ_ScroCursAre1=\ud654\uba74\uc774\ub3d9 \ucee4\uc11c\ub294 JDK1.2 \uc774\uc0c1\uc5d0\uc11c\ub9cc
\uc9c0\uc6d0\ub429\ub2c8\ub2e4.
-IJ_HoldCursAre4=\ubcf4\uc720 \uac00\ub2a5\uc131\uc740 JDK1.4 \uc774\ud558\uc758 JDK\uc758
jdbc3.0 apis\ub97c \uc0ac\uc6a9\ud558\uc5ec \ubcc0\uacbd\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 IJ_UnabToGetWar_22=\uba85\ub839\ubb38\uc5d0 \ub300\ud55c \uacbd\uace0\ub97c \ubc1b\uc744
\uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 IJ_WaitForStatI=\uba85\ub839\ubb38\uc774 \uc778\ud130\ub7fd\ud2b8\ub420 \ub54c\uae4c\uc9c0
\uae30\ub2e4\ub9ac\uc2ed\uc2dc\uc624. {0}
 IJ_0IsAnInvaVal=0\uc740 ABSOLUTE <integer> <cursorname>\uc5d0 \ub300\ud574 \uc720\ud6a8\ud558\uc9c0
\uc54a\uc740 \uac12\uc785\ub2c8\ub2e4.

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pl.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pl.properties?rev=572058&r1=572057&r2=572058&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pl.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pl.properties Sun Sep
 2 11:03:22 2007
@@ -142,7 +142,6 @@
 IJ_UnabToGetWar_19=Nie mo\u017cna pobra\u0107 ostrze\u017ce\u0144 dla tabeli wynikowej
 IJ_ResoNotFoun=Nie znaleziono zasobu
 IJ_ScroCursAre1=Kursory typu scroll s\u0105 obs\u0142ugiwane tylko w \u015brodowisku JDK1.2
lub nowszym.
-IJ_HoldCursAre4=Mo\u017cliwo\u015b\u0107 wstrzymania nie mo\u017ce by\u0107 zmieniona za
pomoc\u0105 funkcji API jdbc3.0 z pakietu JDK starszego ni\u017c wersja JDK1.4.
 IJ_UnabToGetWar_22=Nie mo\u017cna pobra\u0107 ostrze\u017ce\u0144 dla instrukcji
 IJ_WaitForStatI=Oczekiwanie na instrukcj\u0119 zosta\u0142o przerwane: {0}
 IJ_0IsAnInvaVal=0 jest niepoprawn\u0105 warto\u015bci\u0105 dla komendy ABSOLUTE <liczba_ca\u0142kowita>
<nazwa_kursora>

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pt_BR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pt_BR.properties?rev=572058&r1=572057&r2=572058&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pt_BR.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pt_BR.properties Sun
Sep  2 11:03:22 2007
@@ -158,7 +158,6 @@
 IJ_UnabToGetWar_19=N\u00e3o foi poss\u00edvel obter advert\u00eancias para o conjunto de
resultados
 IJ_ResoNotFoun=Recurso n\u00e3o encontrado
 IJ_ScroCursAre1=Os cursores de rolagem s\u00e3o suportados apenas com o JDK1.2 e posterior.
-IJ_HoldCursAre4=A capacidade de reten\u00e7\u00e3o n\u00e3o pode ser alterada utilizando
as APIs jdbc3.0 em JDKs menores que JDK1.4.
 IJ_UnabToGetWar_22=N\u00e3o foi poss\u00edvel obter advert\u00eancias para a instru\u00e7\u00e3o
 IJ_WaitForStatI=Espera por instru\u00e7\u00e3o interrompida: {0}
 IJ_0IsAnInvaVal=0 n\u00e3o \u00e9 um valor v\u00e1lido para ABSOLUTE <inteiro> <nome_do_cursor>

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ru.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ru.properties?rev=572058&r1=572057&r2=572058&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ru.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ru.properties Sun Sep
 2 11:03:22 2007
@@ -142,7 +142,6 @@
 IJ_UnabToGetWar_19=\u041d\u0435 \u0443\u0434\u0430\u0435\u0442\u0441\u044f \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c
\u043f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u044f \u0434\u043b\u044f
\u043d\u0430\u0431\u043e\u0440\u0430 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u043e\u0432
 IJ_ResoNotFoun=\u0420\u0435\u0441\u0443\u0440\u0441 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d
 IJ_ScroCursAre1=\u041a\u0443\u0440\u0441\u043e\u0440\u044b \u043f\u0440\u043e\u043a\u0440\u0443\u0442\u043a\u0438
\u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u044e\u0442\u0441\u044f \u0442\u043e\u043b\u044c\u043a\u043e
\u043f\u0440\u0438 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0438
JDK1.2 \u0438 \u043d\u043e\u0432\u0435\u0435.
-IJ_HoldCursAre4=\u041d\u0435\u043b\u044c\u0437\u044f \u0438\u0437\u043c\u0435\u043d\u0438\u0442\u044c
\u0443\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u043d\u0438\u0435 \u043f\u0440\u0438 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0438
API jdbc3.0 \u0432 JDK, \u0431\u043e\u043b\u0435\u0435 \u0441\u0442\u0430\u0440\u043e\u0439
\u0432\u0435\u0440\u0441\u0438\u0438, \u0447\u0435\u043c JDK1.4.
 IJ_UnabToGetWar_22=\u041d\u0435 \u0443\u0434\u0430\u0435\u0442\u0441\u044f \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c
\u043f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u044f \u0434\u043b\u044f
\u043e\u043f\u0435\u0440\u0430\u0442\u043e\u0440\u0430
 IJ_WaitForStatI=\u041e\u043f\u0435\u0440\u0430\u0442\u043e\u0440 Wait for \u043f\u0440\u0435\u0440\u0432\u0430\u043d:
{0}
 IJ_0IsAnInvaVal=0 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u043d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u043c
\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u043c \u0434\u043b\u044f ABSOLUTE <\u0446\u0435\u043b\u043e\u0435_\u0447\u0438\u0441\u043b\u043e>
<\u0438\u043c\u044f_\u043a\u0443\u0440\u0441\u043e\u0440\u0430>

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties?rev=572058&r1=572057&r2=572058&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties Sun
Sep  2 11:03:22 2007
@@ -142,7 +142,6 @@
 IJ_UnabToGetWar_19=\u65e0\u6cd5\u83b7\u53d6\u7ed3\u679c\u96c6\u7684\u8b66\u544a
 IJ_ResoNotFoun=\u672a\u627e\u5230\u8d44\u6e90
 IJ_ScroCursAre1=\u53ea\u6709 JDK1.2 \u53ca\u66f4\u9ad8\u7248\u672c\u624d\u652f\u6301\u6eda\u52a8\u6e38\u6807\u3002
-IJ_HoldCursAre4=\u4e0d\u80fd\u4f7f\u7528\u4f4e\u4e8e JDK1.4 \u7684 JDK \u4e2d\u7684 jdbc3.0
api \u6765\u66f4\u6539\u53ef\u6301\u6709\u6027\u3002
 IJ_UnabToGetWar_22=\u65e0\u6cd5\u83b7\u53d6\u5bf9\u8bed\u53e5\u53d1\u51fa\u7684\u8b66\u544a
 IJ_WaitForStatI=\u7b49\u5f85\u8bed\u53e5\u4e2d\u65ad\uff1a{0}
 IJ_0IsAnInvaVal=\u5bf9\u4e8e ABSOLUTE <integer> <cursorname>\uff0c0 \u662f\u65e0\u6548\u503c

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_TW.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_TW.properties?rev=572058&r1=572057&r2=572058&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_TW.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_TW.properties Sun
Sep  2 11:03:22 2007
@@ -142,7 +142,6 @@
 IJ_UnabToGetWar_19=\u7121\u6cd5\u53d6\u5f97\u7d50\u679c\u96c6\u7684\u8b66\u544a
 IJ_ResoNotFoun=\u627e\u4e0d\u5230\u8cc7\u6e90
 IJ_ScroCursAre1=\u53ea\u6709 JDK 1.2 \u548c\u66f4\u65b0\u7684\u7248\u672c\u652f\u63f4\u6372\u52d5\u6e38\u6a19\u3002
-IJ_HoldCursAre4=\u7121\u6cd5\u4f7f\u7528\u6bd4 JDK1.4 \u66f4\u820a\u7248\u4e4b JDK \u4e2d\u7684
jdbc3.0 apis \u4f86\u8b8a\u66f4\u4fdd\u7279\u80fd\u529b\u3002
 IJ_UnabToGetWar_22=\u7121\u6cd5\u53d6\u5f97\u9673\u8ff0\u5f0f\u7684\u8b66\u544a
 IJ_WaitForStatI=\u7b49\u5f85\u5c94\u65b7\u9673\u8ff0\u5f0f\uff1a{0}
 IJ_0IsAnInvaVal=0 \u662f ABSOLUTE <integer> <cursorname> \u7684\u7121\u6548\u503c

Modified: db/derby/code/trunk/java/tools/org/apache/derby/tools/ij.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/tools/ij.java?rev=572058&r1=572057&r2=572058&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/tools/ij.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/tools/ij.java Sun Sep  2 11:03:22 2007
@@ -21,7 +21,6 @@
 
 package org.apache.derby.tools;
 
-import org.apache.derby.iapi.services.info.JVMInfo;
 import org.apache.derby.iapi.tools.i18n.LocalizedInput;
 import org.apache.derby.iapi.tools.i18n.LocalizedOutput;
 import org.apache.derby.iapi.tools.i18n.LocalizedResource;
@@ -57,19 +56,7 @@
   	@exception IOException thrown if cannot access input or output files.
    */
   static public void main(String[] args) throws IOException {
-
-	  /* We decide which verion of ij (2.0 or 4.0) to
-	   * load based on the same criteria that the JDBC driver
-	   * uses.
-	   */
-	  if (JVMInfo.JDK_ID == JVMInfo.J2SE_13)
-	  {
-		  Main.main(args);
-	  }
-	  else
-	  {
-		  org.apache.derby.impl.tools.ij.Main14.main(args);
-	  }
+      Main.main(args);
   }
   
   /**
@@ -101,20 +88,7 @@
 		          LocalizedResource.getInstance().
                     getNewEncodedOutput(sqlOut, outputEncoding);
 
-	  Main ijE;
-	  if (JVMInfo.JDK_ID == JVMInfo.J2SE_13)
-	  {
-		  ijE = new Main(false);
-	  }
-	  else
-	  {
-		  // temp - allow ij to continue to work under jdk131
-		  // will resolve as part of DEBRY-1609
-		  // jdk13 gets error loading Main14 due to the
-		  // class now being built with the jdk14 target flag.
-		  // ijE = new org.apache.derby.impl.tools.ij.Main14(false);
-		  ijE = new Main(false);
-	  }	  
+	  Main ijE = new Main(false);
 	  
 	  LocalizedInput li = LocalizedResource.getInstance().
 	            getNewEncodedInput(sqlIn, inputEncoding);



Mime
View raw message