bzr push into mysql-5.5-cluster branch (jonas.oreland:3434 to 3435)

[jonas oreland]

 3435 jonas oreland	2011-07-31
      ndb - fix out-of-source-build for java stuff (jtie/clusterj)

    modified:
      storage/ndb/clusterj/CMakeLists.txt
      storage/ndb/clusterj/clusterj-api/CMakeLists.txt
      storage/ndb/clusterj/clusterj-core/CMakeLists.txt
      storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt
      storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt
      storage/ndb/clusterj/clusterj-tie/CMakeLists.txt
      storage/ndb/src/ndbjtie/jtie/test/myjapi/CMakeLists.txt
      storage/ndb/src/ndbjtie/jtie/test/unload/CMakeLists.txt
      storage/ndb/src/ndbjtie/test/CMakeLists.txt
 3434 jonas oreland	2011-07-17 [merge]
      ndb - merge 55-main into local 55

    modified:
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch.result
      mysql-test/suite/ndb_rpl/t/disabled.def
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch.cnf
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch.test
=== modified file 'storage/ndb/clusterj/CMakeLists.txt'
--- a/storage/ndb/clusterj/CMakeLists.txt	2011-07-17 16:24:18 +0000
+++ b/storage/ndb/clusterj/CMakeLists.txt	2011-07-31 10:04:20 +0000
@@ -59,5 +59,5 @@ CREATE_MANIFEST(clusterj_manifest.mf ${C
 
 CREATE_JAR(clusterj
   MERGE_JARS ${JARS}
-  MANIFEST clusterj_manifest.mf
+  MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/clusterj_manifest.mf
   DEPENDENCIES ${DEP} )

=== modified file 'storage/ndb/clusterj/clusterj-api/CMakeLists.txt'
--- a/storage/ndb/clusterj/clusterj-api/CMakeLists.txt	2011-07-17 16:24:18 +0000
+++ b/storage/ndb/clusterj/clusterj-api/CMakeLists.txt	2011-07-31 10:04:20 +0000
@@ -29,4 +29,4 @@ CREATE_MANIFEST(manifest.mf ${CLUSTERJ_A
 
 CREATE_JAR(clusterj-api ${JAVA_SOURCES}
   CLASSPATH target/classes
-  MANIFEST manifest.mf)
+  MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/manifest.mf)

=== modified file 'storage/ndb/clusterj/clusterj-core/CMakeLists.txt'
--- a/storage/ndb/clusterj/clusterj-core/CMakeLists.txt	2011-07-17 16:24:18 +0000
+++ b/storage/ndb/clusterj/clusterj-core/CMakeLists.txt	2011-07-31 10:04:20 +0000
@@ -29,7 +29,7 @@ ENDFOREACH()
 
 SET ( CLASSPATH 
   target/classes
-  ${CMAKE_SOURCE_DIR}/storage/ndb/clusterj/clusterj-api/target/classes)
+  ${CMAKE_BINARY_DIR}/storage/ndb/clusterj/clusterj-api/target/classes)
 
 CREATE_JAR(clusterj-core ${JAVA_SOURCES}
   CLASSPATH ${CLASSPATH}

=== modified file 'storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt'
--- a/storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt	2011-07-17 16:24:18 +0000
+++ b/storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt	2011-07-31 10:04:20 +0000
@@ -25,7 +25,7 @@ ENDFOREACH()
 
 SET ( CLASSPATH 
   target/classes
-  ${CMAKE_SOURCE_DIR}/storage/ndb/clusterj/clusterj-core/target/classes
+  ${CMAKE_BINARY_DIR}/storage/ndb/clusterj/clusterj-core/target/classes
   ${WITH_CLASSPATH})
 
 SET(CLUSTERJ_JPATEST_EXPORTS com.mysql.clusterj.jpatest,com.mysql.clusterj.jpatest.model)
@@ -33,7 +33,7 @@ CREATE_MANIFEST(manifest.mf ${CLUSTERJ_J
 
 CREATE_JAR(clusterj-jpatest ${JAVA_SOURCES} 
   CLASSPATH ${CLASSPATH}
-  MANIFEST manifest.mf
+  MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/manifest.mf
   ENHANCE ${CMAKE_CURRENT_SOURCE_DIR}/src/main/resources/META-INF/persistence.xml
   DEPENDENCIES clusterjpa.jar
   EXTRA_FILES src/main/resources/META-INF)

=== modified file 'storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt'
--- a/storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt	2011-07-17 16:24:18 +0000
+++ b/storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt	2011-07-31 10:04:20 +0000
@@ -31,15 +31,15 @@ FILE(GLOB JAVA_SOURCES ${CMAKE_CURRENT_S
 
 SET(CLASSPATH 
   target/classes
-  ${CMAKE_SOURCE_DIR}/storage/ndb/clusterj/clusterj-api/target/classes
-  ${CMAKE_SOURCE_DIR}/storage/ndb/clusterj/clusterj-core/target/classes
+  ${CMAKE_BINARY_DIR}/storage/ndb/clusterj/clusterj-api/target/classes
+  ${CMAKE_BINARY_DIR}/storage/ndb/clusterj/clusterj-core/target/classes
   ${WITH_CLASSPATH})
 
 SET(CLUSTERJPA_EXPORTS "${CLUSTERJ_EXPORTS},com.mysql.clusterj.openjpa")
 CREATE_MANIFEST(clusterjpa_manifest.mf ${CLUSTERJPA_EXPORTS} clusterjpa)
 CREATE_JAR(clusterjpa ${JAVA_SOURCES}
   CLASSPATH ${CLASSPATH}
-  MANIFEST clusterjpa_manifest.mf
+  MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/clusterjpa_manifest.mf
   DEPENDENCIES ${DEP}
   MERGE_JARS ${JARS})
 

=== modified file 'storage/ndb/clusterj/clusterj-tie/CMakeLists.txt'
--- a/storage/ndb/clusterj/clusterj-tie/CMakeLists.txt	2011-07-17 16:24:18 +0000
+++ b/storage/ndb/clusterj/clusterj-tie/CMakeLists.txt	2011-07-31 10:04:20 +0000
@@ -17,10 +17,10 @@ FILE(GLOB JAVA_SOURCES ${CMAKE_CURRENT_S
 
 SET ( CLASSPATH 
   target/classes
-  ${CMAKE_SOURCE_DIR}/storage/ndb/clusterj/clusterj-api/target/classes
-  ${CMAKE_SOURCE_DIR}/storage/ndb/clusterj/clusterj-core/target/classes
-  ${CMAKE_SOURCE_DIR}/storage/ndb/src/ndbjtie/target/classes
-  ${CMAKE_SOURCE_DIR}/storage/ndb/src/ndbjtie/jtie/target/classes)
+  ${CMAKE_BINARY_DIR}/storage/ndb/clusterj/clusterj-api/target/classes
+  ${CMAKE_BINARY_DIR}/storage/ndb/clusterj/clusterj-core/target/classes
+  ${CMAKE_BINARY_DIR}/storage/ndb/src/ndbjtie/target/classes
+  ${CMAKE_BINARY_DIR}/storage/ndb/src/ndbjtie/jtie/target/classes)
 
 SET ( JAR_DEPENDENCIES
   clusterj-core.jar

=== modified file 'storage/ndb/src/ndbjtie/jtie/test/myjapi/CMakeLists.txt'
--- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/CMakeLists.txt	2011-07-17 16:24:18 +0000
+++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/CMakeLists.txt	2011-07-31 10:04:20 +0000
@@ -18,6 +18,6 @@ FILE(GLOB src1 ${CMAKE_CURRENT_SOURCE_DI
 FILE(GLOB src2 ${CMAKE_CURRENT_SOURCE_DIR}/test/*.java)
 
 CREATE_JAR(jtie-test-myjapi ${src1} ${src2}
-  CLASSPATH ${CMAKE_SOURCE_DIR}/storage/ndb/src/ndbjtie/jtie/target/classes
+  CLASSPATH ${CMAKE_BINARY_DIR}/storage/ndb/src/ndbjtie/jtie/target/classes
   DEPENDENCIES jtie.jar)
 

=== modified file 'storage/ndb/src/ndbjtie/jtie/test/unload/CMakeLists.txt'
--- a/storage/ndb/src/ndbjtie/jtie/test/unload/CMakeLists.txt	2011-07-17 16:24:18 +0000
+++ b/storage/ndb/src/ndbjtie/jtie/test/unload/CMakeLists.txt	2011-07-31 10:04:20 +0000
@@ -17,6 +17,6 @@
 FILE(GLOB src ${CMAKE_CURRENT_SOURCE_DIR}/test/*.java)
 
 CREATE_JAR(jtie-test-unload ${src}
-  CLASSPATH ${CMAKE_SOURCE_DIR}/storage/ndb/src/ndbjtie/jtie/target/classes
+  CLASSPATH ${CMAKE_BINARY_DIR}/storage/ndb/src/ndbjtie/jtie/target/classes
   DEPENDENCIES jtie.jar)
 

=== modified file 'storage/ndb/src/ndbjtie/test/CMakeLists.txt'
--- a/storage/ndb/src/ndbjtie/test/CMakeLists.txt	2011-07-17 16:24:18 +0000
+++ b/storage/ndb/src/ndbjtie/test/CMakeLists.txt	2011-07-31 10:04:20 +0000
@@ -16,9 +16,9 @@
 FILE(GLOB JAVA_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/test/*.java)
 
 SET ( CLASSPATH 
-  ${CMAKE_SOURCE_DIR}/storage/ndb/src/ndbjtie/target/classes
-  ${CMAKE_SOURCE_DIR}/storage/ndb/src/ndbjtie/jtie/target/classes
-  ${CMAKE_SOURCE_DIR}/storage/ndb/src/ndbjtie/jtie/test/myjapi/target/classes)
+  ${CMAKE_BINARY_DIR}/storage/ndb/src/ndbjtie/target/classes
+  ${CMAKE_BINARY_DIR}/storage/ndb/src/ndbjtie/jtie/target/classes
+  ${CMAKE_BINARY_DIR}/storage/ndb/src/ndbjtie/jtie/test/myjapi/target/classes)
 
 CREATE_JAR(ndbjtie-test ${JAVA_SOURCES} 
   CLASSPATH ${CLASSPATH} 

No bundle (reason: useless for push emails).