Rev 269: Merged. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3

[Monty Taylor]

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

------------------------------------------------------------
revno: 269
revision-id: mtaylor@stripped
parent: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: telco-6.3
timestamp: Tue 2007-12-04 23:17:01 -0800
message:
  Merged.
removed:
  java/lib/mysql-connector-java-5.0.4-bin.jar
mysqlconnectorjava5.-20070130205851-y8xfweyg7ktm3kq7-2
added:
  java/lib/mysql-connector-java-5.1.5-bin.jar
mysqlconnectorjava5.-20071205054433-ug2xnyzc703kky8w-1
modified:
  configure.in                   configure.in-20070228020914-u2pk759xg7thauwf-13
  java/.classpath                classpath-20071116042946-npnq9g3hwm24x1ga-1
  java/Makefile.am               makefile.am-20070415032352-9dpe6aurqcnuwcrd-1
    ------------------------------------------------------------
    revno: 192.1.25.1.107.1.2
    revision-id: mtaylor@stripped
    parent: mtaylor@stripped
    committer: Monty Taylor <mtaylor@stripped>
    branch nick: devel
    timestamp: Tue 2007-12-04 22:37:22 -0800
    message:
      Fixed java enums.
    removed:
      java/lib/mysql-connector-java-5.0.4-bin.jar
mysqlconnectorjava5.-20070130205851-y8xfweyg7ktm3kq7-2
    added:
      java/lib/mysql-connector-java-5.1.5-bin.jar
mysqlconnectorjava5.-20071205054433-ug2xnyzc703kky8w-1
    modified:
      configure.in                   configure.in-20070228020914-u2pk759xg7thauwf-13
      java/Makefile.am               makefile.am-20070415032352-9dpe6aurqcnuwcrd-1
      swig/Makefile.am               makefile.am-20071104211339-fod7yzi8t7xd3g0w-3
      swig/SWIG/Lib/java/enums.swg   enums.swg-20071104211339-fod7yzi8t7xd3g0w-909
      swig/SWIG/Lib/java/enumtypesafe.swg
enumtypesafe.swg-20071104211339-fod7yzi8t7xd3g0w-911
      swig/SWIG/Source/Modules/java.cxx java.cxx-20071104211339-fod7yzi8t7xd3g0w-1275
      swig/update_from_swigsvn.sh   
update_from_swigsvn.-20071104211339-fod7yzi8t7xd3g0w-5
=== removed file 'java/lib/mysql-connector-java-5.0.4-bin.jar'
Binary files a/java/lib/mysql-connector-java-5.0.4-bin.jar	2007-01-30 21:02:20 +0000 and
b/java/lib/mysql-connector-java-5.0.4-bin.jar	1970-01-01 00:00:00 +0000 differ
=== added file 'java/lib/mysql-connector-java-5.1.5-bin.jar'
Binary files a/java/lib/mysql-connector-java-5.1.5-bin.jar	1970-01-01 00:00:00 +0000 and
b/java/lib/mysql-connector-java-5.1.5-bin.jar	2007-12-05 06:37:22 +0000 differ
=== modified file 'configure.in'
--- a/configure.in	2007-12-05 00:50:57 +0000
+++ b/configure.in	2007-12-05 07:17:01 +0000
@@ -39,14 +39,17 @@
 AC_PROG_SWIG(1.3.32)
 AS_IF([test "x$SWIG" = "xno"],[
   SWIG_LIB="\${top_srcdir}/swig/SWIG/Lib"
-  SWIG="SWIG_LIB=${SWIG_LIB} \${top_builddir}/swig/SWIG/swig"
+  SWIG_BIN="\${top_builddir}/swig/SWIG/swig"
+  SWIG="SWIG_LIB=${SWIG_LIB} ${SWIG_BIN}"
   build_swig=yes
 ],[
   build_swig=no
+  SWIG_BIN="${SWIG}"
 ])  
 SWIG_ENABLE_CXX()
 AC_SUBST(SWIG)
 AC_SUBST(SWIG_LIB)
+AC_SUBST(SWIG_BIN)
 
 
 

=== modified file 'java/.classpath'
--- a/java/.classpath	2007-11-24 04:18:07 +0000
+++ b/java/.classpath	2007-12-05 07:17:01 +0000
@@ -5,8 +5,8 @@
 			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY"
value="ndbj-telco-6.3/.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-6-sun/jre/lib/rt.jar"/>
+	<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.5-bin.jar"/>
 	<classpathentry kind="output" path=""/>
 </classpath>

