Rev 260: Fixes for the build process with the new MGM files. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel

[Monty Taylor]

At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel

------------------------------------------------------------
revno: 260
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: devel
timestamp: Sat 2007-11-17 12:13:52 -0800
message:
  Fixes for the build process with the new MGM files.
modified:
  java/Makefile.am               makefile.am-20070415032352-9dpe6aurqcnuwcrd-1
  java/build.xml                 build.xml-20070521233115-yg3ylf2k3vuzr27o-1
=== modified file 'java/Makefile.am'
--- a/java/Makefile.am	2007-11-16 05:01:53 +0000
+++ b/java/Makefile.am	2007-11-17 20:13:52 +0000
@@ -44,19 +44,14 @@
       	${package_builddir}/mgmj/NodeType.java \
       	${package_builddir}/mgmj/NdbMgmLoglevel.java \
       	${package_builddir}/mgmj/NdbMgmSeverity.java \
-      	${package_builddir}/mgmj/BackupAborted.java \
-      	${package_builddir}/mgmj/BaseEvent.java \
-      	${package_builddir}/mgmj/CommunicationClosed.java \
-      	${package_builddir}/mgmj/CommunicationOpened.java \
-      	${package_builddir}/mgmj/Connected.java \
-      	${package_builddir}/mgmj/ConnectedApiVersion.java \
-      	${package_builddir}/mgmj/Disconnected.java \
       	${package_builddir}/mgmj/NdbFilterItem.java \
       	${package_builddir}/mgmj/NdbFilterList.java \
       	${package_builddir}/mgmj/NdbLogEventCategoryListener.java \
       	${package_builddir}/mgmj/NdbLogEventListener.java \
       	${package_builddir}/mgmj/NdbLogEventManager.java \
-      	${package_builddir}/mgmj/NdbLogEventTypeListener.java 
+      	${package_builddir}/mgmj/NdbLogEventTypeListener.java \
+	${package_builddir}/mgmj/SWIG*.java  \
+	${package_builddir}/mgmj/*Event.java 
 
 MGMAPI_BUILT_SRC = ${builddir}/mgmj.cxx $(MGMAPI_BUILT_J)
 BUILT_SOURCES = $(NDBAPI_BUILT_SRC) $(MGMAPI_BUILT_SRC)
@@ -268,20 +263,16 @@
       	${package_builddir}/mgmj/NodeType.class \
       	${package_builddir}/mgmj/NdbMgmLoglevel.class \
       	${package_builddir}/mgmj/NdbMgmSeverity.class \
-      	${package_builddir}/mgmj/BackupAborted.class \
-      	${package_builddir}/mgmj/BaseEvent.class \
-      	${package_builddir}/mgmj/CommunicationClosed.class \
-      	${package_builddir}/mgmj/CommunicationOpened.class \
-      	${package_builddir}/mgmj/Connected.class \
-      	${package_builddir}/mgmj/ConnectedApiVersion.class \
-      	${package_builddir}/mgmj/Disconnected.class \
       	${package_builddir}/mgmj/NdbFilterItem.class \
       	${package_builddir}/mgmj/NdbFilterList.class \
       	${package_builddir}/mgmj/NdbLogEventCategoryListener.class \
       	${package_builddir}/mgmj/NdbLogEventListener.class \
       	${package_builddir}/mgmj/NdbLogEventManager.class \
       	${package_builddir}/mgmj/NdbLogEventTypeListener.class  \
-	${package_builddir}/mgmj/MgmApiException.class
+	${package_builddir}/mgmj/MgmApiException.class \
+	${package_builddir}/mgmj/SWIG*class \
+	${package_builddir}/mgmj/*Event.class
+
 
 EXTRA_DIST = lib build.xml ndbj.props.in ndbj.i mgmj.i swig $(NDBAPI_JAVA_SRC)
$(MGMAPI_JAVA_SRC) 
 

=== modified file 'java/build.xml'
--- a/java/build.xml	2007-11-16 04:28:11 +0000
+++ b/java/build.xml	2007-11-17 20:13:52 +0000
@@ -106,6 +106,16 @@
       <classpath refid="NdbConnectors.classpath"/>
     </java>
   </target>
+  <target name="testoom">
+     <mkdir dir="${junit.output.dir}"/>
+     <junit fork="yes" printsummary="withOutAndErr">
+      <formatter type="xml"/>
+      <sysproperty key="com.mysql.jdbc.testsuite.url"
value="jdbc:mysql://${MYSQLHOST}/test" />
+      <test name="testsuite.ndbj.OutOfConnectionProblemTest"
todir="${junit.output.dir}"/>
+      <env key="LD_LIBRARY_PATH" value=".libs"/>
+      <classpath refid="NdbConnectors.classpath"/>
+    </junit>
+  </target>
   <target name="testasync">
      <mkdir dir="${junit.output.dir}"/>
      <junit fork="yes" printsummary="withOutAndErr">