List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:November 16 2007 4:28am
Subject:Rev 255: Fixed java dir to build with automake and work with VPATH builds. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel
View as plain text  
At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel

------------------------------------------------------------
revno: 255
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: devel
timestamp: Thu 2007-11-15 20:28:11 -0800
message:
  Fixed java dir to build with automake and work with VPATH builds.
removed:
  java/.classpath                classpath-20070521182648-uuhans84tln3f4b6-2
modified:
  acinclude.m4                   acinclude.m4-20070228020914-u2pk759xg7thauwf-8
  configure.in                   configure.in-20070228020914-u2pk759xg7thauwf-13
  java/Makefile.am               makefile.am-20070415032352-9dpe6aurqcnuwcrd-1
  java/build.xml                 build.xml-20070521233115-yg3ylf2k3vuzr27o-1
=== removed file 'java/.classpath'
--- a/java/.classpath	2007-11-07 19:16:27 +0000
+++ b/java/.classpath	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="junit/|lib/" kind="src" path="">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY"
value="ndbj-devel/.libs"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="lib/mysql-connector-java-5.0.4-bin.jar"/>
-	<classpathentry kind="lib" path="/usr/share/java/junit.jar"/>
-	<classpathentry kind="lib" path="/usr/lib/jvm/java-1.5.0-sun/jre/lib/rt.jar"/>
-	<classpathentry kind="output" path=""/>
-</classpath>

=== modified file 'acinclude.m4'
--- a/acinclude.m4	2007-11-14 18:07:16 +0000
+++ b/acinclude.m4	2007-11-16 04:28:11 +0000
@@ -98,7 +98,7 @@
     [AS_HELP_STRING([--with-perl],
       [BULD NDB/Perl @<:@default=yes@:>@])],
     [with_perl=$withval], 
