Removed:
trunk/connector-mxj/README.txt
trunk/connector-mxj/TEST-com.mysql.management.AllTestsSuite.txt
trunk/connector-mxj/TEST-com.mysql.management.AllTestsSuite.xml
trunk/connector-mxj/index.html
Modified:
trunk/connector-mxj/CHANGES
trunk/connector-mxj/README.1st
trunk/connector-mxj/_dev_notes.txt
trunk/connector-mxj/build.xml
Log:
2008-02-18 - remove the out-of-date build targets for docs
- updated build.xml to reflect 5.0.9 release, some code tidy
- updated build.xml "usage" to reflect jmx comes with Java 1.5
- package (.tar.gz) and lib (.jar) and directory names now reflect
the full package name (version & gpl/commercial-bin/commercial-src)
- updated README.1st, removed obsolete README.txt & index.html
Modified: trunk/connector-mxj/CHANGES
===================================================================
--- trunk/connector-mxj/CHANGES 2008-02-18 18:20:38 UTC (rev 110)
+++ trunk/connector-mxj/CHANGES 2008-02-19 17:18:29 UTC (rev 111)
@@ -1,6 +1,13 @@
# Changelog
# $Id: CHANGES,v 1.14 2005/10/25 19:11:16 eherman Exp $
+2008-02-18 - remove the out-of-date build targets for docs
+ - updated build.xml to reflect 5.0.9 release, some code tidy
+ - updated build.xml "usage" to reflect jmx comes with Java 1.5
+ - package (.tar.gz) and lib (.jar) and directory names now reflect
+ the full package name (version & gpl/commercial-bin/commercial-src)
+ - updated README.1st, removed obsolete README.txt & index.html
+
2008-02-17 - swapped out gpl binaries for v5-0-51a
- swapped out commercial binaries for v5-0-54
- moved support-issue-8601-help-output.txt into src directory
Modified: trunk/connector-mxj/README.1st
===================================================================
--- trunk/connector-mxj/README.1st 2008-02-18 18:20:38 UTC (rev 110)
+++ trunk/connector-mxj/README.1st 2008-02-19 17:18:29 UTC (rev 111)
@@ -2,8 +2,8 @@
* License
* Description
+* Documentation
* Known Bugs
-* Documentation
LICENSE
@@ -15,7 +15,7 @@
file for more information.
If you have licensed this product under a commercial license from
-MySQL AB, please see the file "MySQLEULA.txt" that comes with this
+MySQL AB, please see the file "LICENSE.commercial.txt" that comes with this
distribution for the terms of the license.
If you need non-GPL licenses for commercial distribution please contact
@@ -36,23 +36,31 @@
Within those limits, the goal of being able to deploy, manage and use MySQL
simply and easily for java developers is still quite obtainable.
+DOCUMENTATION
+Documentation can be found at:
+http://dev.mysql.com/doc/refman/5.0/en/connector-mxj.html
+
KNOWN BUGS
This release only supports the following platforms:
* Linux-i386
- * SunOS-sparc
- * Mac OS X 10.3
- * WindowsXP/2000/NT x86
+ * SunOS-sparc,x86
+ * Mac OS X 10.3 ppc, 10.4 x86/ppc, 10.5 x86/ppc
+ * WindowsXP/2000/NT/Vista x86
We have included resources for Linux, Windows, OS X, and Sun platforms, but
have only done significant testing on Linux.
+When using jdbc:mysql:mxj:// urls, Connector/J and Connector/MXJ must be loaded
+by the same class-loader. This can be an issue if, for instance, the Connector/J
+jar file is in $APPSERVER/endorsed and the Connector/MXJ jars are in the local
+$WEB-APP/lib.
+
On some testing of Windows, the System started fine, but had trouble with
-shutdown. We believe this has been resolved as of version 5-0-5-beta.
+shutdown. We believe this has been resolved as of version 5-0-5-beta. If you
+see this issue (or any other) please document it at http://bugs.mysql.com/ or
+send email to <eric@stripped>.
-DOCUMENTATION
-
-Documentation can be found at:
-http://dev.mysql.com/doc/refman/5.0/en/connector-mxj.html
-
+----------
+
\ No newline at end of file
Deleted: trunk/connector-mxj/README.txt
===================================================================
--- trunk/connector-mxj/README.txt 2008-02-18 18:20:38 UTC (rev 110)
+++ trunk/connector-mxj/README.txt 2008-02-19 17:18:29 UTC (rev 111)
@@ -1,3 +0,0 @@
-MySQL Connector/MXJ documenation is posted here:
-http://dev.mysql.com/doc/refman/5.0/en/connector-mxj.html
-
Deleted: trunk/connector-mxj/TEST-com.mysql.management.AllTestsSuite.txt
===================================================================
--- trunk/connector-mxj/TEST-com.mysql.management.AllTestsSuite.txt 2008-02-18 18:20:38 UTC (rev 110)
+++ trunk/connector-mxj/TEST-com.mysql.management.AllTestsSuite.txt 2008-02-19 17:18:29 UTC (rev 111)
@@ -1,120 +0,0 @@
-Testsuite: com.mysql.management.AllTestsSuite
-Tests run: 111, Failures: 0, Errors: 0, Time elapsed: 190.487 sec
-------------- Standard Output ---------------
-EMMA: collecting runtime coverage data ...
-------------- ---------------- ---------------
-------------- Standard Error -----------------
-kill 20282: No such process
-------------- ---------------- ---------------
-
-Testcase: testGetCause took 0.016 sec
-Testcase: testEmptyList took 0.009 sec
-Testcase: testList took 0.001 sec
-Testcase: testGetChanged took 0.02 sec
-Testcase: testContainsValue took 0.002 sec
-Testcase: testGetAndGetDefault took 0 sec
-Testcase: testContainsKey took 0 sec
-Testcase: testClearAndIsEmpty took 0.001 sec
-Testcase: testEntrySet took 0.01 sec
-Testcase: testPutAll took 0.001 sec
-Testcase: testRemove took 0 sec
-Testcase: testValues took 0.001 sec
-Testcase: testPutUnchangedOriginal took 0.001 sec
-Testcase: testNullSafeEquals took 0.002 sec
-Testcase: testToRuntime took 0.002 sec
-Testcase: testToSQLException took 0.012 sec
-Testcase: testReturnBlock took 0.003 sec
-Testcase: testReturnBlockThrows took 0.007 sec
-Testcase: testVoidBlock took 0.003 sec
-Testcase: testRunSQLBlock took 0.027 sec
-Testcase: testConstructions took 0.034 sec
-Testcase: testSwallowExceptionBlockExec took 0.005 sec
-Testcase: testTempDir took 0.002 sec
-Testcase: testDeleteTree took 0.008 sec
-Testcase: testMakeExecutable took 0.012 sec
-Testcase: testValidCononicalDir took 0.034 sec
-Testcase: testGetters took 0.001 sec
-Testcase: testEquallity took 0.001 sec
-Testcase: testToString took 0 sec
-Testcase: testHashCode took 0 sec
-Testcase: testSetter took 0 sec
-Testcase: testGetKeys took 0.011 sec
-Testcase: testReport took 0.002 sec
-Testcase: testPrintAllProperties took 0.006 sec
-Testcase: testPlatformMain took 0.004 sec
-Testcase: testNullPid took 0.025 sec
-Testcase: testPidWithEOL took 0.001 sec
-Testcase: testKillCommandLineUnix took 0.001 sec
-Testcase: testKillCommandLineWindows took 0.912 sec
-Testcase: testForce took 0.001 sec
-Testcase: testIsRunning took 0.001 sec
-Testcase: testFileCreation took 0.26 sec
-Testcase: testImplemented took 0.021 sec
-Testcase: testStub took 0.01 sec
-Testcase: testStub took 0.034 sec
-Testcase: testCompletionListener took 0.061 sec
-Testcase: testShellReturnsWithReturnCode took 0.003 sec
-Testcase: testSetters took 0.511 sec
-Testcase: testDoubleRun took 0.028 sec
-Testcase: testShellThrowsIfNotYetReturned took 0.002 sec
-Testcase: testDestroy took 0.034 sec
-Testcase: testForThrownExceptions took 0.002 sec
-Testcase: testStreamsCopyErrorSilent took 0.004 sec
-Testcase: testStreamsCopyError took 0.001 sec
-Testcase: testStreamConnector took 0.024 sec
-Testcase: testContainsIgnoreCase took 0.011 sec
-Testcase: testShortName took 0.001 sec
-Testcase: testReplaceNullStringWithNull took 0.047 sec
-Testcase: testDefaultConstruction took 0.001 sec
-Testcase: testComposition took 0.021 sec
-Testcase: testMultipleConnectionsAndShutdownListener took 0.006 sec
-Testcase: testDefaultAnd3306 took 0.002 sec
-Testcase: testOptionParser took 0.047 sec
-Testcase: testTrimOptionsErrorMsg took 0.004 sec
-Testcase: testOptionParserSupportIssue8601 took 0.19 sec
-Testcase: testGetMysqldDynamicMBean took 0.136 sec
-Testcase: testGetHostAndPort took 0.002 sec
-Testcase: testTransformProperties took 0.002 sec
-Testcase: testGetMysqldObjectName took 0.003 sec
-Testcase: testNameMatch took 0.001 sec
-Testcase: testAutoStart took 0.096 sec
-Testcase: testAutoStart took 0.003 sec
-Testcase: testGetMBeanInfo took 0.007 sec
-Testcase: testGetAttribute took 0.003 sec
-Testcase: testGetAttributeList took 0.008 sec
-Testcase: testGetAgentVersion took 0.002 sec
-Testcase: testSetAttributes took 0.01 sec
-Testcase: testSetAttribute took 0.001 sec
-Testcase: testInvoke took 0.006 sec
-Testcase: testPassOptionsMapToMysqld took 0.012 sec
-Testcase: testFreezeAttributes took 0.001 sec
-Testcase: testAttributesFrozenWhenRunning took 0.002 sec
-Testcase: testAutoStart took 0.004 sec
-Testcase: testNoAutoStart took 0.001 sec
-Testcase: testCreateAndDestroy took 0.012 sec
-Testcase: testConnectorMXJPropertiesTransformDefaultConstructor took 0.716 sec
-Testcase: testEverything took 21.181 sec
-Testcase: testJBossDefaultConstructor took 1.249 sec
-Testcase: testLaunch took 15.832 sec
-Testcase: testUseDatabase took 14.321 sec
-Testcase: testGetFileName took 0.061 sec
-Testcase: testWindowsFileName took 0.063 sec
-Testcase: testUglyPlatformName took 0.06 sec
-Testcase: testGetMysqldNative took 4.724 sec
-Testcase: testGetMysqldWinNT took 2.85 sec
-Testcase: testGetMysqldLinux took 4.598 sec
-Testcase: testUnknownOs took 0.064 sec
-Testcase: testCreateDbFiles took 3.826 sec
-Testcase: testServerOptions took 9.327 sec
-Testcase: testTestReporting took 0.067 sec
-Testcase: testForceKill took 11.947 sec
-Testcase: testDestroyShell took 15.171 sec
-Testcase: testVersion took 0.065 sec
-Testcase: testNoPidFile took 15.053 sec
-Testcase: testTestFinalize took 0.065 sec
-Testcase: testUsage took 0.067 sec
-Testcase: testJarName took 0.068 sec
-Testcase: testCanConnectToServer took 14.479 sec
-Testcase: testMain took 29.511 sec
-Testcase: testCreateUser took 16.52 sec
-Testcase: testServerDriverLauncherFactory took 5.721 sec
Deleted: trunk/connector-mxj/TEST-com.mysql.management.AllTestsSuite.xml
===================================================================
--- trunk/connector-mxj/TEST-com.mysql.management.AllTestsSuite.xml 2008-02-18 18:20:38 UTC (rev 110)
+++ trunk/connector-mxj/TEST-com.mysql.management.AllTestsSuite.xml 2008-02-19 17:18:29 UTC (rev 111)
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="com.mysql.management.AllTestsSuite" tests="110" failures="0" errors="0" time="86.441">
- <properties>
- <property name="java.vendor" value="Sun Microsystems Inc."></property>
- <property name="docs.DocBookXSL" value="/usr/local/share/docbook-xsl-1.67.2"></property>
- <property name="eclipse.pdebuild.templates" value="/home/eric/eclipse/plugins/org.eclipse.pde.build_3.2.0.v20060217/templates//"></property>
- <property name="dist" value="/tmp/cmxj-build/dist"></property>
- <property name="os.name" value="Linux"></property>
- <property name="sun.boot.class.path" value="/home/java/j2sdk1.4.2_10/jre/lib/rt.jar:/home/java/j2sdk1.4.2_10/jre/lib/i18n.jar:/home/java/j2sdk1.4.2_10/jre/lib/sunrsasign.jar:/home/java/j2sdk1.4.2_10/jre/lib/jsse.jar:/home/java/j2sdk1.4.2_10/jre/lib/jce.jar:/home/java/j2sdk1.4.2_10/jre/lib/charsets.jar:/home/java/j2sdk1.4.2_10/jre/classes"></property>
- <property name="tmp" value="/tmp/cmxj-build"></property>
- <property name="sun.java2d.fontpath" value=""></property>
- <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."></property>
- <property name="ant.home" value="/home/eric/eclipse/plugins/org.apache.ant_1.6.5"></property>
- <property name="java.runtime.version" value="1.4.2_10-b03"></property>
- <property name="additional-libs" value="/home/eric/libs"></property>
- <property name="user.name" value="eric"></property>
- <property name="emma.coverage.dir" value="/home/eric/ews-work/connector-mxj/misc/emma-results"></property>
- <property name="stage-root" value="/tmp/cmxj-build/stage"></property>
- <property name="user.language" value="en"></property>
- <property name="build" value="/tmp/cmxj-build/build"></property>
- <property name="sun.boot.library.path" value="/home/java/j2sdk1.4.2_10/jre/lib/i386"></property>
- <property name="ant.project.name" value="MySQL JMX"></property>
- <property name="java.version" value="1.4.2_10"></property>
- <property name="user.timezone" value=""></property>
- <property name="sun.arch.data.model" value="32"></property>
- <property name="emma.coverage.out.file" value="/home/eric/ews-work/connector-mxj/misc/emma-results/coverage.emma"></property>
- <property name="java.endorsed.dirs" value="/home/java/j2sdk1.4.2_10/jre/lib/endorsed"></property>
- <property name="sun.cpu.isalist" value=""></property>
- <property name="file.encoding.pkg" value="sun.io"></property>
- <property name="file.separator" value="/"></property>
- <property name="java.specification.name" value="Java Platform API Specification"></property>
- <property name="docs.LinksPath" value="/usr/bin/links"></property>
- <property name="java.class.version" value="48.0"></property>
- <property name="src" value="/home/eric/ews-work/connector-mxj/src"></property>
- <property name="docs.sourceDir" value="/home/eric/bktmp/mysqldoc/Docs/mxj.xml"></property>
- <property name="misc" value="/home/eric/ews-work/connector-mxj/misc"></property>
- <property name="user.country" value="US"></property>
- <property name="java.home" value="/home/java/j2sdk1.4.2_10/jre"></property>
- <property name="java.vm.info" value="mixed mode"></property>
- <property name="ant.file" value="/home/eric/ews-work/connector-mxj/build.xml"></property>
- <property name="os.version" value="2.6.16-1.2096_FC4"></property>
- <property name="path.separator" value=":"></property>
- <property name="java.vm.version" value="1.4.2_10-b03"></property>
- <property name="java.util.prefs.PreferencesFactory" value="java.util.prefs.FileSystemPreferencesFactory"></property>
- <property name="ant.library.dir" value="/home/eric/eclipse/plugins/org.apache.ant_1.6.5/lib"></property>
- <property name="mxj-version" value="5-0-2"></property>
- <property name="stage-cmxj" value="/tmp/cmxj-build/stage/connector-mxj"></property>
- <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"></property>
- <property name="sun.io.unicode.encoding" value="UnicodeLittle"></property>
- <property name="junit.results" value="/home/eric/ews-work/connector-mxj/misc/junit-results"></property>
- <property name="eclipse.pdebuild.scripts" value="/home/eric/eclipse/plugins/org.eclipse.pde.build_3.2.0.v20060217/scripts//"></property>
- <property name="user.home" value="/home/eric"></property>
- <property name="java.specification.vendor" value="Sun Microsystems Inc."></property>
- <property name="java.library.path" value="/home/java/j2sdk1.4.2_10/jre/lib/i386/client:/home/java/j2sdk1.4.2_10/jre/lib/i386:/home/java/j2sdk1.4.2_10/jre/../lib/i386:/usr/lib/mozilla-1.7.12"></property>
- <property name="java.vendor.url" value="http://java.sun.com/"></property>
- <property name="java.vm.vendor" value="Sun Microsystems Inc."></property>
- <property name="java.runtime.name" value="Java(TM) 2 Runtime Environment, Standard Edition"></property>
- <property name="java.class.path" value="/home/eric/libs/c-j-5-head.jar:/home/eric/libs/jmxri.jar:/home/eric/libs/jmxtools.jar:/home/eric/libs/junit.jar:/tmp/cmxj-build/build:/tmp/cmxj-build/stage/connector-mxj/connector-mxj.jar:/home/eric/ews-work/connector-j-5-0/src/lib-coverage/emma.jar:/home/eric/ews-work/connector-j-5-0/src/lib-coverage/emma_ant.jar:/home/eric/ews-work/connector-j-5-0/src/lib/junit.jar:/home/eric/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-launcher.jar:/home/eric/eclipse/plugins/org.apache.ant_1.6.5/lib/ant.jar:/home/eric/eclipse/plugins/org.apache.ant_1.6.5/lib/ant-junit.jar"></property>
- <property name="ant.version" value="Apache Ant version 1.6.5 compiled on June 2 2005"></property>
- <property name="java.vm.specification.name" value="Java Virtual Machine Specification"></property>
- <property name="java.vm.specification.version" value="1.0"></property>
- <property name="sun.cpu.endian" value="little"></property>
- <property name="sun.os.patch.level" value="unknown"></property>
- <property name="eclipse.pdebuild.home" value="/home/eric/eclipse/plugins/org.eclipse.pde.build_3.2.0.v20060217/.//"></property>
- <property name="java.io.tmpdir" value="/tmp"></property>
- <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"></property>
- <property name="os.arch" value="i386"></property>
- <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"></property>
- <property name="docs.FopPath" value="/usr/java/fop-0.20.5/fop.sh"></property>
- <property name="java.ext.dirs" value="/home/java/j2sdk1.4.2_10/jre/lib/ext"></property>
- <property name="user.dir" value="/home/eric/ews-work/connector-mxj"></property>
- <property name="emma.dir" value="/home/eric/ews-work/connector-j-5-0/src/lib-coverage"></property>
- <property name="emma.coverage.out.merge" value="true"></property>
- <property name="ant.file.MySQL JMX" value="/home/eric/ews-work/connector-mxj/build.xml"></property>
- <property name="line.separator" value="
-"></property>
- <property name="java.vm.name" value="Java HotSpot(TM) Client VM"></property>
- <property name="basedir" value="/home/eric/ews-work/connector-mxj"></property>
- <property name="ant.java.version" value="1.4"></property>
- <property name="file.encoding" value="UTF-8"></property>
- <property name="java.specification.version" value="1.4"></property>
- </properties>
- <testcase name="testGetCause" classname="com.mysql.management.util.CausedSQLExceptionTest" time="0.0060"></testcase>
- <testcase name="testEmptyList" classname="com.mysql.management.util.CommandLineOptionsParserTest" time="0.0030"></testcase>
- <testcase name="testList" classname="com.mysql.management.util.CommandLineOptionsParserTest" time="0.0020"></testcase>
- <testcase name="testGetChanged" classname="com.mysql.management.util.DefaultsMapTest" time="0.0050"></testcase>
- <testcase name="testContainsValue" classname="com.mysql.management.util.DefaultsMapTest" time="0.0"></testcase>
- <testcase name="testGetAndGetDefault" classname="com.mysql.management.util.DefaultsMapTest" time="0.0"></testcase>
- <testcase name="testContainsKey" classname="com.mysql.management.util.DefaultsMapTest" time="0.0010"></testcase>
- <testcase name="testClearAndIsEmpty" classname="com.mysql.management.util.DefaultsMapTest" time="0.0030"></testcase>
- <testcase name="testEntrySet" classname="com.mysql.management.util.DefaultsMapTest" time="0.0020"></testcase>
- <testcase name="testPutAll" classname="com.mysql.management.util.DefaultsMapTest" time="0.0"></testcase>
- <testcase name="testRemove" classname="com.mysql.management.util.DefaultsMapTest" time="0.0010"></testcase>
- <testcase name="testValues" classname="com.mysql.management.util.DefaultsMapTest" time="0.0"></testcase>
- <testcase name="testPutUnchangedOriginal" classname="com.mysql.management.util.DefaultsMapTest" time="0.0"></testcase>
- <testcase name="testNullSafeEquals" classname="com.mysql.management.util.EqualsTest" time="0.0010"></testcase>
- <testcase name="testToRuntime" classname="com.mysql.management.util.ExceptionsTest" time="0.0"></testcase>
- <testcase name="testToSQLException" classname="com.mysql.management.util.ExceptionsTest" time="0.0"></testcase>
- <testcase name="testReturnBlock" classname="com.mysql.management.util.ExceptionsTest" time="0.0010"></testcase>
- <testcase name="testReturnBlockThrows" classname="com.mysql.management.util.ExceptionsTest" time="0.0"></testcase>
- <testcase name="testVoidBlock" classname="com.mysql.management.util.ExceptionsTest" time="0.0010"></testcase>
- <testcase name="testRunSQLBlock" classname="com.mysql.management.util.ExceptionsTest" time="0.0040"></testcase>
- <testcase name="testConstructions" classname="com.mysql.management.util.ExceptionsTest" time="0.0040"></testcase>
- <testcase name="testSwallowExceptionBlockExec" classname="com.mysql.management.util.ExceptionsTest" time="0.0020"></testcase>
- <testcase name="testTempDir" classname="com.mysql.management.util.FilesTest" time="0.0"></testcase>
- <testcase name="testDeleteTree" classname="com.mysql.management.util.FilesTest" time="0.0060"></testcase>
- <testcase name="testMakeExecutable" classname="com.mysql.management.util.FilesTest" time="0.0030"></testcase>
- <testcase name="testValidCononicalDir" classname="com.mysql.management.util.FilesTest" time="0.0060"></testcase>
- <testcase name="testGetters" classname="com.mysql.management.util.MapEntryTest" time="0.0"></testcase>
- <testcase name="testEquallity" classname="com.mysql.management.util.MapEntryTest" time="0.0"></testcase>
- <testcase name="testToString" classname="com.mysql.management.util.MapEntryTest" time="0.0"></testcase>
- <testcase name="testHashCode" classname="com.mysql.management.util.MapEntryTest" time="0.0"></testcase>
- <testcase name="testSetter" classname="com.mysql.management.util.MapEntryTest" time="0.0010"></testcase>
- <testcase name="testGetKeys" classname="com.mysql.management.util.PlatformTest" time="0.0020"></testcase>
- <testcase name="testReport" classname="com.mysql.management.util.PlatformTest" time="0.0"></testcase>
- <testcase name="testPrintAllProperties" classname="com.mysql.management.util.PlatformTest" time="0.0010"></testcase>
- <testcase name="testPlatformMain" classname="com.mysql.management.util.PlatformTest" time="0.0010"></testcase>
- <testcase name="testNullPid" classname="com.mysql.management.util.ProcessUtilTest" time="0.0060"></testcase>
- <testcase name="testPidWithEOL" classname="com.mysql.management.util.ProcessUtilTest" time="0.0"></testcase>
- <testcase name="testKillCommandLineUnix" classname="com.mysql.management.util.ProcessUtilTest" time="0.0"></testcase>
- <testcase name="testKillCommandLineWindows" classname="com.mysql.management.util.ProcessUtilTest" time="0.054"></testcase>
- <testcase name="testForce" classname="com.mysql.management.util.ProcessUtilTest" time="0.0010"></testcase>
- <testcase name="testIsRunning" classname="com.mysql.management.util.ProcessUtilTest" time="0.0"></testcase>
- <testcase name="testFileCreation" classname="com.mysql.management.util.ProcessUtilTest" time="0.053"></testcase>
- <testcase name="testImplemented" classname="com.mysql.management.util.RuntimeTest" time="0.0050"></testcase>
- <testcase name="testStub" classname="com.mysql.management.util.RuntimeTest" time="0.0020"></testcase>
- <testcase name="testStub" classname="com.mysql.management.util.ShellTest" time="0.0050"></testcase>
- <testcase name="testCompletionListener" classname="com.mysql.management.util.ShellTest" time="0.026"></testcase>
- <testcase name="testShellReturnsWithReturnCode" classname="com.mysql.management.util.ShellTest" time="0.0010"></testcase>
- <testcase name="testSetters" classname="com.mysql.management.util.ShellTest" time="0.094"></testcase>
- <testcase name="testDoubleRun" classname="com.mysql.management.util.ShellTest" time="0.023"></testcase>
- <testcase name="testShellThrowsIfNotYetReturned" classname="com.mysql.management.util.ShellTest" time="0.0010"></testcase>
- <testcase name="testDestroy" classname="com.mysql.management.util.ShellTest" time="0.023"></testcase>
- <testcase name="testForThrownExceptions" classname="com.mysql.management.util.ShellTest" time="0.0010"></testcase>
- <testcase name="testStreamsCopyErrorSilent" classname="com.mysql.management.util.StreamsTest" time="0.0010"></testcase>
- <testcase name="testStreamsCopyError" classname="com.mysql.management.util.StreamsTest" time="0.0"></testcase>
- <testcase name="testStreamConnector" classname="com.mysql.management.util.StreamConnectorTest" time="0.022"></testcase>
- <testcase name="testContainsIgnoreCase" classname="com.mysql.management.util.StrTest" time="0.0010"></testcase>
- <testcase name="testShortName" classname="com.mysql.management.util.StrTest" time="0.0"></testcase>
- <testcase name="testReplaceNullStringWithNull" classname="com.mysql.management.driverlaunched.ServerLauncherSocketFactoryTest" time="0.0060"></testcase>
- <testcase name="testDefaultConstruction" classname="com.mysql.management.driverlaunched.ServerLauncherSocketFactoryTest" time="0.0"></testcase>
- <testcase name="testComposition" classname="com.mysql.management.driverlaunched.ServerLauncherSocketFactoryTest" time="0.0050"></testcase>
- <testcase name="testMultipleConnectionsAndShutdownListener" classname="com.mysql.management.driverlaunched.ServerLauncherSocketFactoryTest" time="0.0010"></testcase>
- <testcase name="testDefaultAnd3306" classname="com.mysql.management.driverlaunched.ServerLauncherSocketFactoryTest" time="0.0"></testcase>
- <testcase name="testOptionParser" classname="com.mysql.management.HelpOptionsParserTest" time="0.015"></testcase>
- <testcase name="testTrimOptionsErrorMsg" classname="com.mysql.management.HelpOptionsParserTest" time="0.0010"></testcase>
- <testcase name="testOptionParserSupportIssue8601" classname="com.mysql.management.HelpOptionsParserTest" time="0.012"></testcase>
- <testcase name="testGetMysqldDynamicMBean" classname="com.mysql.management.jmx.ConnectorMXJPropertiesTransformTest" time="0.027"></testcase>
- <testcase name="testGetHostAndPort" classname="com.mysql.management.jmx.ConnectorMXJPropertiesTransformTest" time="0.0010"></testcase>
- <testcase name="testTransformProperties" classname="com.mysql.management.jmx.ConnectorMXJPropertiesTransformTest" time="0.0"></testcase>
- <testcase name="testGetMysqldObjectName" classname="com.mysql.management.jmx.ConnectorMXJPropertiesTransformTest" time="0.0030"></testcase>
- <testcase name="testNameMatch" classname="com.mysql.management.jmx.ConnectorMXJPropertiesTransformTest" time="0.0010"></testcase>
- <testcase name="testAutoStart" classname="com.mysql.management.jmx.MysqldDynamicMBeanTest" time="0.017"></testcase>
- <testcase name="testAutoStart" classname="com.mysql.management.jmx.SimpleMysqldDynamicMBeanTest" time="0.0010"></testcase>
- <testcase name="testGetMBeanInfo" classname="com.mysql.management.jmx.SimpleMysqldDynamicMBeanTest" time="0.0010"></testcase>
- <testcase name="testGetAttribute" classname="com.mysql.management.jmx.SimpleMysqldDynamicMBeanTest" time="0.0010"></testcase>
- <testcase name="testGetAttributeList" classname="com.mysql.management.jmx.SimpleMysqldDynamicMBeanTest" time="0.0030"></testcase>
- <testcase name="testGetAgentVersion" classname="com.mysql.management.jmx.SimpleMysqldDynamicMBeanTest" time="0.0010"></testcase>
- <testcase name="testSetAttributes" classname="com.mysql.management.jmx.SimpleMysqldDynamicMBeanTest" time="0.0020"></testcase>
- <testcase name="testSetAttribute" classname="com.mysql.management.jmx.SimpleMysqldDynamicMBeanTest" time="0.0020"></testcase>
- <testcase name="testInvoke" classname="com.mysql.management.jmx.SimpleMysqldDynamicMBeanTest" time="0.0020"></testcase>
- <testcase name="testPassOptionsMapToMysqld" classname="com.mysql.management.jmx.SimpleMysqldDynamicMBeanTest" time="0.0020"></testcase>
- <testcase name="testFreezeAttributes" classname="com.mysql.management.jmx.SimpleMysqldDynamicMBeanTest" time="0.0"></testcase>
- <testcase name="testAttributesFrozenWhenRunning" classname="com.mysql.management.jmx.SimpleMysqldDynamicMBeanTest" time="0.0010"></testcase>
- <testcase name="testAutoStart" classname="com.mysql.management.jmx.jboss.JBossMysqldDynamicMBeanTest" time="0.0010"></testcase>
- <testcase name="testNoAutoStart" classname="com.mysql.management.jmx.jboss.JBossMysqldDynamicMBeanTest" time="0.0"></testcase>
- <testcase name="testCreateAndDestroy" classname="com.mysql.management.jmx.jboss.JBossMysqldDynamicMBeanTest" time="0.0030"></testcase>
- <testcase name="testConnectorMXJPropertiesTransformDefaultConstructor" classname="com.mysql.management.jmx.AcceptanceTest" time="0.096"></testcase>
- <testcase name="testEverything" classname="com.mysql.management.jmx.AcceptanceTest" time="13.933"></testcase>
- <testcase name="testJBossDefaultConstructor" classname="com.mysql.management.jmx.AcceptanceTest" time="0.252"></testcase>
- <testcase name="testLaunch" classname="com.mysql.management.MysqldResourceTest" time="8.131"></testcase>
- <testcase name="testUseDatabase" classname="com.mysql.management.MysqldResourceTest" time="7.824"></testcase>
- <testcase name="testGetFileName" classname="com.mysql.management.MysqldResourceTest" time="0.056"></testcase>
- <testcase name="testWindowsFileName" classname="com.mysql.management.MysqldResourceTest" time="0.056"></testcase>
- <testcase name="testUglyPlatformName" classname="com.mysql.management.MysqldResourceTest" time="0.056"></testcase>
- <testcase name="testGetMysqldNative" classname="com.mysql.management.MysqldResourceTest" time="0.88"></testcase>
- <testcase name="testGetMysqldWinNT" classname="com.mysql.management.MysqldResourceTest" time="0.503"></testcase>
- <testcase name="testGetMysqldLinux" classname="com.mysql.management.MysqldResourceTest" time="0.841"></testcase>
- <testcase name="testUnknownOs" classname="com.mysql.management.MysqldResourceTest" time="0.057"></testcase>
- <testcase name="testCreateDbFiles" classname="com.mysql.management.MysqldResourceTest" time="0.533"></testcase>
- <testcase name="testServerOptions" classname="com.mysql.management.MysqldResourceTest" time="2.045"></testcase>
- <testcase name="testTestReporting" classname="com.mysql.management.MysqldResourceTest" time="0.058"></testcase>
- <testcase name="testForceKill" classname="com.mysql.management.MysqldResourceTest" time="6.563"></testcase>
- <testcase name="testDestroyShell" classname="com.mysql.management.MysqldResourceTest" time="7.323"></testcase>
- <testcase name="testVersion" classname="com.mysql.management.MysqldResourceTest" time="0.057"></testcase>
- <testcase name="testNoPidFile" classname="com.mysql.management.MysqldResourceTest" time="7.79"></testcase>
- <testcase name="testTestFinalize" classname="com.mysql.management.MysqldResourceTest" time="0.059"></testcase>
- <testcase name="testUsage" classname="com.mysql.management.MysqldResourceTest" time="0.056"></testcase>
- <testcase name="testJarName" classname="com.mysql.management.MysqldResourceTest" time="0.056"></testcase>
- <testcase name="testMain" classname="com.mysql.management.AcceptanceTest" time="16.628"></testcase>
- <testcase name="testCreateUser" classname="com.mysql.management.AcceptanceTest" time="8.645"></testcase>
- <testcase name="testServerDriverLauncherFactory" classname="com.mysql.management.driverlaunched.AcceptanceTest" time="3.441"></testcase>
- <system-out><![CDATA[EMMA: collecting runtime coverage data ...
-]]></system-out>
- <system-err><![CDATA[]]></system-err>
-</testsuite>
Modified: trunk/connector-mxj/_dev_notes.txt
===================================================================
--- trunk/connector-mxj/_dev_notes.txt 2008-02-18 18:20:38 UTC (rev 110)
+++ trunk/connector-mxj/_dev_notes.txt 2008-02-19 17:18:29 UTC (rev 111)
@@ -5,22 +5,17 @@
---------
TODO:
- * make package (.tar.gz) and lib (.jar) naming consistent with Connector/J
- * Replace option parsing with pre-parsed options table read from resources
- * Make documentation note about problems with using jdbc:mysql:mxj urls
- when C/J and C/MXJ files are not loaded by the same classloader.
- * move jars into lib-nodist, and double-check that no-dist really isn't
- published on our site from a public checkout
- * either update the docs in the jar, or get rid of them.
- * remove the out-of-date build targets for docs, or update them
- * find a way to build without the Sun jmx tools that do not come standard
- with 1.5
- * update the downloads page to reflect current docs
- * update jar names in docs
- * mention jmx comes with Java 1.5
+(some may be post 5.0.x GA):
* decouple mysqld version - make binary db-files.jar a separate download.
* finish up work with Kent so that the db-files.jar are an output of the
server builds
+ * check that no-dist really isn't published on our site from a public checkout
+
+performance/feature enhancemnt:
+ * Replace option parsing with pre-parsed options table read from resources
+ * find a way to build without the Sun jmx tools that do not come standard
+ with 1.5 and without having to specify special command line to ant
+
---------
ROLLING A CONNECTOR/MXJ DISTRO
Modified: trunk/connector-mxj/build.xml
===================================================================
--- trunk/connector-mxj/build.xml 2008-02-18 18:20:38 UTC (rev 110)
+++ trunk/connector-mxj/build.xml 2008-02-19 17:18:29 UTC (rev 111)
@@ -22,10 +22,10 @@
<project name="MySQL JMX" basedir="." default="usage">
<description>A Java Wrapper for MySQL</description>
- <property name="mxj-version" value="5-0-8-beta" />
- <property name="gpl-mysqld-version" value="5-0-45" />
- <!-- property name="gpl-mysqld-version" value="5-1-18" / -->
- <property name="commercial-mysqld-version" value="5-0-46" />
+ <property name="mxj-version" value="5-0-9" />
+ <property name="gpl-mysqld-version" value="5-0-51a" />
+ <!-- property name="gpl-mysqld-version" value="5-1-23" / -->
+ <property name="commercial-mysqld-version" value="5-0-54" />
<property name="src" location="src" />
<property name="misc" location="misc" />
@@ -33,25 +33,12 @@
<property name="tmp" location="${java.io.tmpdir}/cmxj-build" />
<property name="build" location="${tmp}/build" />
<property name="stage-root" location="${tmp}/stage" />
- <property name="stage-cmxj" location="${stage-root}/connector-mxj" />
<property name="dist" location="${tmp}/dist" />
<property name="emma.dir" value="./lib-coverage" />
<property name="emma.coverage.dir" location="${misc}/emma-results" />
<property name="junit.results" location="${misc}/junit-results" />
-
- <!--
- The following four properties are needed for building the docs.
- They're set to the defaults for my development environment, but
- can be passed on the command line to ant via -D switches.
- -->
- <property name="docs.sourceDir" value="/home/eric/bktmp/mysqldoc/Docs/mxj.xml" />
- <property name="docs.DocBookXSL" value="/usr/local/share/docbook-xsl-1.67.2" />
- <property name="docs.FopPath" value="/usr/java/fop-0.20.5/fop.sh" />
- <property name="docs.LinksPath" value="/usr/bin/links" />
-
-
<path id="project.build.classpath">
<fileset dir="lib">
<include name="**/*.jar" />
@@ -62,40 +49,54 @@
</path>
<target name="usage">
- <echo>Targets: </echo>
- <echo> dist - for a standard distribution set</echo>
- <echo> output in: ${java.io.tmpdir}/connector-mxj</echo>
- <echo> set "no.test" to true to avoid inclusion of the tests</echo>
- <echo> in the "connector-mxj.jar"</echo>
- <echo> set "source.only" to true to avoid inclusion of:</echo>
- <echo> connector-mxj.jar</echo>
- <echo> set "no.aspectj" to true to skip building logging</echo>
<echo>
+Targets:
+ dist - for a standard distribution set
+ dist will output to ${tmp}
+
+ set "no.test" to true to avoid inclusion of the tests
+ in the "mysql-connector-mxj-gpl-${mxj-version}.jar"
+ set "source.only" to true to avoid inclusion of:
+ mysql-connector-mxj-gpl-${mxj-version}.jar
+ set "no.aspectj" to true to skip building trace-logging
+
+ clean - to removes the ${tmp} directory
+
+ usage - prints this message
+
+ usage-html-test-agent - (html test agent is not built by default)
+
+The CLASSPATH must satisfy the following external dependencies:
+ * MySQL Connector/J JDBC driver:
+ http://dev.mysql.com/downloads/connector/j/5.0.html
+ * JUnit (if tests included)
+ http://www.junit.org
+ * a JMX 1.2 implementation (as of Java 5, JMX is included)
+ a separate download is available for Java 1.4
+ http://java.sun.com/products/JavaManagement/
</echo>
- <echo> clean - to removes the ${tmp} directory </echo>
+ </target>
+
+ <target name="usage-html-test-agent">
<echo>
+The html test agent is not be built by default.
+ It may be built if the SUN JMX reference
+ implementation is available:
+ http://java.sun.com/products/JavaManagement/
+ * set "sunri.present" from the ant command-line
+ ant -Dsunri.present=true dist
+
+ The "MysqldTestAgentSunHtmlAdaptor" references the
+ "com.sun.jdmk.comm.HtmlAdaptorServer" which is not
+ included in Java 5.
+
+ This "test agent" is a stand-alone JMX agent with
+ exactly two beans:
+ 1) a MysqldDynamicMBean
+ 2) a Broswer Interface for management
+
+The html test agent may be useful for demo or test.
</echo>
- <echo> These have the following external dependencies which</echo>
- <echo> the classpath must satisfy:</echo>
- <echo>
- </echo>
- <echo> * a JMX 1.2 implementation </echo>
- <echo> * MySQL Connector/J JDBC driver:</echo>
- <echo> http://dev.mysql.com/downloads/connector/j/5.0.html</echo>
- <echo>
- </echo>
- <echo>The "testagent" will be built if it can satisfy the dependecy: </echo>
- <echo> * the SUN JMX reference implementation: </echo>
- <echo> http://java.sun.com/products/JavaManagement/</echo>
- <echo> * set "sunri.present" from the ant command-line</echo>
- <echo> ant -Dsunri.present=true</echo>
- <!-- -->
- <echo>
- </echo>
- <echo> The tests additionally requires </echo>
- <echo> * JUnit: </echo>
- <echo> http://www.junit.org</echo>
- <!-- -->
</target>
@@ -122,13 +123,15 @@
<mkdir dir="${junit.results}" />
<path id="test.classpath">
<path refid="project.build.classpath" />
- <pathelement location="${stage-cmxj}/connector-mxj.jar" />
+ <pathelement location="${stage-cmxj}/${fullProdName}.jar" />
</path>
+ <echo>Using CLASSPATH=${test.classpath}</echo>
<junit printsummary="true" haltonfailure="false">
<classpath refid="test.classpath" />
<formatter type="plain" />
<formatter type="xml" />
- <test name="com.mysql.management.AllTestsSuite" todir="${junit.results}" />
+ <test name="com.mysql.management.AllTestsSuite"
+ todir="${junit.results}" />
</junit>
</target>
@@ -142,9 +145,11 @@
<target name="-dist-gpl">
<property name="mysqld-version" value="${gpl-mysqld-version}" />
<property name="resources" location="resources" />
- <antcall target="-tiny-clean" />
+ <property name="fullProdName"
+ value="mysql-connector-mxj-gpl-${mxj-version}" />
+ <property name="stage-cmxj" location="${stage-root}/${fullProdName}" />
+ <antcall target="-tiny-clean" />
<antcall target="-stage-gpl-dist" />
- <property name="fullProdName" value="connector-mxj-gpl-${mxj-version}" />
<antcall target="-makePackages">
</antcall>
</target>
@@ -152,9 +157,13 @@
<target name="-dist-commerical-src">
<property name="mysqld-version" value="${commercial-mysqld-version}" />
<property name="resources" location="commercial" />
- <antcall target="-tiny-clean" />
+ <antcall target="-tiny-clean" />
+ <property name="fullProdName"
+ value="mysql-connector-mxj-commercial-src-${mxj-version}" />
+ <property name="stage-cmxj" location="${stage-root}/${fullProdName}" />
+ <antcall target="-tiny-clean" />
<antcall target="-stage-commercial-src" />
- <property name="fullProdName" value="connector-mxj-commercial-src-${mxj-version}" />
+
<antcall target="-makePackages">
</antcall>
</target>
@@ -162,9 +171,11 @@
<target name="-dist-commerical-bin">
<property name="mysqld-version" value="${commercial-mysqld-version}" />
<property name="resources" location="commercial" />
- <antcall target="-tiny-clean" />
+ <property name="fullProdName"
+ value="mysql-connector-mxj-commercial-bin-${mxj-version}" />
+ <property name="stage-cmxj" location="${stage-root}/${fullProdName}" />
+ <antcall target="-tiny-clean" />
<antcall target="-stage-commercial-bin" />
- <property name="fullProdName" value="connector-mxj-commercial-bin-${mxj-version}" />
<mkdir dir="${dist}" />
<antcall target="-makePackages">
</antcall>
@@ -173,9 +184,11 @@
<target name="-compile" unless="source.only">
<mkdir dir="${build}" />
<echo> compiling MysqldResource class and supporting classes </echo>
- <javac srcdir="${src}" destdir="${build}" debug="true" verbose="false" source="1.4" target="1.4">
+ <javac srcdir="${src}" destdir="${build}" debug="true" verbose="false"
+ source="1.4" target="1.4">
<classpath refid="project.build.classpath" />
<exclude name="**/*Test*" />
+ <exclude name="*.txt" />
</javac>
<antcall target="-compile-tests" />
@@ -185,14 +198,13 @@
<antcall target="-skip-instrument-logging" />
<mkdir dir="${stage-cmxj}" />
- <jar destfile="${stage-cmxj}/mysql-connector-mxj-${mxj-version}.jar">
+ <jar destfile="${stage-cmxj}/${fullProdName}.jar">
<fileset dir="${build}" />
<fileset dir="${resources}">
<include name="kill.exe" />
- <include name="*.txt" />
</fileset>
</jar>
- <jar destfile="${stage-cmxj}/mysql-connector-mxj-${mxj-version}-db-files.jar">
+ <jar destfile="${stage-cmxj}/${fullProdName}-db-files.jar">
<fileset dir="${resources}">
<include name="${mysqld-version}/**" />
<include name="*.properties" />
@@ -232,10 +244,15 @@
<target name="-compile-tests" unless="no.test">
<echo> compiling Unit Tests and supporting classes </echo>
- <javac srcdir="${src}" excludes="com/mysql/management/sunri/**" destdir="${build}" debug="true" verbose="false" source="1.4" target="1.4">
+ <copy file="${src}/support-issue-8601-help-output.txt"
+ todir="${build}" />
+ <javac srcdir="${src}" excludes="com/mysql/management/sunri/**"
+ destdir="${build}" debug="true" verbose="false"
+ source="1.4" target="1.4">
<classpath refid="project.build.classpath" />
</javac>
- <available classname="com.sun.jdmk.comm.HtmlAdaptorServer" classpath="project.build.classpath" property="sunri.present" />
+ <available classname="com.sun.jdmk.comm.HtmlAdaptorServer"
+ classpath="project.build.classpath" property="sunri.present" />
<antcall target="-compile-sunri-agent" />
<antcall target="-skip-compile-sunri-agent" />
</target>
@@ -246,7 +263,8 @@
<target name="-compile-sunri-agent" if="sunri.present">
<echo> compiling simple JMX Agent (http and Mysqld beans only)</echo>
- <javac srcdir="${src}" destdir="${build}" debug="true" verbose="false" source="1.4" target="1.4">
+ <javac srcdir="${src}" destdir="${build}" debug="true" verbose="false"
+ source="1.4" target="1.4">
<classpath refid="project.build.classpath" />
</javac>
</target>
@@ -254,7 +272,8 @@
<target name="-makePackages">
<delete file="${dist}/${fullProdName}.tar.gz" />
- <tar destfile="${dist}/${fullProdName}.tar.gz" compression="gzip" longfile="gnu">
+ <tar destfile="${dist}/${fullProdName}.tar.gz" compression="gzip"
+ longfile="gnu">
<tarfileset dir="${stage-root}">
<patternset>
<exclude name="**/*.nb*" />
@@ -290,7 +309,6 @@
<fileset dir="${resources}">
<include name="${mysqld-version}/**" />
<include name="kill.exe" />
- <include name="*.txt" />
<include name="*.properties" />
</fileset>
</copy>
@@ -304,8 +322,6 @@
</target>
<target name="-stage-common">
- <copy file="README.txt" todir="${stage-cmxj}" />
- <copy file="index.html" todir="${stage-cmxj}" />
<copy file="index.jsp" todir="${stage-cmxj}" />
<copy file="README.1st" todir="${stage-cmxj}" />
<copy file="CHANGES" todir="${stage-cmxj}" />
@@ -317,9 +333,12 @@
<target name="-stage-commercial-common">
<antcall target="-stage-common" />
- <copy file="${misc}/LICENSE.commercial.txt" tofile="${stage-cmxj}/LICENSE.commercial.txt" />
- <loadfile property="commercialLicenseText" srcFile="misc/commercialLicense.txt" />
- <replaceregexp match="Copyright.*1307.[^replaceregexp]*USA" replace="${commercialLicenseText}" flags="s">
+ <copy file="${misc}/LICENSE.commercial.txt"
+ tofile="${stage-cmxj}/LICENSE.commercial.txt" />
+ <loadfile property="commercialLicenseText"
+ srcFile="misc/commercialLicense.txt" />
+ <replaceregexp match="Copyright.*1307.[^replaceregexp]*USA"
+ replace="${commercialLicenseText}" flags="s">
<fileset dir="${stage-cmxj}" includes="**/*.java **/*.xml" />
</replaceregexp>
</target>
@@ -341,80 +360,6 @@
<antcall target="-compile" />
</target>
-
- <target name="styleDocs" depends="-doc-init, -copyDocs, -styleDocsHtmlTop, -styleDocsFopTop" if="${com.mysql.jdbc.docs.sourcesPresent}" />
-
-
- <target name="-doc-init">
- <!-- Check that files needed to generate documentation are in place -->
-
- <available file="${docs.sourceDir}" property="com.mysql.jdbc.docs.sourcesPresent" />
- <available file="${docs.DocBookXSL}" property="com.mysql.jdbc.docs.docBookPresent" />
- <available file="${docs.FopPath}" property="com.mysql.jdbc.docs.fopPresent" />
- </target>
-
-
- <target name="-copyDocs" depends="-copyDocsPathCheck">
- <copy file="${docs.sourceDir}" todir="${build}/docs/sources" failonerror="false" />
- </target>
-
- <target name="-copyDocsPathCheck" unless="docs.sourceDir">
- <echo>
-Running stylesheets on non-latest documentation sources.
-
-If you want to use up-to-date versions of the documentation, set the property
-"docs.sourceDir" to point to the location
-of the DocBook sources (i.e. "mxj.xml").
- </echo>
- </target>
-
- <target name="-styleDocsHtmlTop" depends="-styleDocsStyleSheetsCheck, -styleDocsHtml" />
-
- <target name="-styleDocsStyleSheetsCheck" unless="docs.docBookPresent">
- <echo>
-Not applying style sheets to documentation, as the DocBook XSL distribution path
-has not been set with the "com.mysql.jdbc.docs.DocBookXSL" property.
- </echo>
- </target>
-
- <target name="-styleDocsFopTop" depends="-styleDocsStyleSheetsCheck, -styleDocsFop" if="docs.fopPresent" />
-
- <target name="-styleDocsFop" if="com.mysql.jdbc.docs.fopPresent">
- <xslt basedir="${build}/docs/sources" destdir="${build}/docs" extension=".fop-xml" style="${docs.DocBookXSL}/fo/docbook.xsl" includes="mxj.xml">
- <param name="fop.extensions" expression="1" />
- <param name="ection.autolabel" expression="1" />
- <param name="section.label.includes.component.label" expression="1" />
- <param name="page.margin.inner" expression="1in" />
- <param name="page.margin.outer" expression="1in" />
- </xslt>
-
- <exec dir="${build}/docs" executable="${docs.FopPath}">
- <arg line="-fo mxj.fop-xml mxj-en.pdf" />
- </exec>
-
- <!--<delete file="${build}/docs/mxj-en.fop-xml"/>-->
- </target>
-
- <target name="-styleDocsHtml">
- <xslt out="${build}/docs/index.html" style="${docs.DocBookXSL}/html/docbook.xsl" in="${build}/docs/sources/mxj.xml">
- <param name="section.autolabel" expression="1" />
- <param name="section.label.includes.component.label" expression="1" />
- </xslt>
-
- <!-- Create a plaintext version of the manual using 'links' -->
-
- <exec dir="${build}/docs" executable="${docs.LinksPath}" output="${build}/docs/README.txt">
-
- <!-- Unfortunately, ant doesn't seem to pass this in a way
- 'links' groks using the new value='', file='' syntax,
- so we need to use this depecrated form -->
-
- <arg line="-dump index.html" />
- </exec>
- </target>
-
-
-
<target name="-emma-instrument" description="runs the examples">
<mkdir dir="${build}" />
<property name="no.aspectj" value="true" />
@@ -437,7 +382,7 @@
<path id="test.classpath">
<path refid="project.build.classpath" />
<pathelement location="${build}" />
- <pathelement location="${stage-cmxj}/connector-mxj.jar" />
+ <pathelement location="${stage-cmxj}/${fullProdName}.jar" />
<pathelement location="${emma.dir}/emma.jar" />
<pathelement location="${emma.dir}/emma_ant.jar" />
</path>
Deleted: trunk/connector-mxj/index.html
===================================================================
--- trunk/connector-mxj/index.html 2008-02-18 18:20:38 UTC (rev 110)
+++ trunk/connector-mxj/index.html 2008-02-19 17:18:29 UTC (rev 111)
@@ -1,12 +0,0 @@
-<html>
-<head>
- <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
- <title>MySQL Connector/MXJ</title>
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
- <p><a href="http://dev.mysql.com/doc/refman/5.0/en/connector-mxj.html">
- Documentation</a>
- </p>
-</body>
-</html>
-
| Thread |
|---|
| • Connector/MXJ commit: r111 - trunk/connector-mxj | eherman | 19 Feb |
