Added:
trunk/connector-mxj/src/com/mysql/management/MysqldFactory.java
trunk/connector-mxj/src/com/mysql/management/jmx/TestFactory.java
Removed:
trunk/connector-mxj/src/com/mysql/management/driverlaunched/MysqldFactory.java
Modified:
trunk/connector-mxj/.settings/org.eclipse.jdt.core.prefs
trunk/connector-mxj/.settings/org.eclipse.jdt.ui.prefs
trunk/connector-mxj/CHANGES
trunk/connector-mxj/src/com/mysql/management/AllTestsSuite.java
trunk/connector-mxj/src/com/mysql/management/HelpOptionsParser.java
trunk/connector-mxj/src/com/mysql/management/HelpOptionsParserTest.java
trunk/connector-mxj/src/com/mysql/management/MysqldResource.java
trunk/connector-mxj/src/com/mysql/management/MysqldResourceI.java
trunk/connector-mxj/src/com/mysql/management/MysqldResourceTest.java
trunk/connector-mxj/src/com/mysql/management/MysqldResourceTestImpl.java
trunk/connector-mxj/src/com/mysql/management/driverlaunched/ServerLauncherSocketFactory.java
trunk/connector-mxj/src/com/mysql/management/driverlaunched/ServerLauncherSocketFactoryTest.java
trunk/connector-mxj/src/com/mysql/management/jmx/AcceptanceTest.java
trunk/connector-mxj/src/com/mysql/management/jmx/ConnectorMXJPropertiesTransformTest.java
trunk/connector-mxj/src/com/mysql/management/jmx/MysqldDynamicMBean.java
trunk/connector-mxj/src/com/mysql/management/jmx/MysqldDynamicMBeanTest.java
trunk/connector-mxj/src/com/mysql/management/jmx/SimpleMysqldDynamicMBean.java
trunk/connector-mxj/src/com/mysql/management/jmx/SimpleMysqldDynamicMBeanTest.java
trunk/connector-mxj/src/com/mysql/management/jmx/StubTestMBeanServer.java
trunk/connector-mxj/src/com/mysql/management/jmx/jboss/JBossMysqldDynamicMBean.java
trunk/connector-mxj/src/com/mysql/management/jmx/jboss/JBossMysqldDynamicMBeanTest.java
trunk/connector-mxj/src/com/mysql/management/util/CausedSQLException.java
trunk/connector-mxj/src/com/mysql/management/util/CausedSQLExceptionTest.java
trunk/connector-mxj/src/com/mysql/management/util/DefaultsMap.java
trunk/connector-mxj/src/com/mysql/management/util/DefaultsMapTest.java
trunk/connector-mxj/src/com/mysql/management/util/Equals.java
trunk/connector-mxj/src/com/mysql/management/util/EqualsTest.java
trunk/connector-mxj/src/com/mysql/management/util/Exceptions.java
trunk/connector-mxj/src/com/mysql/management/util/ExceptionsTest.java
trunk/connector-mxj/src/com/mysql/management/util/ListToString.java
trunk/connector-mxj/src/com/mysql/management/util/ListToStringTest.java
trunk/connector-mxj/src/com/mysql/management/util/MapEntry.java
trunk/connector-mxj/src/com/mysql/management/util/MapEntryTest.java
trunk/connector-mxj/src/com/mysql/management/util/NullOutputStream.java
trunk/connector-mxj/src/com/mysql/management/util/NullPrintStream.java
trunk/connector-mxj/src/com/mysql/management/util/NullPrintWriter.java
trunk/connector-mxj/src/com/mysql/management/util/Platform.java
trunk/connector-mxj/src/com/mysql/management/util/ProcessUtilTest.java
trunk/connector-mxj/src/com/mysql/management/util/RuntimeI.java
trunk/connector-mxj/src/com/mysql/management/util/RuntimeTest.java
trunk/connector-mxj/src/com/mysql/management/util/StrTest.java
trunk/connector-mxj/src/com/mysql/management/util/StreamConnector.java
trunk/connector-mxj/src/com/mysql/management/util/StreamConnectorTest.java
trunk/connector-mxj/src/com/mysql/management/util/StreamsTest.java
trunk/connector-mxj/src/com/mysql/management/util/TestStubProcess.java
trunk/connector-mxj/src/com/mysql/management/util/TestUtil.java
trunk/connector-mxj/src/com/mysql/management/util/Threads.java
trunk/connector-mxj/src/com/mysql/management/util/WrappedException.java
Log:
Changed protected constructor of SimpleMysqldDynamicMBean from taking a MysqldResource to taking a MysqldFactory, in order to lay groundwork for addressing BUG discovered by Andrew Rubinger. Changed SimpleMysqldDynamicMBean to create MysqldResource on demand to allow setting of datadir. Added MysqldResourceI.getDataDir(); Added MBean datadir change test; minor code reorg & formatting.
Modified: trunk/connector-mxj/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/connector-mxj/.settings/org.eclipse.jdt.core.prefs 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/.settings/org.eclipse.jdt.core.prefs 2007-03-10 17:50:14 UTC (rev 69)
@@ -1,4 +1,4 @@
-#Fri Jul 28 15:50:11 PDT 2006
+#Fri Mar 09 17:28:48 CET 2007
eclipse.preferences.version=1
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
@@ -30,6 +30,7 @@
org.eclipse.jdt.core.formatter.blank_lines_before_method=1
org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
@@ -43,9 +44,14 @@
org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
org.eclipse.jdt.core.formatter.comment.format_comments=true
org.eclipse.jdt.core.formatter.comment.format_header=false
org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
org.eclipse.jdt.core.formatter.comment.format_source_code=true
org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
@@ -220,6 +226,7 @@
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
Modified: trunk/connector-mxj/.settings/org.eclipse.jdt.ui.prefs
===================================================================
--- trunk/connector-mxj/.settings/org.eclipse.jdt.ui.prefs 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/.settings/org.eclipse.jdt.ui.prefs 2007-03-10 17:50:14 UTC (rev 69)
@@ -1,4 +1,4 @@
-#Fri Jul 28 15:50:11 PDT 2006
+#Fri Mar 09 17:28:47 CET 2007
eclipse.preferences.version=1
formatter_profile=_connector-mxj-formatting
-formatter_settings_version=10
+formatter_settings_version=11
Modified: trunk/connector-mxj/CHANGES
===================================================================
--- trunk/connector-mxj/CHANGES 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/CHANGES 2007-03-10 17:50:14 UTC (rev 69)
@@ -1,6 +1,19 @@
# Changelog
# $Id: CHANGES,v 1.14 2005/10/25 19:11:16 eherman Exp $
+2007-03-10 - changed protected constructor of SimpleMysqldDynamicMBean from
+ taking a MysqldResource to taking a MysqldFactory, in order to lay
+ groundwork for addressing BUG discovered by Andrew Rubinger. See:
+ http://forums.mysql.com/read.php?39,143046,143046#msg-143046
+ (Actual testign with JBoss, and filing a bug, is still required.)
+ - changed SimpleMysqldDynamicMBean to create MysqldResource on demand
+ in order to allow setting of datadir. (Rubinger bug groundwork)
+ - added getDataDir() to interface MysqldResourceI
+ - added testcase to com.mysql.management.jmx.AcceptanceTest which
+ demonstrats that "dataDir" is a mutable MBean property.
+ - moved MysqldFactory to main package.
+ - reformatting: Added newlines some files which did not end in them.
+
2007-02-23 - added 5.1.15 binaries to the repository
- removed 5.1.14 binaries from the repository
- clarified the synchronization of MysqldResource methods
Modified: trunk/connector-mxj/src/com/mysql/management/AllTestsSuite.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/AllTestsSuite.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/AllTestsSuite.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -48,4 +48,4 @@
return suite;
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/HelpOptionsParser.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/HelpOptionsParser.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/HelpOptionsParser.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -127,4 +127,4 @@
ps.println(msg);
}
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/HelpOptionsParserTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/HelpOptionsParserTest.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/HelpOptionsParserTest.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -91,4 +91,4 @@
// System.err.println(new ListToString().toString(parsed));
assertEquals("FALSE", parsed.get("allow-suspicious-udfs"));
}
-}
\ No newline at end of file
+}
Copied: trunk/connector-mxj/src/com/mysql/management/MysqldFactory.java (from rev 67, trunk/connector-mxj/src/com/mysql/management/driverlaunched/MysqldFactory.java)
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/driverlaunched/MysqldFactory.java 2007-02-23 16:21:43 UTC (rev 67)
+++ trunk/connector-mxj/src/com/mysql/management/MysqldFactory.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -0,0 +1,33 @@
+/*
+ Copyright (C) 2004 MySQL AB
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ */
+package com.mysql.management;
+
+import java.io.File;
+
+
+public interface MysqldFactory {
+ MysqldResourceI newMysqldResource(File baseDir, File dataDir,
+ String version, boolean guessArch);
+
+ public static final class Default implements MysqldFactory {
+ public MysqldResourceI newMysqldResource(File baseDir, File dataDir,
+ String version, boolean guessArch) {
+ return new MysqldResource(baseDir, dataDir, version, guessArch);
+ }
+ }
+}
Modified: trunk/connector-mxj/src/com/mysql/management/MysqldResource.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/MysqldResource.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/MysqldResource.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -703,4 +703,4 @@
mysqld.start(new Threads().newName(), clop.asMap());
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/MysqldResourceI.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/MysqldResourceI.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/MysqldResourceI.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -61,5 +61,7 @@
File getBaseDir();
+ File getDataDir();
+
int getPort();
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/MysqldResourceTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/MysqldResourceTest.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/MysqldResourceTest.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -397,4 +397,4 @@
return execFiles.contains(file);
}
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/MysqldResourceTestImpl.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/MysqldResourceTestImpl.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/MysqldResourceTestImpl.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -126,7 +126,11 @@
return baseDir;
}
+ public File getDataDir() {
+ return dataDir;
+ }
+
public int getPort() {
return 0;
}
-}
\ No newline at end of file
+}
Deleted: trunk/connector-mxj/src/com/mysql/management/driverlaunched/MysqldFactory.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/driverlaunched/MysqldFactory.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/driverlaunched/MysqldFactory.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -1,35 +0,0 @@
-/*
- Copyright (C) 2004 MySQL AB
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- */
-package com.mysql.management.driverlaunched;
-
-import java.io.File;
-
-import com.mysql.management.MysqldResource;
-import com.mysql.management.MysqldResourceI;
-
-public interface MysqldFactory {
- MysqldResourceI newMysqldResource(File baseDir, File dataDir,
- String version, boolean guessArch);
-
- public static final class Default implements MysqldFactory {
- public MysqldResourceI newMysqldResource(File baseDir, File dataDir,
- String version, boolean guessArch) {
- return new MysqldResource(baseDir, dataDir, version, guessArch);
- }
- }
-}
\ No newline at end of file
Modified: trunk/connector-mxj/src/com/mysql/management/driverlaunched/ServerLauncherSocketFactory.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/driverlaunched/ServerLauncherSocketFactory.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/driverlaunched/ServerLauncherSocketFactory.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -28,6 +28,7 @@
import com.mysql.jdbc.SocketFactory;
import com.mysql.jdbc.StandardSocketFactory;
+import com.mysql.management.MysqldFactory;
import com.mysql.management.MysqldResource;
import com.mysql.management.MysqldResourceI;
import com.mysql.management.util.Files;
Modified: trunk/connector-mxj/src/com/mysql/management/driverlaunched/ServerLauncherSocketFactoryTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/driverlaunched/ServerLauncherSocketFactoryTest.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/driverlaunched/ServerLauncherSocketFactoryTest.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -27,6 +27,7 @@
import com.mysql.jdbc.SocketFactory;
import com.mysql.jdbc.StandardSocketFactory;
+import com.mysql.management.MysqldFactory;
import com.mysql.management.MysqldResource;
import com.mysql.management.MysqldResourceI;
import com.mysql.management.MysqldResourceTestImpl;
Modified: trunk/connector-mxj/src/com/mysql/management/jmx/AcceptanceTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/jmx/AcceptanceTest.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/jmx/AcceptanceTest.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -17,6 +17,8 @@
*/
package com.mysql.management.jmx;
+import java.io.File;
+
import javax.management.Attribute;
import com.mysql.jdbc.NonRegisteringDriver;
@@ -42,13 +44,17 @@
private String orig;
+ private File dataDir;
+
protected void setUp() {
super.setUp();
orig = System.getProperty(Files.USE_TEST_DIR, "");
System.setProperty(Files.USE_TEST_DIR, Boolean.TRUE.toString());
+ dataDir = new Files().tmp("MxjAccTest_" + System.currentTimeMillis());
}
protected void tearDown() {
+ new Files().deleteTree(dataDir);
try {
if (bean != null) {
try {
@@ -83,27 +89,27 @@
+ ConnectorMXJPropertiesTransform.class.getName();
bean = new MysqldDynamicMBean();
- MysqldResourceI mysqldResource = bean.getMysqldResource();
- // mysqldResource.setKillDelay(3000);
+ // bean.getMysqldResource().setKillDelay(3000);
agent.addBean("mysql", "MySQL1", bean);
- assertEquals(false, mysqldResource.isRunning());
+ assertEquals(false, bean.getMysqldResource().isRunning());
String port = "" + new TestUtil().testPort();
- assertEquals("3306", mysqldResource.getServerOptions().get(
+ assertEquals("3306", bean.getMysqldResource().getServerOptions().get(
MysqldResourceI.PORT));
bean.setAttribute(new Attribute(MysqldResourceI.PORT, port));
bean.invoke(SimpleMysqldDynamicMBean.START_METHOD, null, null);
int i = 0;
while (++i < 100) {
- if (mysqldResource.isRunning()) {
+ if (bean.getMysqldResource().isRunning()) {
break;
}
threads.pause(50);
}
- assertTrue("still not started: " + i, mysqldResource.isRunning());
- assertEquals(port, mysqldResource.getServerOptions().get(
+ assertTrue("still not started: " + i, bean.getMysqldResource()
+ .isRunning());
+ assertEquals(port, bean.getMysqldResource().getServerOptions().get(
MysqldResourceI.PORT));
new TestUtil().assertConnectViaJDBC(url);
@@ -114,4 +120,45 @@
MysqldResourceI mysqldResource = jbossbean.getMysqldResource();
assertEquals(MysqldResource.class, mysqldResource.getClass());
}
+
+ public void testDifferentDataDir() throws Exception {
+ agent = new MysqldDynamicMBeanTestAgent("mysql");
+
+ String url = "jdbc:mysql:///test" + "?"
+ + NonRegisteringDriver.PROPERTIES_TRANSFORM_KEY + "="
+ + ConnectorMXJPropertiesTransform.class.getName();
+
+ bean = new MysqldDynamicMBean();
+ // bean.getMysqldResource().setKillDelay(3000);
+ agent.addBean("mysql", "MySQL1", bean);
+
+ assertEquals(false, bean.getMysqldResource().isRunning());
+ String port = "" + new TestUtil().testPort();
+
+ assertEquals("3306", bean.getMysqldResource().getServerOptions().get(
+ MysqldResourceI.PORT));
+
+ bean.setAttribute(new Attribute(MysqldResourceI.PORT, port));
+ bean.setAttribute(new Attribute(MysqldResourceI.DATADIR, dataDir
+ .getPath()));
+ bean.invoke(SimpleMysqldDynamicMBean.START_METHOD, null, null);
+ int i = 0;
+ while (++i < 100) {
+ if (bean.getMysqldResource().isRunning()) {
+ break;
+ }
+ threads.pause(50);
+ }
+ assertTrue("still not started: " + i, bean.getMysqldResource()
+ .isRunning());
+
+ assertEquals(port, "" + bean.getMysqldResource().getPort());
+ assertEquals(port, bean.getMysqldResource().getServerOptions().get(
+ MysqldResourceI.PORT));
+
+ assertEquals(dataDir, bean.getMysqldResource().getDataDir());
+
+ new TestUtil().assertConnectViaJDBC(url);
+ }
+
}
Modified: trunk/connector-mxj/src/com/mysql/management/jmx/ConnectorMXJPropertiesTransformTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/jmx/ConnectorMXJPropertiesTransformTest.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/jmx/ConnectorMXJPropertiesTransformTest.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -138,4 +138,4 @@
return arg1 + "? ... arg0: " + arg0;
}
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/jmx/MysqldDynamicMBean.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/jmx/MysqldDynamicMBean.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/jmx/MysqldDynamicMBean.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -20,7 +20,7 @@
import javax.management.Attribute;
import javax.management.AttributeNotFoundException;
-import com.mysql.management.MysqldResourceI;
+import com.mysql.management.MysqldFactory;
import com.mysql.management.util.Exceptions;
/**
@@ -35,8 +35,8 @@
super();
}
- MysqldDynamicMBean(MysqldResourceI mysqldResource) {
- super(mysqldResource);
+ MysqldDynamicMBean(MysqldFactory mysqldFactory) {
+ super(mysqldFactory);
}
public synchronized void setAttribute(Attribute attribute)
@@ -58,4 +58,4 @@
};
startMethod.exec();
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/jmx/MysqldDynamicMBeanTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/jmx/MysqldDynamicMBeanTest.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/jmx/MysqldDynamicMBeanTest.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -35,7 +35,8 @@
public void testAutoStart() throws Exception {
MysqldResourceI mysqld = new MysqldResourceTestImpl(null, null,
new HashMap());
- MysqldDynamicMBean myBean = new MysqldDynamicMBean(mysqld);
+ MysqldDynamicMBean myBean = new MysqldDynamicMBean(new TestFactory(
+ mysqld));
assertFalse(mysqld.isRunning());
String autostart = SimpleMysqldDynamicMBean.AUTOSTART_ATTR;
String str_true = Boolean.TRUE.toString();
@@ -43,4 +44,4 @@
assertTrue(mysqld.isRunning());
assertFalse(mysqld.getServerOptions().containsKey(autostart));
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/jmx/SimpleMysqldDynamicMBean.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/jmx/SimpleMysqldDynamicMBean.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/jmx/SimpleMysqldDynamicMBean.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -17,6 +17,7 @@
*/
package com.mysql.management.jmx;
+import java.io.File;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.HashMap;
@@ -37,7 +38,7 @@
import javax.management.MBeanParameterInfo;
import javax.management.ReflectionException;
-import com.mysql.management.MysqldResource;
+import com.mysql.management.MysqldFactory;
import com.mysql.management.MysqldResourceI;
import com.mysql.management.util.DefaultsMap;
import com.mysql.management.util.Exceptions;
@@ -60,6 +61,8 @@
private static final String VERSION = "$Id: SimpleMysqldDynamicMBean.java,v 1.15 2005/08/31 01:21:16 eherman Exp $";
+ private MysqldFactory mysqldFactory;
+
private MysqldResourceI mysqldResource;
private MBeanAttributeInfo[] attrInfos;
@@ -87,7 +90,7 @@
* This is the constructor included in the MBeanInfo.
*/
public SimpleMysqldDynamicMBean() {
- this(new MysqldResource());
+ this(new MysqldFactory.Default());
}
/**
@@ -95,8 +98,8 @@
* implementations of the underlying MySQL resource. This constructor is not
* included int the MBeanInfo.
*/
- protected SimpleMysqldDynamicMBean(MysqldResourceI mysqldResource) {
- this.mysqldResource = mysqldResource;
+ protected SimpleMysqldDynamicMBean(MysqldFactory mysqldFactory) {
+ this.mysqldFactory = mysqldFactory;
this.str = new Str();
this.notesInfos = new MBeanNotificationInfo[0];
this.mBeanOperationInfoList = new ArrayList();
@@ -124,7 +127,8 @@
private void initAttributes() {
attributes = new DefaultsMap();
- Map options = new TreeMap(mysqldResource.getServerOptions());
+ Map options = new TreeMap(mysqldFactory.newMysqldResource(null, null,
+ null, true).getServerOptions());
List attInfs = new ArrayList();
makeAttribute(attInfs, AUTOSTART_ATTR, Boolean.FALSE.toString(), true);
for (Iterator iter = options.entrySet().iterator(); iter.hasNext();) {
@@ -151,7 +155,7 @@
/**
* @param attributeName
- * represents a command line argument to a MySQL database.
+ * represents a command line argument to a MySQL database.
* @return a String with the value associated the argument
*/
public synchronized Object getAttribute(String attributeName)
@@ -208,6 +212,9 @@
clearMBeanInfo();
if (methodName.equals(START_METHOD)) {
+ if (mysqldResource == null || !mysqldResource.isRunning()) {
+ newMysqldResource();
+ }
mysqldResource.start("MysqldMBean", attributesToOpionMap(), true);
getMBeanOperationInfoList().remove(startMysqldOp);
getMBeanOperationInfoList().add(stopOp);
@@ -215,6 +222,9 @@
return null;
}
if (methodName.equals(STOP_METHOD)) {
+ if (mysqldResource == null) {
+ newMysqldResource();
+ }
mysqldResource.shutdown();
getMBeanOperationInfoList().remove(stopOp);
getMBeanOperationInfoList().add(startMysqldOp);
@@ -226,6 +236,20 @@
throw new ReflectionException(new NoSuchMethodException(msg), msg);
}
+ /*
+ * TODO: Either make "USE_DEFAULT_ARCHITECTURE" accesible or better yet,
+ * resolve the related FIXME in MysqldResource
+ */
+ private void newMysqldResource() {
+ File baseDir = getFileAttribute(MysqldResourceI.BASEDIR);
+ File dataDir = getFileAttribute(MysqldResourceI.DATADIR);
+ String version = getStringAttribute(MysqldResourceI.MYSQLD_VERSION);
+ boolean guessArch = getBooleanAttribute(
+ MysqldResourceI.USE_DEFAULT_ARCHITECTURE, true);
+ mysqldResource = mysqldFactory.newMysqldResource(baseDir, dataDir,
+ version, guessArch);
+ }
+
protected void clearMBeanInfo() {
this.mbeanInfo = null;
}
@@ -256,7 +280,7 @@
* is launched.
*
* @throws AttributeNotFoundException
- * ReflectionException
+ * ReflectionException
*/
public synchronized void setAttribute(Attribute attribute)
throws AttributeNotFoundException {
@@ -286,6 +310,9 @@
}
MysqldResourceI getMysqldResource() {
+ if (mysqldResource == null) {
+ newMysqldResource();
+ }
return mysqldResource;
}
@@ -298,4 +325,26 @@
return new MBeanOperationInfo(method, description,
new MBeanParameterInfo[0], "void", MBeanOperationInfo.ACTION);
}
-}
\ No newline at end of file
+
+ private File getFileAttribute(String key) {
+ String fileName = getStringAttribute(key);
+ return fileName == null ? null : new File(fileName);
+ }
+
+ private boolean getBooleanAttribute(String key, boolean ifNull) {
+ String boolStr = getStringAttribute(key);
+ return (boolStr == null) ? ifNull : Boolean.parseBoolean(boolStr);
+ }
+
+ private String getStringAttribute(final String key) {
+ if (!attributes.containsKey(key)) {
+ return null;
+ }
+ Exceptions.Block block = new Exceptions.Block() {
+ protected Object inner() throws Exception {
+ return getAttribute(key);
+ }
+ };
+ return (String) block.exec();
+ }
+}
Modified: trunk/connector-mxj/src/com/mysql/management/jmx/SimpleMysqldDynamicMBeanTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/jmx/SimpleMysqldDynamicMBeanTest.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/jmx/SimpleMysqldDynamicMBeanTest.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -50,7 +50,8 @@
MysqldResourceI mysqld = new MysqldResourceTestImpl(null, null,
options, new HashMap());
- SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(mysqld);
+ SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(
+ new TestFactory(mysqld));
MBeanInfo info = myBean.getMBeanInfo();
assertNotNull(info);
@@ -113,7 +114,8 @@
MysqldResourceI mysqld = new MysqldResourceTestImpl(null, null,
options, new HashMap());
- SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(mysqld);
+ SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(
+ new TestFactory(mysqld));
assertEquals("bar", myBean.getAttribute("foo"));
try {
myBean.getAttribute("b0gus");
@@ -131,7 +133,8 @@
MysqldResourceI mysqld = new MysqldResourceTestImpl(null, null,
options, new HashMap());
- SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(mysqld);
+ SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(
+ new TestFactory(mysqld));
AttributeList attributeList = myBean.getAttributes(new String[] {
"foo", "datadir" });
assertEquals(2, attributeList.size());
@@ -146,7 +149,8 @@
MysqldResourceI mysqld = new MysqldResourceTestImpl(null, null,
options, new HashMap());
- SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(mysqld);
+ SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(
+ new TestFactory(mysqld));
String verAttName = myBean.versionAttributeName();
String expected = "$Id: " + new Str().shortClassName(myBean);
String beanVersion = (String) myBean.getAttribute(verAttName);
@@ -176,7 +180,8 @@
MysqldResourceI mysqld = new MysqldResourceTestImpl(null, null,
options, new HashMap());
- SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(mysqld);
+ SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(
+ new TestFactory(mysqld));
AttributeList list = new AttributeList();
list.add(new Attribute("foo", "changed"));
@@ -193,7 +198,8 @@
options.put("foo", "bar");
MysqldResourceI mysqld = new MysqldResourceTestImpl(null, null,
options, new HashMap());
- SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(mysqld);
+ SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(
+ new TestFactory(mysqld));
try {
myBean.setAttribute(new Attribute("bogus", "werid"));
fail();
@@ -205,7 +211,8 @@
public void testAutoStart() throws Exception {
MysqldResourceI mysqld = new MysqldResourceTestImpl(null, null,
new HashMap());
- SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(mysqld);
+ SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(
+ new TestFactory(mysqld));
assertFalse(mysqld.isRunning());
String autostart = SimpleMysqldDynamicMBean.AUTOSTART_ATTR;
String str_true = Boolean.TRUE.toString();
@@ -217,7 +224,8 @@
public void testInvoke() throws Exception {
MysqldResourceI mysqld = new MysqldResourceTestImpl(null, null,
new HashMap());
- SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(mysqld);
+ SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(
+ new TestFactory(mysqld));
assertEquals(false, mysqld.isRunning());
myBean.invoke(SimpleMysqldDynamicMBean.START_METHOD, null, null);
assertTrue(mysqld.isRunning());
@@ -240,7 +248,8 @@
options.put("help", "");
MysqldResourceI mysqld = new MysqldResourceTestImpl(null, null,
options, new HashMap());
- SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(mysqld);
+ SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(
+ new TestFactory(mysqld));
myBean.setAttribute(new Attribute("foo", "changed"));
assertTrue(myBean.attributesToOpionMap().containsKey("foo"));
assertEquals(1, myBean.attributesToOpionMap().size());
@@ -253,7 +262,8 @@
options.put("foo", "bar");
MysqldResourceI mysqld = new MysqldResourceTestImpl(null, null,
options, new HashMap());
- SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(mysqld);
+ SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(
+ new TestFactory(mysqld));
MBeanInfo info = myBean.getMBeanInfo();
MBeanAttributeInfo[] atts = info.getAttributes();
@@ -270,7 +280,8 @@
options.put("foo", "bar");
MysqldResourceI mysqld = new MysqldResourceTestImpl(null, null,
options, new HashMap());
- SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(mysqld);
+ SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(
+ new TestFactory(mysqld));
MBeanInfo info = myBean.getMBeanInfo();
MBeanAttributeInfo[] atts = info.getAttributes();
@@ -286,4 +297,4 @@
atts = info.getAttributes();
assertTrue(atts[0].isWritable());
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/jmx/StubTestMBeanServer.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/jmx/StubTestMBeanServer.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/jmx/StubTestMBeanServer.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -191,4 +191,4 @@
throw new NotImplementedException();
}
-}
\ No newline at end of file
+}
Added: trunk/connector-mxj/src/com/mysql/management/jmx/TestFactory.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/jmx/TestFactory.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/jmx/TestFactory.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -0,0 +1,22 @@
+/**
+ *
+ */
+package com.mysql.management.jmx;
+
+import java.io.File;
+
+import com.mysql.management.MysqldFactory;
+import com.mysql.management.MysqldResourceI;
+
+public class TestFactory implements MysqldFactory {
+ private MysqldResourceI mysqld;
+
+ public TestFactory(MysqldResourceI mysqld) {
+ this.mysqld = mysqld;
+ }
+
+ public MysqldResourceI newMysqldResource(File baseDir, File dataDir,
+ String version, boolean guessArch) {
+ return mysqld;
+ }
+}
Modified: trunk/connector-mxj/src/com/mysql/management/jmx/jboss/JBossMysqldDynamicMBean.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/jmx/jboss/JBossMysqldDynamicMBean.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/jmx/jboss/JBossMysqldDynamicMBean.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -20,7 +20,7 @@
import javax.management.MBeanOperationInfo;
import javax.management.ReflectionException;
-import com.mysql.management.MysqldResourceI;
+import com.mysql.management.MysqldFactory;
import com.mysql.management.jmx.SimpleMysqldDynamicMBean;
import com.mysql.management.util.Exceptions;
@@ -38,8 +38,8 @@
initOps();
}
- JBossMysqldDynamicMBean(MysqldResourceI mysqldResource) {
- super(mysqldResource);
+ JBossMysqldDynamicMBean(MysqldFactory mysqldfactory) {
+ super(mysqldfactory);
initOps();
}
@@ -91,4 +91,4 @@
};
block.exec();
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/jmx/jboss/JBossMysqldDynamicMBeanTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/jmx/jboss/JBossMysqldDynamicMBeanTest.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/jmx/jboss/JBossMysqldDynamicMBeanTest.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -27,6 +27,7 @@
import com.mysql.management.MysqldResourceI;
import com.mysql.management.MysqldResourceTestImpl;
import com.mysql.management.jmx.SimpleMysqldDynamicMBean;
+import com.mysql.management.jmx.TestFactory;
import com.mysql.management.util.Files;
/**
@@ -50,7 +51,8 @@
public void testNoAutoStart() throws Exception {
MysqldResourceI mysqld = new MysqldResourceTestImpl(new HashMap());
- JBossMysqldDynamicMBean myBean = new JBossMysqldDynamicMBean(mysqld);
+ JBossMysqldDynamicMBean myBean = new JBossMysqldDynamicMBean(
+ new TestFactory(mysqld));
assertFalse(mysqld.isRunning());
myBean.create();
assertFalse(mysqld.isRunning());
@@ -58,7 +60,8 @@
public void testAutoStart() throws Exception {
MysqldResourceI mysqld = new MysqldResourceTestImpl(new HashMap());
- JBossMysqldDynamicMBean myBean = new JBossMysqldDynamicMBean(mysqld);
+ JBossMysqldDynamicMBean myBean = new JBossMysqldDynamicMBean(
+ new TestFactory(mysqld));
assertFalse(mysqld.isRunning());
String autostart = SimpleMysqldDynamicMBean.AUTOSTART_ATTR;
@@ -76,7 +79,8 @@
.toString());
MysqldResourceI mysqld = new MysqldResourceTestImpl(null, null, atts,
new HashMap());
- JBossMysqldDynamicMBean myBean = new JBossMysqldDynamicMBean(mysqld);
+ JBossMysqldDynamicMBean myBean = new JBossMysqldDynamicMBean(
+ new TestFactory(mysqld));
assertFalse(mysqld.isRunning());
myBean.invoke(JBossMysqldDynamicMBean.CREATE_METHOD, null, null);
@@ -85,4 +89,4 @@
myBean.invoke(JBossMysqldDynamicMBean.DESTROY_METHOD, null, null);
assertFalse(mysqld.isRunning());
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/CausedSQLException.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/CausedSQLException.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/CausedSQLException.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -36,4 +36,4 @@
super(cause.toString());
initCause(cause);
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/CausedSQLExceptionTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/CausedSQLExceptionTest.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/CausedSQLExceptionTest.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -34,4 +34,4 @@
assertSame(runtime, sqlException.getCause());
assertTrue(sqlException instanceof SQLException);
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/DefaultsMap.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/DefaultsMap.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/DefaultsMap.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -148,4 +148,4 @@
}
return values;
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/DefaultsMapTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/DefaultsMapTest.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/DefaultsMapTest.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -123,4 +123,4 @@
map.put("stay", "unchanged");
assertEquals(1, map.getChanged().size());
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/Equals.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/Equals.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/Equals.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -27,4 +27,4 @@
public boolean nullSafe(Object left, Object right) {
return (left == null) ? right == null : left.equals(right);
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/EqualsTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/EqualsTest.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/EqualsTest.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -34,4 +34,4 @@
assertFalse(equals.nullSafe("a", null));
assertFalse(equals.nullSafe(null, "a"));
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/Exceptions.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/Exceptions.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/Exceptions.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -140,4 +140,4 @@
}
}
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/ExceptionsTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/ExceptionsTest.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/ExceptionsTest.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -149,4 +149,4 @@
block.execNotThrowingExceptions(fakeErr);
assertTrue(log.toString().indexOf("foo") >= 0);
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/ListToString.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/ListToString.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/ListToString.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -107,4 +107,4 @@
}
return String.valueOf(obj);
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/ListToStringTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/ListToStringTest.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/ListToStringTest.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -53,4 +53,4 @@
map.put("wiz", new String[] { "bang" });
assertEquals("[foo=null][bar=baz][wiz=[bang]]", ltos.toString(map));
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/MapEntry.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/MapEntry.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/MapEntry.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -88,4 +88,4 @@
public String toString() {
return getKey() + "=" + getValue();
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/MapEntryTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/MapEntryTest.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/MapEntryTest.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -81,4 +81,4 @@
testGetters();
testEquallity();
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/NullOutputStream.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/NullOutputStream.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/NullOutputStream.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -30,4 +30,4 @@
public void write(int b) {
// no op
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/NullPrintStream.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/NullPrintStream.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/NullPrintStream.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -30,4 +30,4 @@
public NullPrintStream() {
super(new NullOutputStream());
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/NullPrintWriter.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/NullPrintWriter.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/NullPrintWriter.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -30,4 +30,4 @@
public NullPrintWriter() {
super(new NullOutputStream());
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/Platform.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/Platform.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/Platform.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -65,4 +65,4 @@
public static void main(String[] args) {
new Platform(new PrintWriter(System.out)).report();
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/ProcessUtilTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/ProcessUtilTest.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/ProcessUtilTest.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -74,4 +74,4 @@
winKill = pu.getWindowsKillFile();
assertTrue(winKill.exists());
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/RuntimeI.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/RuntimeI.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/RuntimeI.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -321,4 +321,4 @@
throw new NotImplementedException(new Boolean(on));
}
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/RuntimeTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/RuntimeTest.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/RuntimeTest.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -18,4 +18,4 @@
new TestUtil().assertObjStubsInterface(new RuntimeI.Stub(),
RuntimeI.class);
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/StrTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/StrTest.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/StrTest.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -41,4 +41,4 @@
public void testShortName() {
assertEquals("String", str.shortClassName(String.class));
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/StreamConnector.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/StreamConnector.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/StreamConnector.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -55,4 +55,4 @@
private static synchronized int count() {
return count++;
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/StreamConnectorTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/StreamConnectorTest.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/StreamConnectorTest.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -40,4 +40,4 @@
assertEquals(expected, new String(receive.toByteArray()));
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/StreamsTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/StreamsTest.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/StreamsTest.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -87,4 +87,4 @@
return "01234";
}
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/TestStubProcess.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/TestStubProcess.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/TestStubProcess.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -45,4 +45,4 @@
public OutputStream getOutputStream() {
throw new RuntimeException("not implemented");
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/TestUtil.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/TestUtil.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/TestUtil.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -219,4 +219,4 @@
stmt.executeUpdate("DROP TABLE IF EXISTS " + tableName);
}
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/Threads.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/Threads.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/Threads.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -47,4 +47,4 @@
public String newName(String baseName) {
return baseName + "_" + System.currentTimeMillis();
}
-}
\ No newline at end of file
+}
Modified: trunk/connector-mxj/src/com/mysql/management/util/WrappedException.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/WrappedException.java 2007-02-23 18:15:38 UTC (rev 68)
+++ trunk/connector-mxj/src/com/mysql/management/util/WrappedException.java 2007-03-10 17:50:14 UTC (rev 69)
@@ -33,4 +33,12 @@
public WrappedException(Throwable cause) {
super(cause);
}
-}
\ No newline at end of file
+
+ /**
+ * @param msg
+ * @param cause
+ */
+ public WrappedException(String msg, Throwable cause) {
+ super(msg, cause);
+ }
+}
| Thread |
|---|
| • Connector/MXJ commit: r69 - in trunk/connector-mxj: . .settings src/com/mysql/management src/com/mysql/management/driverlaunched src/com/mysql/managem... | eherman | 10 Mar |
