You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by km...@apache.org on 2010/06/15 21:22:12 UTC
svn commit: r955014 - in /db/derby/code/branches/10.5: ./
java/tools/org/apache/derby/impl/tools/sysinfo/Main.java
Author: kmarsden
Date: Tue Jun 15 19:22:12 2010
New Revision: 955014
URL: http://svn.apache.org/viewvc?rev=955014&view=rev
Log:
DERBY-4597 remove references to IBM jcc driver from sysinfo
Contributed by Lily Wei lilywei at yahoo dot com
Modified:
db/derby/code/branches/10.5/ (props changed)
db/derby/code/branches/10.5/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java
Propchange: db/derby/code/branches/10.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 15 19:22:12 2010
@@ -1 +1 @@
-/db/derby/code/trunk:769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,792434,793089,793588,794106,794303,794955,795166,796020,796027,796316,796372,797147,798347,798742,800523,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,829022,832379,833430,835286,881074,881444,882732,884163,887246,892912,897161,901165,901648,901760,903108,908418,911315,915733,916075,916897,918359,921028,927430,946794,948045,948069,951346
+/db/derby/code/trunk:769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,792434,793089,793588,794106,794303,794955,795166,796020,796027,796316,796372,797147,798347,798742,800523,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,829022,832379,833430,835286,881074,881444,882732,884163,887246,892912,897161,901165,901648,901760,903108,908418,911315,915733,916075,916897,918359,921028,927430,946794,948045,948069,951346,955001
Modified: db/derby/code/branches/10.5/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java?rev=955014&r1=955013&r2=955014&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java (original)
+++ db/derby/code/branches/10.5/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java Tue Jun 15 19:22:12 2010
@@ -1007,63 +1007,6 @@ public static void getMainInfo (java.io.
private static ZipInfoProperties checkFile(String filename)
{
// try to create a ZipFile from it
-
- // Check to see if it's a version of db2jcc.jar and if so, report the version number.
- if (filename.indexOf("db2jcc") >= 0)
- {
- Class c = null;
- Method m = null;
- Object o = null;
- Integer build = null;
- Integer major = null;
- Integer minor = null;
- try
- {
- try
- {
- c = Class.forName("com.ibm.db2.jcc.DB2Driver");
- m = c.getMethod("getJCCBuildNumber", null);
- o = c.newInstance();
- build = (Integer)m.invoke(o,null);
- } catch (ClassNotFoundException cnfe) {
- c = Class.forName("com.ibm.db2.jcc.DB2Version");
- m = c.getMethod("getBuildNumber", null);
- o = c.newInstance();
- build = (Integer)m.invoke(o,null);
- }
- m = c.getMethod("getMajorVersion", null);
- major = (Integer)m.invoke(o,null);
- m = c.getMethod("getMinorVersion", null);
- minor = (Integer)m.invoke(o,null);
-
- ProductVersionHolder jccVersion = ProductVersionHolder.getProductVersionHolder(
- "IBM Corp.",
- "DB2 Java Common Client",
- "DRDA:jcc",
- major.intValue(),
- minor.intValue(),
- 0,
- 0,
- build.toString(),
- Boolean.FALSE);
-
- ZipInfoProperties zip = new ZipInfoProperties(jccVersion);
-
- String loc = getFileWhichLoadedClass(c);
- // For db2jcc.jar, report the actual file from which DB2Driver
- // was loaded, if we can determine it. For db2jcc_license_c,
- // report the filename from the classpath, and the version
- // info from the DB2Driver that we loaded. This is slightly
- // misleading, since db2jcc_license_c.jar doesn't really have
- // a "version", but the two jars are usually linked.
- if (loc != null && filename.indexOf("license_c") < 0)
- zip.setLocation(loc);
- else
- zip.setLocation(new File(filename).getCanonicalPath().replace('/', File.separatorChar));
- return zip;
- } catch (Exception e) { return null; }
- }
-
try
{
ZipFile zf = new ZipFile(filename);