db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1177591 - in /db/derby/code/branches/10.8: ./ java/client/org/apache/derby/client/net/NetCursor.java java/demo/toursdb/build.xml java/demo/toursdb/insertMaps.java
Date Fri, 30 Sep 2011 11:04:34 GMT
Author: kahatlen
Date: Fri Sep 30 11:04:33 2011
New Revision: 1177591

URL: http://svn.apache.org/viewvc?rev=1177591&view=rev
Log:
DERBY-5438: Empty MAPS table in toursdb

Merged fix from trunk (revision 1177589).

Modified:
    db/derby/code/branches/10.8/   (props changed)
    db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java   (props
changed)
    db/derby/code/branches/10.8/java/demo/toursdb/build.xml
    db/derby/code/branches/10.8/java/demo/toursdb/insertMaps.java

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 30 11:04:33 2011
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1104365,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1162737,1163131,1163616,1164358,1164370,1164495,1165221,1167017,1167470,1169692,1171665,1171672,1173446,1173647,1174436,1174646,1176633,1176636
+/db/derby/code/trunk:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1104365,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1162737,1163131,1163616,1164358,1164370,1164495,1165221,1167017,1167470,1169692,1171665,1171672,1173446,1173647,1174436,1174646,1176633,1176636,1177589

Propchange: db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 30 11:04:33 2011
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.7/java/client/org/apache/derby/client/net/NetCursor.java:1061570,1061578,1082235
-/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1104365,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1145961,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1162737,1163131,1163616,1164358,1164370,1164495,1165221,1167017,1167470,1169692,1171665,1171672,1173647,1174436,1176633,1176636
+/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1104365,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1145961,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1162737,1163131,1163616,1164358,1164370,1164495,1165221,1167017,1167470,1169692,1171665,1171672,1173647,1174436,1176633,1176636,1177589

Modified: db/derby/code/branches/10.8/java/demo/toursdb/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/demo/toursdb/build.xml?rev=1177591&r1=1177590&r2=1177591&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/demo/toursdb/build.xml (original)
+++ db/derby/code/branches/10.8/java/demo/toursdb/build.xml Fri Sep 30 11:04:33 2011
@@ -89,11 +89,12 @@
     <java classname="toursdb.insertMaps"
           output="${generated.toursdb.dir}/toursdb.out" append="true"
           failonerror="true"
-          dir="${generated.toursdb.dir}" fork="true">
+          dir="${derby.demo.src.dir}/toursdb" fork="true">
       <classpath>
         <pathelement path="${out.dir}"/>
         <pathelement path="${compile.classpath}"/>
       </classpath>
+      <sysproperty key="derby.system.home" value="${generated.toursdb.dir}"/>
     </java>
     <java classname="org.apache.derby.tools.ij"
           output="${generated.toursdb.dir}/toursdb.out" append="true"

Modified: db/derby/code/branches/10.8/java/demo/toursdb/insertMaps.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/demo/toursdb/insertMaps.java?rev=1177591&r1=1177590&r2=1177591&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/demo/toursdb/insertMaps.java (original)
+++ db/derby/code/branches/10.8/java/demo/toursdb/insertMaps.java Fri Sep 30 11:04:33 2011
@@ -37,32 +37,21 @@ import java.sql.SQLException;
 public class insertMaps {
 
 	public static final String CSdriver = new String("org.apache.derby.jdbc.EmbeddedDriver");
-	public static final String dbURLCS = new String("jdbc:derby:toursDB");
+	public static final String dbURLCS = new String("jdbc:derby:toursdb");
 
 	public static void main(String[] args) throws Exception {
 
-		try {
-			Connection connCS = null;
-
-			System.out.println("Loading the Derby jdbc driver...");
-			Class.forName(CSdriver).newInstance();
+		System.out.println("Loading the Derby jdbc driver...");
+		Class.forName(CSdriver).newInstance();
 	
-			System.out.println("Getting Derby database connection...");
-			connCS = DriverManager.getConnection(dbURLCS);
-			System.out.println("Successfully got the Derby database connection...");
-
-			System.out.println("Inserted " + insertRows(null,connCS) + " rows into the ToursDB");
-
-			connCS.close();
-
-		} catch (SQLException e) {
-			System.out.println ("FAIL -- unexpected exception: " + e.toString());
-			e.printStackTrace();
-		} catch (Exception e) {
-			System.out.println ("FAIL -- unexpected exception: " + e.toString());
-			e.printStackTrace();
-		}
+		System.out.println("Getting Derby database connection...");
+		Connection connCS = DriverManager.getConnection(dbURLCS);
+		System.out.println("Successfully got the Derby database connection...");
+
+		System.out.println("Inserted " + insertRows(null, connCS) +
+						   " rows into the ToursDB");
 
+		connCS.close();
 	}
 	
 	public static int insertRows(String path, Connection conn) 



Mime
View raw message