=== modified file 'java/Makefile.am'
--- a/java/Makefile.am	2007-12-05 05:28:40 +0000
+++ b/java/Makefile.am	2007-12-05 07:17:01 +0000
@@ -326,7 +326,7 @@
 
 .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) $<
+	$(JAVAC) -classpath
$(srcdir):$(srcdir)/lib/mysql-connector-java-5.1.5-bin.jar:$(srcdir)/lib/junit.jar
-sourcepath $(srcdir):$(builddir) -d $(builddir) $<
 
 .i.cxx: 
 	@mkdir -p ${package_builddir}/$(*F)
@@ -335,19 +335,19 @@
 # $(NDBAPI_JAVA_CLASSES) $(MGMAPI_JAVA_CLASSES)
 mgmj.jar: libmgmj.la $(MGMAPI_JAVA_SRC) $(MGMAPI_BUILT_J)
 	@echo "Building MGM/J java files"
-	@$(JAVAC) -classpath
$(srcdir):$(srcdir)/lib/mysql-connector-java-5.0.4-bin.jar:$(srcdir)/lib/junit.jar
-sourcepath $(srcdir):$(builddir) -d $(builddir)  $(MGMAPI_JAVA_SRC) $(MGMAPI_BUILT_J)
+	@$(JAVAC) -classpath
$(srcdir):$(srcdir)/lib/mysql-connector-java-5.1.5-bin.jar:$(srcdir)/lib/junit.jar
-sourcepath $(srcdir):$(builddir) -d $(builddir)  $(MGMAPI_JAVA_SRC) $(MGMAPI_BUILT_J)
 	@echo "Building mgmj.jar"
 	@$(JAR) cf $@ $(MGMAPI_JAVA_CLASSES) ${package_builddir}/ndbj/*\$$*class
 
 ndbj.jar: libndbj.la $(NDBAPI_JAVA_SRC) $(NDBAPI_BUILT_J)
 	@echo "Building NDB/J java files"
-	@$(JAVAC) -classpath
$(srcdir):$(srcdir)/lib/mysql-connector-java-5.0.4-bin.jar:$(srcdir)/lib/junit.jar
-sourcepath $(srcdir):$(builddir) -d $(builddir)  $(NDBAPI_JAVA_SRC) $(NDBAPI_BUILT_J) 
+	@$(JAVAC) -classpath
$(srcdir):$(srcdir)/lib/mysql-connector-java-5.1.5-bin.jar:$(srcdir)/lib/junit.jar
-sourcepath $(srcdir):$(builddir) -d $(builddir)  $(NDBAPI_JAVA_SRC) $(NDBAPI_BUILT_J) 
 	@echo "Building ndbj.jar"
 	@$(JAR) cf $@ ${NDBAPI_JAVA_CLASSES} ${package_builddir}/ndbj/*\$$*class
 
 check-local: all-am
-	$(JAVA) -Djava.library.path=$(builddir)/.libs 
-Dcom.mysql.jdbc.testsuite.url=jdbc:mysql://localhost/test -classpath
$(builddir):$(builddir)/lib/mysql-connector-java-5.0.4-bin.jar:$(builddir)/lib/junit.jar 
junit.textui.TestRunner testsuite.ndbj.AllTests
-	$(JAVA) -Djava.library.path=$(builddir)/.libs 
-Dcom.mysql.jdbc.testsuite.url=jdbc:mysql://localhost/test -classpath
$(builddir):$(builddir)/lib/mysql-connector-java-5.0.4-bin.jar:$(builddir)/lib/junit.jar 
junit.textui.TestRunner testsuite.mgmj.AllTests
+	$(JAVA) -Djava.library.path=$(builddir)/.libs 
-Dcom.mysql.jdbc.testsuite.url=jdbc:mysql://localhost/test -classpath
$(builddir):$(builddir)/lib/mysql-connector-java-5.1.5-bin.jar:$(builddir)/lib/junit.jar 
junit.textui.TestRunner testsuite.ndbj.AllTests
+	$(JAVA) -Djava.library.path=$(builddir)/.libs 
-Dcom.mysql.jdbc.testsuite.url=jdbc:mysql://localhost/test -classpath
$(builddir):$(builddir)/lib/mysql-connector-java-5.1.5-bin.jar:$(builddir)/lib/junit.jar 
junit.textui.TestRunner testsuite.mgmj.AllTests
 
 install-exec-local: ndbj.jar mgmj.jar
 	mkdir -p $(DESTDIR)$(datadir)/java