-    [with_perl=perl])
+    [with_perl=no])
 
 
   AS_IF([test "x$with_perl" != "xno"],[

=== modified file 'configure.in'
--- a/configure.in	2007-11-15 23:22:16 +0000
+++ b/configure.in	2007-11-16 04:28:11 +0000
@@ -35,7 +35,7 @@
 fi
 
 
-SWIG_LIB="\${top_builddir}/swig/SWIG/Lib"
+SWIG_LIB="\${top_srcdir}/swig/SWIG/Lib"
 SWIG="SWIG_LIB=${SWIG_LIB} \${top_builddir}/swig/SWIG/swig -c++"
 AC_SUBST(SWIG)
 AC_SUBST(SWIG_LIB)

=== modified file 'java/Makefile.am'
--- a/java/Makefile.am	2007-11-15 23:22:16 +0000
+++ b/java/Makefile.am	2007-11-16 04:28:11 +0000
@@ -1,29 +1,253 @@
-package_namespace = com/mysql/cluster
-ndbapi_examples_dir = $(package_namespace)/ndbapi/examples
-NDBAPI_BUILT_SRC = ndbj.cxx
-MGMAPI_BUILT_SRC = mgmj.cxx
+package_namespace=com/mysql/cluster
+package_builddir=$(builddir)/$(package_namespace)
+package_srcdir=$(srcdir)/$(package_namespace)
+ndbapi_examples_dir=$(package_namespace)/ndbapi/examples
+NDBAPI_BUILT_J = ${package_builddir}/ndbj/ndbj.java \
+	${package_builddir}/ndbj/ndbjConstants.java \
+	${package_builddir}/ndbj/ndbjJNI.java \
+	${package_builddir}/ndbj/NdbRecAttrImpl.java \
+	${package_builddir}/ndbj/NdbColumn.java \
+	${package_builddir}/ndbj/AbortOption.java \
+	${package_builddir}/ndbj/ExecType.java  \
+	${package_builddir}/ndbj/NdbDictionary.java \
+	${package_builddir}/ndbj/NdbEvent.java \
+	${package_builddir}/ndbj/NdbIndex.java \
+	${package_builddir}/ndbj/NdbObject.java \
+	${package_builddir}/ndbj/NdbTable.java \
+	${package_builddir}/ndbj/NdbError.java \
+	${package_builddir}/ndbj/NdbBlobImpl.java \
+	${package_builddir}/ndbj/NdbClusterConnectionImpl.java \
+	${package_builddir}/ndbj/NdbEventOperationImpl.java \
+	${package_builddir}/ndbj/NdbImpl.java \
+	${package_builddir}/ndbj/NdbIndexOperationImpl.java \
+	${package_builddir}/ndbj/NdbIndexScanOperationImpl.java \
+	${package_builddir}/ndbj/NdbOperationImpl.java \
+	${package_builddir}/ndbj/NdbScanOperationImpl.java \
+	${package_builddir}/ndbj/NdbTransactionImpl.java
+NDBAPI_BUILT_SRC = ${builddir}/ndbj.cxx $(NDBAPI_BUILT_J)
+
+MGMAPI_BUILT_J = ${package_builddir}/mgmj/mgmj.java
+      	${package_builddir}/mgmj/mgmjJNI.java \
+      	${package_builddir}/mgmj/mgmjConstants.java \
+      	${package_builddir}/mgmj/NdbLogEvent.java \
+      	${package_builddir}/mgmj/NdbLogEventType.java \
+      	${package_builddir}/mgmj/NdbMgmEventCategory.java \
+      	${package_builddir}/mgmj/NdbMgmEventSeverity.java \
+      	${package_builddir}/mgmj/NdbMgmLogeventManager.java \
+      	${package_builddir}/mgmj/ClusterState.java \
+      	${package_builddir}/mgmj/NdbMgm.java \
+      	${package_builddir}/mgmj/NdbMgmFactory.java \
+      	${package_builddir}/mgmj/NdbMgmError.java \
+      	${package_builddir}/mgmj/NdbMgmReply.java \
+      	${package_builddir}/mgmj/NodeState.java \
+      	${package_builddir}/mgmj/NodeStatus.java \
+      	${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 
+
+MGMAPI_BUILT_SRC = ${builddir}/mgmj.cxx $(MGMAPI_BUILT_J)
 BUILT_SOURCES = $(NDBAPI_BUILT_SRC) $(MGMAPI_BUILT_SRC)
-NDBAPI_SWIG_SRC = ndbj.i $(SWIG_NDB_SOURCES)
-MGMAPI_SWIG_SRC = mgmj.i $(SWIG_MGM_SOURCES)
-CLEANFILES = $(BUILT_SOURCES) *class *log ndbj.jar ndbj.h mgmj.h
+NDBAPI_SWIG_SRC = ${srcdir}/ndbj.i $(SWIG_NDB_SOURCES)
+MGMAPI_SWIG_SRC = ${srcdir}/mgmj.i $(SWIG_MGM_SOURCES)
+CLEANFILES = $(BUILT_SOURCES) ${builddir}/*class ${builddir}/*log ${builddir}/ndbj.jar
${builddir}/ndbj.h ${builddir}/mgmj.h ${package_builddir}/ndbj/*class
${package_builddir}/mgmj/*class testsuite/*class testsuite/ndbj/*class 
${package_builddir}/ndbj/*Ref.java ${package_builddir}/examples
 
+MGM_JAVA_SRC = ${package_srcdir}/mgmj/MgmApiException.java 
+NDB_JAVA_SRC = $(package_srcdir)/ndbj/BaseCallback.java \
+	${package_srcdir}/ndbj/BlobUndefinedException.java \
+	${package_srcdir}/ndbj/INdbEventCallable.java \
+	${package_srcdir}/ndbj/MgmApiException.java \
+	${package_srcdir}/ndbj/Ndb.java \
+	${package_srcdir}/ndbj/NdbApiException.java \
+	${package_srcdir}/ndbj/NdbApiPermanentException.java \
+	${package_srcdir}/ndbj/NdbApiRuntimeException.java \
+	${package_srcdir}/ndbj/NdbApiTemporaryException.java \
+	${package_srcdir}/ndbj/NdbApiTimeStampOutOfBoundsException.java \
+	${package_srcdir}/ndbj/NdbApiUserErrorPermanentException.java \
+	${package_srcdir}/ndbj/NdbBaseOperation.java \
+	${package_srcdir}/ndbj/NdbBaseOperationEquals.java \
+	${package_srcdir}/ndbj/NdbBlob.java \
+	${package_srcdir}/ndbj/NdbClusterConnection.java \
+	${package_srcdir}/ndbj/NdbClusterConnectionPermanentException.java \
+	${package_srcdir}/ndbj/NdbClusterConnectionTemporaryException.java \
+	${package_srcdir}/ndbj/NdbErrorNotAvailable.java \
+	${package_srcdir}/ndbj/NdbEventOperation.java \
+	${package_srcdir}/ndbj/NdbEventOperationResults.java \
+	${package_srcdir}/ndbj/NdbEventOperationResultsImpl.java \
+	${package_srcdir}/ndbj/NdbFactory.java \
+	${package_srcdir}/ndbj/NdbIndexOperation.java \
+	${package_srcdir}/ndbj/NdbIndexScanOperation.java \
+	${package_srcdir}/ndbj/NdbInterpretedOperation.java \
+	${package_srcdir}/ndbj/NdbOperation.java \
+	${package_srcdir}/ndbj/NdbOperationResults.java \
+	${package_srcdir}/ndbj/NdbOperationResultsImpl.java \
+	${package_srcdir}/ndbj/NdbRecAttr.java \
+	${package_srcdir}/ndbj/NdbResultSet.java \
+	${package_srcdir}/ndbj/NdbResultSetImpl.java \
+	${package_srcdir}/ndbj/NdbScanFilter.java \
+	${package_srcdir}/ndbj/NdbScanFilterImpl.java \
+	${package_srcdir}/ndbj/NdbScanOperation.java \
+	${package_srcdir}/ndbj/NdbTransaction.java \
+	${package_srcdir}/ndbj/NoSuchColumnException.java \
+	${package_srcdir}/ndbj/NoSuchIndexException.java \
+	${package_srcdir}/ndbj/NoSuchTableException.java \
+	${package_srcdir}/ndbj/examples/CRUDandScan.java \
+	${package_srcdir}/ndbj/examples/DeleteUsingPrimaryKey.java \
+	${package_srcdir}/ndbj/examples/ExamplesConfigurator.java \
+	${package_srcdir}/ndbj/examples/HelloWorldInsert.java \
+	${package_srcdir}/ndbj/examples/InsertUsingPrimaryKey.java \
+	${package_srcdir}/ndbj/examples/JoinUsingScanAndIndexScan.java \
+	${package_srcdir}/ndbj/examples/PrimaryKeyBatchOps.java \
+	${package_srcdir}/ndbj/examples/PrimaryKeyOpBlob.java \
+	${package_srcdir}/ndbj/examples/ReadRowsUsingTableScan.java \
+	${package_srcdir}/ndbj/examples/ReadUsingOrderedIndexOnPK.java \
+	${package_srcdir}/ndbj/examples/ReadUsingPrimaryKey.java \
+	${package_srcdir}/ndbj/examples/RetryTransaction.java \
+	${package_srcdir}/ndbj/examples/TestAsync.java \
+	${package_srcdir}/ndbj/examples/TestBaseCallback.java \
+	${package_srcdir}/ndbj/examples/TestEvent.java \
+	${package_srcdir}/ndbj/examples/UpdateUsingPrimaryKey.java \
+	${package_srcdir}/ndbj/util/NdbConfigurator.java \
+	${srcdir}/testsuite/BaseNdbjTestCase.java \
+	${srcdir}/testsuite/BaseTestCase.java \
+	${srcdir}/testsuite/TestCallback.java \
+	${srcdir}/testsuite/ndbj/BasicTest.java \
+	${srcdir}/testsuite/ndbj/ImmediatePollTimeoutTest.java \
+	${srcdir}/testsuite/ndbj/InsertRetryTest.java \
+	${srcdir}/testsuite/ndbj/Latin1InsertReadTest.java \
+	${srcdir}/testsuite/ndbj/MultiPartPrimaryKeyStringTest.java \
+	${srcdir}/testsuite/ndbj/MultipleAsyncTest.java \
+	${srcdir}/testsuite/ndbj/NdbBlobTest.java \
+	${srcdir}/testsuite/ndbj/NdbIndexScanOperationUtf8Latin1Test.java \
+	${srcdir}/testsuite/ndbj/NdbOperationByteLongTest.java \
+	${srcdir}/testsuite/ndbj/NdbOperationIDTest.java \
+	${srcdir}/testsuite/ndbj/NdbOperationMultiPartPrimaryKeyTest.java \
+	${srcdir}/testsuite/ndbj/NdbOperationTest.java \
+	${srcdir}/testsuite/ndbj/NdbOperationsFailedTest.java \
+	${srcdir}/testsuite/ndbj/NdbScanFilterTest.java \
+	${srcdir}/testsuite/ndbj/NdbScanTest.java \
+	${srcdir}/testsuite/ndbj/NdbTest.java \
+	${srcdir}/testsuite/ndbj/NullSetTest.java \
+	${srcdir}/testsuite/ndbj/OrderedIndexScanTest.java \
+	${srcdir}/testsuite/ndbj/QuickAsyncTest.java \
+	${srcdir}/testsuite/ndbj/QuickBFTest.java \
+	${srcdir}/testsuite/ndbj/SelectCountTest.java \
+	${srcdir}/testsuite/ndbj/Utf8InsertReadTest.java \
+	${srcdir}/testsuite/ndbj/OutOfConnectionProblemTest.java
+NDB_JAVA_CLASSES = $(package_builddir)/ndbj/BaseCallback.class \
+	${package_builddir}/ndbj/BlobUndefinedException.class \
+	${package_builddir}/ndbj/INdbEventCallable.class \
+	${package_builddir}/ndbj/MgmApiException.class \
+	${package_builddir}/ndbj/Ndb.class \
+	${package_builddir}/ndbj/NdbApiException.class \
+	${package_builddir}/ndbj/NdbApiPermanentException.class \
+	${package_builddir}/ndbj/NdbApiRuntimeException.class \
+	${package_builddir}/ndbj/NdbApiTemporaryException.class \
+	${package_builddir}/ndbj/NdbApiTimeStampOutOfBoundsException.class \
+	${package_builddir}/ndbj/NdbApiUserErrorPermanentException.class \
+	${package_builddir}/ndbj/NdbBaseOperation.class \
+	${package_builddir}/ndbj/NdbBaseOperationEquals.class \
+	${package_builddir}/ndbj/NdbBlob.class \
+	${package_builddir}/ndbj/NdbClusterConnection.class \
+	${package_builddir}/ndbj/NdbClusterConnectionPermanentException.class \
+	${package_builddir}/ndbj/NdbClusterConnectionTemporaryException.class \
+	${package_builddir}/ndbj/NdbErrorNotAvailable.class \
+	${package_builddir}/ndbj/NdbEventOperation.class \
+	${package_builddir}/ndbj/NdbEventOperationResults.class \
+	${package_builddir}/ndbj/NdbEventOperationResultsImpl.class \
+	${package_builddir}/ndbj/NdbFactory.class \
+	${package_builddir}/ndbj/NdbIndexOperation.class \
+	${package_builddir}/ndbj/NdbIndexScanOperation.class \
+	${package_builddir}/ndbj/NdbInterpretedOperation.class \
+	${package_builddir}/ndbj/NdbOperation.class \
+	${package_builddir}/ndbj/NdbOperationResults.class \
+	${package_builddir}/ndbj/NdbOperationResultsImpl.class \
+	${package_builddir}/ndbj/NdbRecAttr.class \
+	${package_builddir}/ndbj/NdbResultSet.class \
+	${package_builddir}/ndbj/NdbResultSetImpl.class \
+	${package_builddir}/ndbj/NdbScanFilter.class \
+	${package_builddir}/ndbj/NdbScanFilterImpl.class \
+	${package_builddir}/ndbj/NdbScanOperation.class \
+	${package_builddir}/ndbj/NdbTransaction.class \
+	${package_builddir}/ndbj/NoSuchColumnException.class \
+	${package_builddir}/ndbj/NoSuchIndexException.class \
+	${package_builddir}/ndbj/NoSuchTableException.class \
+	${package_builddir}/ndbj/examples/CRUDandScan.class \
+	${package_builddir}/ndbj/examples/DeleteUsingPrimaryKey.class \
+	${package_builddir}/ndbj/examples/ExamplesConfigurator.class \
+	${package_builddir}/ndbj/examples/HelloWorldInsert.class \
+	${package_builddir}/ndbj/examples/InsertUsingPrimaryKey.class \
+	${package_builddir}/ndbj/examples/JoinUsingScanAndIndexScan.class \
+	${package_builddir}/ndbj/examples/PrimaryKeyBatchOps.class \
+	${package_builddir}/ndbj/examples/PrimaryKeyOpBlob.class \
+	${package_builddir}/ndbj/examples/ReadRowsUsingTableScan.class \
+	${package_builddir}/ndbj/examples/ReadUsingOrderedIndexOnPK.class \
+	${package_builddir}/ndbj/examples/ReadUsingPrimaryKey.class \
+	${package_builddir}/ndbj/examples/RetryTransaction.class \
+	${package_builddir}/ndbj/examples/TestAsync.class \
+	${package_builddir}/ndbj/examples/TestBaseCallback.class \
+	${package_builddir}/ndbj/examples/TestEvent.class \
+	${package_builddir}/ndbj/examples/UpdateUsingPrimaryKey.class \
+	${package_builddir}/ndbj/util/NdbConfigurator.class \
+	${builddir}/testsuite/BaseNdbjTestCase.class \
+	${builddir}/testsuite/BaseTestCase.class \
+	${builddir}/testsuite/TestCallback.class \
+	${builddir}/testsuite/ndbj/BasicTest.class \
+	${builddir}/testsuite/ndbj/ImmediatePollTimeoutTest.class \
+	${builddir}/testsuite/ndbj/InsertRetryTest.class \
+	${builddir}/testsuite/ndbj/Latin1InsertReadTest.class \
+	${builddir}/testsuite/ndbj/MultiPartPrimaryKeyStringTest.class \
+	${builddir}/testsuite/ndbj/MultipleAsyncTest.class \
+	${builddir}/testsuite/ndbj/NdbBlobTest.class \
+	${builddir}/testsuite/ndbj/NdbIndexScanOperationUtf8Latin1Test.class \
+	${builddir}/testsuite/ndbj/NdbOperationByteLongTest.class \
+	${builddir}/testsuite/ndbj/NdbOperationIDTest.class \
+	${builddir}/testsuite/ndbj/NdbOperationMultiPartPrimaryKeyTest.class \
+	${builddir}/testsuite/ndbj/NdbOperationTest.class \
+	${builddir}/testsuite/ndbj/NdbOperationsFailedTest.class \
+	${builddir}/testsuite/ndbj/NdbScanFilterTest.class \
+	${builddir}/testsuite/ndbj/NdbScanTest.class \
+	${builddir}/testsuite/ndbj/NdbTest.class \
+	${builddir}/testsuite/ndbj/NullSetTest.class \
+	${builddir}/testsuite/ndbj/OrderedIndexScanTest.class \
+	${builddir}/testsuite/ndbj/QuickAsyncTest.class \
+	${builddir}/testsuite/ndbj/QuickBFTest.class \
+	${builddir}/testsuite/ndbj/SelectCountTest.class \
+	${builddir}/testsuite/ndbj/Utf8InsertReadTest.class \
+	${builddir}/testsuite/ndbj/OutOfConnectionProblemTest.class
+EXTRA_DIST = lib build.xml ndbj.props.in ndbj.i mgmj.i swig $(NDB_JAVA_SRC)
$(MGM_JAVA_SRC) 
 
 lib_LTLIBRARIES = libndbj.la libmgmj.la
-libndbj_la_SOURCES = ndbj.cxx
+nodist_libndbj_la_SOURCES = ndbj.cxx
 libndbj_la_LIBADD = -lstdc++
 libndbj_la_LDFLAGS = -fPIC
 libndbj_la_CPPFLAGS = $(JAVA_CXXFLAGS) $(PTHREAD_CFLAGS) -fPIC
-libmgmj_la_SOURCES = mgmj.cxx 
+nodist_libmgmj_la_SOURCES = mgmj.cxx 
 libmgmj_la_CPPFLAGS = $(JAVA_CXXFLAGS) $(PTHREAD_CFLAGS) -fPIC
 
 all-local: ndbj.jar 
 
 clean-local:
-	$(ANT) clean
 	@rm -f swig-stamp
 
 SUFFIXES = .cxx .i
 
+${NDBAPI_BUILT_J}: ndbj.cxx
+
+${MGMAPI_BUILT_J}: mgmj.cxx
+
 #swig-stamp:
 #	( cd $(top_builddir)/swig && $(MAKE) $(AM_MAKEFLAGS) )
 #	touch swig-stamp
@@ -32,93 +256,14 @@
 
 mgmj.cxx: ${MGMAPI_SWIG_SRC}
 
+.java.class:
+	@mkdir -p `dirname $*`
+	$(JAVAC) -classpath
$(srcdir):$(srcdir)/lib/mysql-connector-java-5.0.4-bin.jar:$(srcdir)/lib/junit.jar
-sourcepath $(srcdir):$(builddir) -d $(builddir) $<
+
 .i.cxx:  
-	$(SWIG) -java -outdir ${package_namespace}/$* -package `echo ${package_namespace}/$* |
sed 's,/,.,g'` -I$(SWIG_DIR) -I./swig $(MYSQL_INCLUDES) $(DEFAULT_INCLUDES) -o $@ $<
-
-ndbj.jar: libndbj.la libmgmj.la
-	$(ANT) build-jar
-
-EXTRA_DIST = lib build.xml ndbj.props.in ndbj.i mgmj.i swig \
-com/mysql/cluster/mgmj/MgmApiException.java \
-com/mysql/cluster/ndbj/BaseCallback.java \
-com/mysql/cluster/ndbj/BlobUndefinedException.java \
-com/mysql/cluster/ndbj/INdbEventCallable.java \
-com/mysql/cluster/ndbj/MgmApiException.java \
-com/mysql/cluster/ndbj/Ndb.java \
-com/mysql/cluster/ndbj/NdbApiException.java \
-com/mysql/cluster/ndbj/NdbApiPermanentException.java \
-com/mysql/cluster/ndbj/NdbApiRuntimeException.java \
-com/mysql/cluster/ndbj/NdbApiTemporaryException.java \
-com/mysql/cluster/ndbj/NdbApiTimeStampOutOfBoundsException.java \
-com/mysql/cluster/ndbj/NdbApiUserErrorPermanentException.java \
-com/mysql/cluster/ndbj/NdbBaseOperation.java \
-com/mysql/cluster/ndbj/NdbBaseOperationEquals.java \
-com/mysql/cluster/ndbj/NdbBlob.java \
-com/mysql/cluster/ndbj/NdbClusterConnection.java \
-com/mysql/cluster/ndbj/NdbClusterConnectionPermanentException.java \
-com/mysql/cluster/ndbj/NdbClusterConnectionTemporaryException.java \
-com/mysql/cluster/ndbj/NdbErrorNotAvailable.java \
-com/mysql/cluster/ndbj/NdbEventOperation.java \
-com/mysql/cluster/ndbj/NdbEventOperationResults.java \
-com/mysql/cluster/ndbj/NdbEventOperationResultsImpl.java \
-com/mysql/cluster/ndbj/NdbFactory.java \
-com/mysql/cluster/ndbj/NdbIndexOperation.java \
-com/mysql/cluster/ndbj/NdbIndexScanOperation.java \
-com/mysql/cluster/ndbj/NdbInterpretedOperation.java \
-com/mysql/cluster/ndbj/NdbOperation.java \
-com/mysql/cluster/ndbj/NdbOperationResults.java \
-com/mysql/cluster/ndbj/NdbOperationResultsImpl.java \
-com/mysql/cluster/ndbj/NdbRecAttr.java \
-com/mysql/cluster/ndbj/NdbResultSet.java \
-com/mysql/cluster/ndbj/NdbResultSetImpl.java \
-com/mysql/cluster/ndbj/NdbScanFilter.java \
-com/mysql/cluster/ndbj/NdbScanFilterImpl.java \
-com/mysql/cluster/ndbj/NdbScanOperation.java \
-com/mysql/cluster/ndbj/NdbTransaction.java \
-com/mysql/cluster/ndbj/NoSuchColumnException.java \
-com/mysql/cluster/ndbj/NoSuchIndexException.java \
-com/mysql/cluster/ndbj/NoSuchTableException.java \
-com/mysql/cluster/ndbj/examples/CRUDandScan.java \
-com/mysql/cluster/ndbj/examples/DeleteUsingPrimaryKey.java \
-com/mysql/cluster/ndbj/examples/ExamplesConfigurator.java \
-com/mysql/cluster/ndbj/examples/HelloWorldInsert.java \
-com/mysql/cluster/ndbj/examples/InsertUsingPrimaryKey.java \
-com/mysql/cluster/ndbj/examples/JoinUsingScanAndIndexScan.java \
-com/mysql/cluster/ndbj/examples/PrimaryKeyBatchOps.java \
-com/mysql/cluster/ndbj/examples/PrimaryKeyOpBlob.java \
-com/mysql/cluster/ndbj/examples/ReadRowsUsingTableScan.java \
-com/mysql/cluster/ndbj/examples/ReadUsingOrderedIndexOnPK.java \
-com/mysql/cluster/ndbj/examples/ReadUsingPrimaryKey.java \
-com/mysql/cluster/ndbj/examples/RetryTransaction.java \
-com/mysql/cluster/ndbj/examples/TestAsync.java \
-com/mysql/cluster/ndbj/examples/TestBaseCallback.java \
-com/mysql/cluster/ndbj/examples/TestEvent.java \
-com/mysql/cluster/ndbj/examples/UpdateUsingPrimaryKey.java \
-com/mysql/cluster/ndbj/util/NdbConfigurator.java \
-testsuite/BaseNdbjTestCase.java \
-testsuite/BaseTestCase.java \
-testsuite/TestCallback.java \
-testsuite/ndbj \
-testsuite/ndbj/BasicTest.java \
-testsuite/ndbj/ImmediatePollTimeoutTest.java \
-testsuite/ndbj/InsertRetryTest.java \
-testsuite/ndbj/Latin1InsertReadTest.java \
-testsuite/ndbj/MultiPartPrimaryKeyStringTest.java \
-testsuite/ndbj/MultipleAsyncTest.java \
-testsuite/ndbj/NdbBlobTest.java \
-testsuite/ndbj/NdbIndexScanOperationUtf8Latin1Test.java \
-testsuite/ndbj/NdbOperationByteLongTest.java \
-testsuite/ndbj/NdbOperationIDTest.java \
-testsuite/ndbj/NdbOperationMultiPartPrimaryKeyTest.java \
-testsuite/ndbj/NdbOperationTest.java \
-testsuite/ndbj/NdbOperationsFailedTest.java \
-testsuite/ndbj/NdbScanFilterTest.java \
-testsuite/ndbj/NdbScanTest.java \
-testsuite/ndbj/NdbTest.java \
-testsuite/ndbj/NullSetTest.java \
-testsuite/ndbj/OrderedIndexScanTest.java \
-testsuite/ndbj/QuickAsyncTest.java \
-testsuite/ndbj/QuickBFTest.java \
-testsuite/ndbj/SelectCountTest.java \
-testsuite/ndbj/Utf8InsertReadTest.java \
-testsuite/ndbj/OutOfConnectionProblemTest.java
+	@mkdir -p ${package_builddir}/$*
+	$(SWIG) -java -outdir ${builddir}/${package_namespace}/$* -package `echo
${package_namespace}/$* | sed 's,/,.,g'` -I$(SWIG_DIR) -I${srcdir}/swig $(MYSQL_INCLUDES)
$(DEFAULT_INCLUDES) -o $@ $<
+
+ndbj.jar: libndbj.la libmgmj.la $(NDB_JAVA_CLASSES)
+	$(JAR) cvf $@ $(NDB_JAVA_CLASSES) $(package_builddir)/ndbj/*class 
+

=== modified file 'java/build.xml'
--- a/java/build.xml	2007-10-31 15:04:37 +0000
+++ b/java/build.xml	2007-11-16 04:28:11 +0000
@@ -28,8 +28,6 @@
       <fileset dir="." includes="ndbj.jar"/>
       <fileset dir="com/mysql/cluster" includes="**/SWIG*" />
       <fileset dir="com/mysql/cluster" includes="**/*Ref*" />
-      <fileset dir="com/mysql/cluster/ndbj" includes="ndbj*" />
-      <fileset dir="com/mysql/cluster/ndbj" includes="NdbRecAttrImpl*" />
       <fileset dir="com/mysql/cluster/mgmj" includes="mgmj*" />
       <fileset dir="com/mysql/cluster/mgmj" includes="NdbLogEvent.java" />
       <fileset dir="com/mysql/cluster/mgmj" includes="NdbLogEventType.java" />
@@ -46,15 +44,6 @@
       <fileset dir="com/mysql/cluster/mgmj" includes="NodeType.java" />
       <fileset dir="com/mysql/cluster/mgmj" includes="NdbMgmLoglevel.java" />
       <fileset dir="com/mysql/cluster/mgmj" includes="NdbMgmSeverity.java" />
-      <fileset dir="com/mysql/cluster/ndbj" includes="NdbColumn.java" />
-      <fileset dir="com/mysql/cluster/ndbj" includes="AbortOption.java" />
-      <fileset dir="com/mysql/cluster/ndbj" includes="ExecType.java" />
-      <fileset dir="com/mysql/cluster/ndbj" includes="NdbDictionary.java" />
-      <fileset dir="com/mysql/cluster/ndbj" includes="NdbEvent.java" />
-      <fileset dir="com/mysql/cluster/ndbj" includes="NdbIndex.java" />
-      <fileset dir="com/mysql/cluster/ndbj" includes="NdbObject.java" />
-      <fileset dir="com/mysql/cluster/ndbj" includes="NdbTable.java" />
-      <fileset dir="com/mysql/cluster/ndbj" includes="NdbError.java" />
       <fileset dir="com/mysql/cluster/mgmj" includes="BackupAborted.java" />
       <fileset dir="com/mysql/cluster/mgmj" includes="BaseEvent.java" />
       <fileset dir="com/mysql/cluster/mgmj" includes="CommunicationClosed.java" />
@@ -68,16 +57,6 @@
       <fileset dir="com/mysql/cluster/mgmj" includes="NdbLogEventListener.java" />
       <fileset dir="com/mysql/cluster/mgmj" includes="NdbLogEventManager.java" />
       <fileset dir="com/mysql/cluster/mgmj" includes="NdbLogEventTypeListener.java"
/>
-      <fileset dir="com/mysql/cluster/ndbj" includes="BaseEventCallback.java" />
-      <fileset dir="com/mysql/cluster/ndbj" includes="NdbBlobImpl.java" />
-      <fileset dir="com/mysql/cluster/ndbj" includes="NdbClusterConnectionImpl.java"
/>
-      <fileset dir="com/mysql/cluster/ndbj" includes="NdbEventOperationImpl.java"
/>
-      <fileset dir="com/mysql/cluster/ndbj" includes="NdbImpl.java" />
-      <fileset dir="com/mysql/cluster/ndbj" includes="NdbIndexOperationImpl.java"
/>
-      <fileset dir="com/mysql/cluster/ndbj" includes="NdbIndexScanOperationImpl.java"
/>
-      <fileset dir="com/mysql/cluster/ndbj" includes="NdbOperationImpl.java" />
-      <fileset dir="com/mysql/cluster/ndbj" includes="NdbScanOperationImpl.java" />
-      <fileset dir="com/mysql/cluster/ndbj" includes="NdbTransactionImpl.java" />
 
     </delete>
     <delete dir="javadoc" />
@@ -127,7 +106,7 @@
       <classpath refid="NdbConnectors.classpath"/>
     </java>
   </target>
-  <target name="testasync" depends="build">
+  <target name="testasync">
      <mkdir dir="${junit.output.dir}"/>
      <junit fork="yes" printsummary="withOutAndErr">
       <formatter type="xml"/>

Thread
Rev 255: Fixed java dir to build with automake and work with VPATH builds. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/develMonty Taylor16 Nov