Merge lp:~zorba-coders/zorba/not-packaging-external-jars into lp:zorba

[Matthias Brantner]

added a cmake variable that allows to configure whether external jars are packaged or not (ZORBA_PACKAGE_EXTERNAL_JARS)

- added a cmake variable that allows to configure whether external jars are packaged or not (ZORBA_PACKAGE_EXTERNAL_JARS)
- removed a test that started to fail if the ZORBA_PACKAGE_EXTERNAL_JARS variable is turned on. the test was actually cheating and didn't have an actual jar
- extended changelog for schema-tools and xsl-fo

[Chris Hillery (ceejatec)]

review: Approve

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/not-packaging-external-jars-2012-05-30T01-18-06.466Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job not-packaging-external-jars-2012-05-30T01-18-06.466Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2012-05-23 16:11:13 +0000
+++ ChangeLog	2012-05-30 00:41:21 +0000
@@ -24,6 +24,8 @@
     stream is seekable or not.
   * Added new functions in the fetch module and the StaticContext to fetch
     resources as binary
+  * Added non-core schema-tools module for getting sample XMLSchema from
+    XML instances and sample XML instances from XMLSchema.
 
 Optimizations:
   * optimized insertion into a collection (don't copy it if the node was
@@ -64,6 +66,7 @@
   * Fixed Bug #933490 (Error ItemFactoryImpl::createBase64Binary with istream)
   * Fixed bug #867112 (Diagnostic Handler was not working on external APIs)
   * Fixed bug #857842 (Assertion failed with simple content element with comments)
+  * Fixed bug #928626 (no setting classpath in xsl-fo module)
 
 version 2.2
 

=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake	2012-05-18 19:34:39 +0000
+++ cmake_modules/ZorbaModule.cmake	2012-05-30 00:41:21 +0000
@@ -481,16 +481,16 @@
   # Iterate over all supplied jar files
   FOREACH (_jar_file ${JAR_FILE})
 
-    IF (JAR_EXTERNAL)
+    IF (JAR_EXTERNAL AND NOT ZORBA_PACKAGE_EXTERNAL_JARS)
       # Put absolute path into classpath file
       FILE (APPEND "${_CP_FILE}" "${_jar_file}\n")
-    ELSE (JAR_EXTERNAL)
+    ELSE (JAR_EXTERNAL AND NOT ZORBA_PACKAGE_EXTERNAL_JARS)
       # Copy jar to jars/ directory and add relative path to classpath file
       GET_FILENAME_COMPONENT (_output_filename "${_jar_file}" NAME)
       ADD_COPY_RULE ("LIB" "${_jar_file}" "jars/${_output_filename}" "" 
 	"${JAR_TARGET}" 1 "${JAR_TEST_ONLY}")
       FILE (APPEND "${_CP_FILE}" "${_output_filename}\n")
-    ENDIF (JAR_EXTERNAL)
+    ENDIF (JAR_EXTERNAL AND NOT ZORBA_PACKAGE_EXTERNAL_JARS)
 
   ENDFOREACH (_jar_file)
 ENDMACRO (DECLARE_ZORBA_JAR)

=== modified file 'test/rbkt/modules/java/CMakeLists.txt'
--- test/rbkt/modules/java/CMakeLists.txt	2012-04-05 11:48:50 +0000
+++ test/rbkt/modules/java/CMakeLists.txt	2012-05-30 00:41:21 +0000
@@ -32,9 +32,5 @@
     DECLARE_ZORBA_JAR(FILE ${JavaTest_JAR_FILE} TARGET JavaTest TEST_ONLY)
     DECLARE_ZORBA_JAR(FILE ${JavaTest2_JAR_FILE} TARGET JavaTest2 TEST_ONLY)
 
-    # Pretend to tell Zorba about some system jars
-    DECLARE_ZORBA_JAR(EXTERNAL FILE
-      "${PROJECT_SOURCE_DIR}/MyJar.jar" "${PROJECT_SOURCE_DIR}/MyJar2.jar")
-
   ENDIF (Java_Development_FOUND)
 ENDIF (${RESULT} GREATER -1)