[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-990587-schema-tools into lp:zorba/schema-tools-module

2012-04-30 Thread noreply 
The proposal to merge lp:~zorba-coders/zorba/bug-990587-schema-tools into 
lp:zorba/schema-tools-module has been updated.

Status: Approved => Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-990587-schema-tools/+merge/104079
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-990587-schema-tools/+merge/104079
Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-990587-schema-tools into lp:zorba/schema-tools-module

2012-04-30 Thread Zorba Build Bot 
Validation queue job bug-990587-schema-tools-2012-05-01T00-52-53.21Z is 
finished. The final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-990587-schema-tools/+merge/104079
Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-990587-schema-tools into lp:zorba/schema-tools-module

2012-04-30 Thread Zorba Build Bot 
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bug-990587-schema-tools-2012-05-01T00-52-53.21Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-990587-schema-tools/+merge/104079
Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-990587-schema-tools into lp:zorba/schema-tools-module

2012-04-30 Thread Chris Hillery 
The proposal to merge lp:~zorba-coders/zorba/bug-990587-schema-tools into 
lp:zorba/schema-tools-module has been updated.

Status: Needs review => Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-990587-schema-tools/+merge/104079
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-990587-schema-tools/+merge/104079
Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-990587-schema-tools into lp:zorba/schema-tools-module

2012-04-30 Thread Zorba Build Bot 
The proposal to merge lp:~zorba-coders/zorba/bug-990587-schema-tools into 
lp:zorba/schema-tools-module has been updated.

Status: Approved => Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-990587-schema-tools/+merge/104079
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-990587-schema-tools/+merge/104079
Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-990587-schema-tools into lp:zorba/schema-tools-module

2012-04-30 Thread Zorba Build Bot 
The attempt to merge lp:~zorba-coders/zorba/bug-990587-schema-tools into 
lp:zorba/schema-tools-module failed. Below is the output from the failed tests.


CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 
(message):
  Validation queue job bug-990587-schema-tools-2012-04-30T21-51-49.171Z is
  finished.  The final status was:

  

  2 tests did not succeed - changes not commited.


Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-990587-schema-tools/+merge/104079
Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-990587-schema-tools into lp:zorba/schema-tools-module

2012-04-30 Thread Zorba Build Bot 
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bug-990587-schema-tools-2012-04-30T21-51-49.171Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-990587-schema-tools/+merge/104079
Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-990587-schema-tools into lp:zorba/schema-tools-module

2012-04-30 Thread Nicolae Brinza 
Review: Approve

Tested it and it works.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-990587-schema-tools/+merge/104079
Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-990587-schema-tools into lp:zorba/schema-tools-module

2012-04-30 Thread Chris Hillery 
The proposal to merge lp:~zorba-coders/zorba/bug-990587-schema-tools into 
lp:zorba/schema-tools-module has been updated.

Status: Needs review => Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-990587-schema-tools/+merge/104079
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-990587-schema-tools/+merge/104079
Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-990587-schema-tools into lp:zorba/schema-tools-module

2012-04-30 Thread Chris Hillery 
The proposal to merge lp:~zorba-coders/zorba/bug-990587-schema-tools into 
lp:zorba/schema-tools-module has been updated.

Commit Message changed to:

Report gracefully if util-jvm module is not found.

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-990587-schema-tools/+merge/104079
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-990587-schema-tools/+merge/104079
Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-990587-schema-tools into lp:zorba/schema-tools-module

2012-04-30 Thread Chris Hillery 
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-990587-schema-tools/+merge/104079
Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-990587-schema-tools into lp:zorba/schema-tools-module

2012-04-30 Thread Chris Hillery 
Chris Hillery has proposed merging 
lp:~zorba-coders/zorba/bug-990587-schema-tools into 
lp:zorba/schema-tools-module.

Requested reviews:
  Chris Hillery (ceejatec)
  Nicolae Brinza (nbrinza)
Related bugs:
  Bug #990587 in Zorba: "Zorba with modules does not build if only JRE is 
installed (no javac or jar)"
  https://bugs.launchpad.net/zorba/+bug/990587

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-990587-schema-tools/+merge/104079
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-990587-schema-tools/+merge/104079
Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-04-05 11:51:23 +
+++ CMakeLists.txt	2012-04-30 10:01:27 +
@@ -19,43 +19,48 @@
 # The util-jvm tool finds Java and JNI, so all standard cached JAVA_
 # variables will be set. util-jvm also caches Java_FOUND and JNI_FOUND
 # for us.
-FIND_PACKAGE (zorba_util-jvm_module REQUIRED)
-
-IF (JNI_FOUND)
-  INCLUDE_DIRECTORIES (${zorba_util-jvm_module_INCLUDE_DIRS})
-
-  IF (WIN32)
-SET (XMLBEANS_PATH $ENV{XMLBEANS_HOME}\\lib)
-FIND_FILE( XMLBEANS_JAR NAMES xmlbeans.jar xbean.jar
-  PATHS ${XMLBEANS_PATH} )
-MESSAGE (STATUS "xmlbeans.jar looking path: " ${XMLBEANS_PATH} )
-  ELSE (WIN32)
-FIND_FILE( XMLBEANS_JAR NAMES xmlbeans.jar xbean.jar
-  PATHS /usr/share/java/ /usr/share/java/xmlbeans/ )
-  ENDIF (WIN32)
-  IF( EXISTS ${XMLBEANS_JAR} )
+FIND_PACKAGE (zorba_util-jvm_module QUIET)
+
+IF (zorba_util-jvm_module_FOUND)
+  IF (JNI_FOUND)
+INCLUDE_DIRECTORIES (${zorba_util-jvm_module_INCLUDE_DIRS})
+
+IF (WIN32)
+  SET (XMLBEANS_PATH $ENV{XMLBEANS_HOME}\\lib)
+  FIND_FILE( XMLBEANS_JAR NAMES xmlbeans.jar xbean.jar
+	PATHS ${XMLBEANS_PATH} )
+  MESSAGE (STATUS "xmlbeans.jar looking path: " ${XMLBEANS_PATH} )
+ELSE (WIN32)
+  FIND_FILE( XMLBEANS_JAR NAMES xmlbeans.jar xbean.jar
+	PATHS /usr/share/java/ /usr/share/java/xmlbeans/ )
+ENDIF (WIN32)
+IF( EXISTS ${XMLBEANS_JAR} )
   
-MESSAGE (STATUS "xmlbeans.jar found at: " ${XMLBEANS_JAR} )
-# if everything is found build this module
-SET (SCHEMA_TOOLS_VERSION 1.0)
-
-ENABLE_TESTING ()
-INCLUDE (CTest)
-
-SET_CMAKE_MODULE_PATH ()
-
-FIND_PACKAGE (Zorba REQUIRED HINTS "${ZORBA_BUILD_DIR}")
-INCLUDE ("${Zorba_USE_FILE}")
-
-ADD_SUBDIRECTORY ("src")
-ADD_SUBDIRECTORY ("srcJava")
-ADD_TEST_DIRECTORY("${PROJECT_SOURCE_DIR}/test")
-DONE_DECLARING_ZORBA_URIS ()
-
-  ELSE( EXISTS ${XMLBEANS_JAR} )
-MESSAGE (STATUS "xmlbeans.jar not found; skipping schema-tools module.")
-  ENDIF( EXISTS ${XMLBEANS_JAR} )
-
-ELSE (JNI_FOUND)
-  MESSAGE (STATUS "Java and/or JNI not found; skipping schema-tools module.")
-ENDIF (JNI_FOUND)
+  MESSAGE (STATUS "xmlbeans.jar found at: " ${XMLBEANS_JAR} )
+  # if everything is found build this module
+  SET (SCHEMA_TOOLS_VERSION 1.0)
+
+  ENABLE_TESTING ()
+  INCLUDE (CTest)
+
+  SET_CMAKE_MODULE_PATH ()
+
+  FIND_PACKAGE (Zorba REQUIRED HINTS "${ZORBA_BUILD_DIR}")
+  INCLUDE ("${Zorba_USE_FILE}")
+
+  ADD_SUBDIRECTORY ("src")
+  ADD_SUBDIRECTORY ("srcJava")
+  ADD_TEST_DIRECTORY("${PROJECT_SOURCE_DIR}/test")
+  DONE_DECLARING_ZORBA_URIS ()
+
+ELSE( EXISTS ${XMLBEANS_JAR} )
+  MESSAGE (STATUS "xmlbeans.jar not found; skipping schema-tools module.")
+ENDIF( EXISTS ${XMLBEANS_JAR} )
+
+  ELSE (JNI_FOUND)
+MESSAGE (STATUS "Java and/or JNI not found; skipping schema-tools module.")
+  ENDIF (JNI_FOUND)
+
+ELSE (zorba_util-jvm_module_FOUND)
+  MESSAGE (STATUS "Zorba's util-jvm module not found; skipping schema-tools module.")
+ENDIF (zorba_util-jvm_module_FOUND)

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp