[Zorba-coders] [Merge] lp:~zorba-coders/zorba/xmlbeans-home-search into lp:zorba/schema-tools-module

2012-05-23 Thread Chris Hillery 
Chris Hillery has proposed merging lp:~zorba-coders/zorba/xmlbeans-home-search 
into lp:zorba/schema-tools-module.

Requested reviews:
  Zorba Coders (zorba-coders)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/xmlbeans-home-search/+merge/106967
-- 
https://code.launchpad.net/~zorba-coders/zorba/xmlbeans-home-search/+merge/106967
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/xmlbeans-home-search into lp:zorba/schema-tools-module.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-04-30 09:56:55 +
+++ CMakeLists.txt	2012-05-23 09:15:22 +
@@ -25,15 +25,14 @@
   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)
+SET (XMLBEANS_PATHS)
+IF (NOT WIN32)
+  SET (XMLBEANS_PATHS /usr/share/java /usr/share/java/xmlbeans)
+ENDIF (NOT WIN32)
+FIND_FILE(XMLBEANS_JAR NAMES xmlbeans.jar xbean.jar
+  PATHS $ENV{XMLBEANS_HOME} ${XMLBEANS_PATHS}
+  PATH_SUFFIXES lib build/lib)
+
 IF( EXISTS ${XMLBEANS_JAR} )
   
   MESSAGE (STATUS xmlbeans.jar found at:  ${XMLBEANS_JAR} )

-- 
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/xmlbeans-home-search into lp:zorba/schema-tools-module

2012-05-23 Thread Chris Hillery 
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/xmlbeans-home-search/+merge/106967
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/xmlbeans-home-search into lp:zorba/schema-tools-module

2012-05-23 Thread William Candillon 
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/xmlbeans-home-search/+merge/106967
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/xmlbeans-home-search into lp:zorba/schema-tools-module

2012-05-23 Thread William Candillon 
The proposal to merge lp:~zorba-coders/zorba/xmlbeans-home-search into 
lp:zorba/schema-tools-module has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/xmlbeans-home-search/+merge/106967
-- 
https://code.launchpad.net/~zorba-coders/zorba/xmlbeans-home-search/+merge/106967
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/xmlbeans-home-search into lp:zorba/schema-tools-module

2012-05-23 Thread Zorba Build Bot 
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/xmlbeans-home-search-2012-05-23T09-29-44.512Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/xmlbeans-home-search/+merge/106967
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/xmlbeans-home-search into lp:zorba/schema-tools-module

2012-05-23 Thread Zorba Build Bot 
Validation queue job xmlbeans-home-search-2012-05-23T09-29-44.512Z is finished. 
The final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/xmlbeans-home-search/+merge/106967
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/xmlbeans-home-search into lp:zorba/schema-tools-module

2012-05-23 Thread noreply 
The proposal to merge lp:~zorba-coders/zorba/xmlbeans-home-search into 
lp:zorba/schema-tools-module has been updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/xmlbeans-home-search/+merge/106967
-- 
https://code.launchpad.net/~zorba-coders/zorba/xmlbeans-home-search/+merge/106967
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