[Zorba-coders] [Merge] lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module
The proposal to merge lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 -- https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-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/pdf-installer-fix into lp:zorba/read-pdf-module
Validation queue job pdf-installer-fix-2013-05-28T21-22-42.261Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-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/pdf-installer-fix into lp:zorba/read-pdf-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pdf-installer-fix-2013-05-28T21-22-42.261Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-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/pdf-installer-fix into lp:zorba/read-pdf-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-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/pdf-installer-fix into lp:zorba/read-pdf-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-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/pdf-installer-fix into lp:zorba/read-pdf-module
The proposal to merge lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 -- https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-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/pdf-installer-fix into lp:zorba/read-pdf-module
The proposal to merge lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 -- https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-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/pdf-installer-fix into lp:zorba/read-pdf-module
The attempt to merge lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:281 (message): Validation queue job pdf-installer-fix-2013-05-28T17-10-42.014Z is finished. The final status was: 15 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/pdf-installer-fix/+merge/166107 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-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/pdf-installer-fix into lp:zorba/read-pdf-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pdf-installer-fix-2013-05-28T17-10-42.014Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-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/pdf-installer-fix into lp:zorba/read-pdf-module
The proposal to merge lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 -- https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-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/pdf-installer-fix into lp:zorba/read-pdf-module
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/pdf-installer-fix
into lp:zorba/read-pdf-module.
Commit message:
Fixes for Ubuntu Packages.
Requested reviews:
Juan Zacarias (juan457)
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107
Fixes for Ubuntu Packages.
--
https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107
Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-module.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-09-28 19:38:29 +
+++ CMakeLists.txt 2013-05-28 17:07:53 +
@@ -21,8 +21,16 @@
# variables will be set. util-jvm also caches Java_FOUND and JNI_FOUND
# for us.
FIND_PACKAGE (zorba_util-jvm_module QUIET)
+INCLUDE ("${zorba_util-jvm_module_USE_FILE}")
IF (zorba_util-jvm_module_FOUND)
+ FIND_PACKAGE (Zorba REQUIRED HINTS "${ZORBA_BUILD_DIR}")
+ INCLUDE ("${Zorba_USE_FILE}")
+
+ SET_CMAKE_MODULE_PATH ()
+ FIND_PACKAGE(JNI)
+ FIND_PACKAGE(Java)
+
IF (JNI_FOUND)
INCLUDE_DIRECTORIES (${zorba_util-jvm_module_INCLUDE_DIRS})
@@ -43,6 +51,11 @@
ZORBA_FIND_JAR( JEMPBOX_JAR NAMES jempbox PATHS ${PDFBOX_PATH} )
ZORBA_FIND_JAR( COMMLOG_JAR NAMES commons-logging PATHS ${PDFBOX_PATH} )
+MESSAGE(STATUS "commons-logging.jar Found in: ${COMMLOG_JAR}")
+MESSAGE(STATUS "jempbox.jar Found in: ${JEMPBOX_JAR}")
+MESSAGE(STATUS "fontbox.jar Found in: ${FONTBOX_JAR}")
+MESSAGE(STATUS "pdfbox.jar Found in: ${PDFBOX_JAR}")
+
SET(ALL_PDFBOX_JARS FALSE)
IF(EXISTS ${PDFBOX_JAR})
IF(EXISTS ${FONTBOX_JAR})
@@ -64,11 +77,6 @@
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")
@@ -86,4 +94,4 @@
MESSAGE (STATUS "Zorba's util-jvm module not found; skipping read-pdf module.")
ENDIF (zorba_util-jvm_module_FOUND)
-MESSAGE (STATUS " --- End module: read-pdf---")
\ No newline at end of file
+MESSAGE (STATUS " --- End module: read-pdf---")
=== modified file 'cmake_modules/FindJNI.cmake'
--- cmake_modules/FindJNI.cmake 2012-09-17 19:26:21 +
+++ cmake_modules/FindJNI.cmake 2013-05-28 17:07:53 +
@@ -14,17 +14,35 @@
#
#=
-# Copyright 2001-2009 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
+# Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# * Neither the names of Kitware, Inc., the Insight Software Consortium, nor
+# the names of their contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
#=
-# (To distribute this file outside of CMake, substitute the full
-# License text for the above reference.)
# Expand {libarch} occurences to java_libarch subdirectory(-ies) and set ${_var}
MACRO(java_append_library_directories _var)
@@ -101,6 +119,18 @@
${_JAVA_HOME}/jre/lib
${_JAVA_HOME}/lib
${_JAVA_HOME}
+ /usr/lib/jvm/java-6-openjdk/jre/lib
+ /usr/lib/jvm/java-6-openjdk-i386/jre/lib
+ /usr/lib/jvm/j
