At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbjmerge
------------------------------------------------------------
revno: 165
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: ndbjmerge
timestamp: Fri 2007-09-14 02:55:15 -0700
message:
Removed extra files we're not using yet.
removed:
java/com/mysql/cluster/mgmj/NdbMgmException.java
ndbmgmexception.java-20070521225938-cmxcf6gis2d8c0um-16
java/com/mysql/cluster/mgmj/NdbMgmFactory.java
ndbmgmfactory.java-20070521225938-cmxcf6gis2d8c0um-17
modified:
java/com/mysql/cluster/mgmj/MgmApiException.java
mgmapiexception.java-20070914094439-b3vmm9orpa86yan5-1
=== removed file 'java/com/mysql/cluster/mgmj/NdbMgmException.java'
--- a/java/com/mysql/cluster/mgmj/NdbMgmException.java 2007-05-21 23:00:16 +0000
+++ b/java/com/mysql/cluster/mgmj/NdbMgmException.java 1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-/*
- Copyright (C) 2006 MySQL AB
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of version 2 of the GNU General Public License as
- published by the Free Software Foundation.
-
- There are special exceptions to the terms and conditions of the GPL
- as it is applied to this software. View the full text of the
- exception in file EXCEPTIONS-CONNECTOR-J in the directory of this
- software distribution.
-
- 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.cluster.mgmj;
-
-import com.mysql.cluster.mgmj.NdbMgmError.NdbMgmErrorType;
-
-/**
- * A NdbMgmException is a base exception class that is the most general
- * exception to be thrown by methods in the MGM/J API.
- * It is thrown if an error is generated using the management API.
- * It contains an error message, an error code and an error type.
- *
- * @version 1.0
- * @since 1.0
- */
-public class NdbMgmException extends Exception {
-
- private static final long serialVersionUID=1234567;
- protected final String message;
- protected final int code;
- protected final NdbMgmErrorType type;
-
- /**
- *
- * @param error
- * @version 1.0
- * @since 1.0
- */
- public NdbMgmException(NdbMgmError error) {
- message=error.getMessage();
- code=error.getCode();
- type = error.getType();
- }
-
- public NdbMgmException(NdbMgmError error, String msg) {
- message=error.getMessage() + "; " + msg;
- code=error.getCode();
- type = error.getType();
- }
-
- /**
- *
- * @param arg0
- * @version 1.0
- * @since 1.0
- */
- public NdbMgmException(String arg0) {
- super(arg0);
- message = arg0;
- code =-1;
- type =NdbMgmError.NdbMgmErrorType.NDB_MGM_NO_ERROR;
- }
-
-
- /**
- *
- * @return String error message
- * @version 1.0
- * @since 1.0
- */
- public String toString() {
- return "Error: " + code + " Message: " + message ;
- }
-
- /**
- * @return String error message
- * @version 1.0
- * @since 1.0
- */
- public String getMessage() {
- return toString();
- }
-
- /**
- * @return Returns the code.
- * @version 1.0
- * @since 1.0
- */
- public int getCode() {
- return code;
- }
-
- /**
- * @return Returns the type.
- * @version 1.0
- * @since 1.0
- */
- public NdbMgmErrorType getType() {
- return type;
- }
-}
=== removed file 'java/com/mysql/cluster/mgmj/NdbMgmFactory.java'
--- a/java/com/mysql/cluster/mgmj/NdbMgmFactory.java 2007-05-21 23:00:16 +0000
+++ b/java/com/mysql/cluster/mgmj/NdbMgmFactory.java 1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
-/*
- Copyright (C) 2006 MySQL AB
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of version 2 of the GNU General Public License as
- published by the Free Software Foundation.
-
- There are special exceptions to the terms and conditions of the GPL
- as it is applied to this software. View the full text of the
- exception in file EXCEPTIONS-CONNECTOR-J in the directory of this
- software distribution.
-
- 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.cluster.mgmj;
-
-
-/**
- * The NdbMgmFactory provides static methods for
- * creating NdbMgm objects that represent connections to the management server
(ndb_mgmd).
- *
- * <br> It also loads the JNI library, libndb_mgmj.so
- *
- * @version 1.0
- * @since 1.0
- * @see NdbMgm
- */
-public class NdbMgmFactory extends NdbMgm {
-
- static
- {
- // TO-DO: consider loading a properties file with
- // location of "nativelib" and any other resources
- System.loadLibrary("ndbjmgm");
- }
-
-
- /**
- *
- * hide the constructor, only static methods provided
- * @throws NdbMgmException
- * @version 1.0
- * @since 1.0
- */
- private NdbMgmFactory() throws NdbMgmException
- {
- }
-
-
- /**
- *
- * Create a NdbMgm object without passing a connectString parameter.
- * You need to call NdbMgm.Connect method with the connectString parameter
- * to connect the NdbMgm object to ndb_mgmd(s0
- *
- * @return
- * @throws NdbMgmException
- * @version 1.0
- * @since 1.0
- * @see NdbMgm
- */
- public static synchronized NdbMgm createNdbMgm()
- throws NdbMgmException, NdbMgmConnectionException
- {
- return new NdbMgm();
- }
-
- /**
- * Creates a NdbMgm object and attempts to connect ndb_mgmd(s)
- * using a connectString
- * @param connectString a reference to ndb_mgmd(s) "hostname1:portNo;hostname2:portNo"
- * @return
- * @throws NdbMgmException
- * @version 1.0
- * @since 1.0
- * @see NdbMgm
- */
- public static synchronized NdbMgm createNdbMgm(String connectString)
- throws NdbMgmException, NdbMgmConnectionException
- {
- return new NdbMgm(connectString);
- }
-
-
-
-}
=== modified file 'java/com/mysql/cluster/mgmj/MgmApiException.java'
--- a/java/com/mysql/cluster/mgmj/MgmApiException.java 2007-09-14 09:53:14 +0000
+++ b/java/com/mysql/cluster/mgmj/MgmApiException.java 2007-09-14 09:55:15 +0000
@@ -1,5 +1,6 @@
package com.mysql.cluster.mgmj;
+import com.mysql.cluster.ndbj.NdbErrorRef;
public class MgmApiException extends com.mysql.cluster.ndbj.NdbApiException {
| Thread |
|---|
| • Rev 165: Removed extra files we're not using yet. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbjmerge | Monty Taylor | 14 Sep |