zorba-coders team mailing list archive

[Cezar Andrei <cezar.andrei@xxxxxxxxx>]

Cezar Andrei has proposed merging lp:~zorba-coders/zorba/zio-oracle-nosql into lp:zorba/oracle-nosql-db-module.

Commit message:
- Use new zorba.io namespace.
- Upgrade to latest Oracle Nosql DB version: kv-2.1.8.

Requested reviews:
  Cezar Andrei (cezar-andrei)
  Chris Hillery (ceejatec)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/zio-oracle-nosql/+merge/178785

- Use new zorba.io namespace.
- Upgrade to latest Oracle Nosql DB version: kv-2.1.8.
-- 
https://code.launchpad.net/~zorba-coders/zorba/zio-oracle-nosql/+merge/178785
Your team Zorba Coders is subscribed to branch lp:zorba/oracle-nosql-db-module.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-12-17 20:35:19 +0000
+++ CMakeLists.txt	2013-08-06 15:39:30 +0000
@@ -29,7 +29,7 @@
     MESSAGE (STATUS "NOSQLDB_HOME = " $ENV{NOSQLDB_HOME})
 
     IF (WIN32)
-      SET (NOSQLDB_PATH "$ENV{NOSQLDB_HOME} $ENV{NOSQLDB_HOME}\\lib C:\\Libs\\kv-1.2.123 C:\\dev\\libraries\\nosqldb C:\\dev\\libraries\\nosqldb\\lib")
+      SET (NOSQLDB_PATH "$ENV{NOSQLDB_HOME} $ENV{NOSQLDB_HOME}\\lib C:\\Libs\\kv-2.1.8 C:\\dev\\libraries\\nosqldb C:\\dev\\libraries\\nosqldb\\lib")
       MESSAGE (STATUS "pdfbox fontbox jars searching path: " ${NOSQLDB_PATH} )
     ELSE (WIN32)
       SET (NOSQLDB_PATH $ENV{NOSQLDB_HOME} $ENV{NOSQLDB_HOME}/lib

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-11-21 21:58:30 +0000
+++ src/CMakeLists.txt	2013-08-06 15:39:30 +0000
@@ -27,7 +27,7 @@
 INCLUDE_DIRECTORIES (${JAVA_INCLUDE_PATH})
 
 DECLARE_ZORBA_MODULE (
-  URI "http://www.zorba-xquery.com/modules/oracle-nosqldb";
+  URI "http://zorba.io/modules/oracle-nosqldb";
   VERSION 1.0
   FILE "nosqldb.xq"
   ### CONFIG_FILES ../srcJava/org/zorbaxquery/modules/nosqldb/Config.java.in

=== modified file 'src/nosqldb.xq'
--- src/nosqldb.xq	2013-07-17 07:53:12 +0000
+++ src/nosqldb.xq	2013-08-06 15:39:30 +0000
@@ -17,7 +17,9 @@
 
 
 (:~
- : This module provides minimal functionality to interact with an <a href="http://www.oracle.com/technetwork/products/nosqldb/overview/index.html";>Oracle NoSQL Database</a>.
+ : This module provides minimal functionality to interact with an 
+ : <a href="http://www.oracle.com/technetwork/products/nosqldb/overview/index.html";>
+ : Oracle NoSQL Database</a>.
  :
  : Oracle NoSQL Database is built upon the proven Oracle Berkeley DB Java Edition
  : high-availability storage engine, which is in widespread use in enterprises across
@@ -25,7 +27,8 @@
  : The resulting solution provides distributed, highly available key/value storage that is well
  : suited to large-volume, latency-sensitive applications.<br/>
  :
- : The kvclient library is used to implement these functions. Set the NOSQLDB_HOME environment variable to use this module.
+ : The kvclient library is used to implement these functions. Set the NOSQLDB_HOME 
+ : environment variable when compilling this module.
  : <br />
  : <br />
  : <br /><b>Note:</b> Since this module has a Java library dependency a JVM required
@@ -35,7 +38,7 @@
  : @author Cezar Andrei
  : @project DB Drivers/ORACLE NoSQL
  :)
-module namespace nosql = "http://www.zorba-xquery.com/modules/oracle-nosqldb";;
+module namespace nosql = "http://zorba.io/modules/oracle-nosqldb";;
 
 (:~
  : Import module for encoding/decoding base64Binary to/from string.

=== modified file 'src/nosqldb.xq.src/nosqldb.h'
--- src/nosqldb.xq.src/nosqldb.h	2013-06-12 13:59:19 +0000
+++ src/nosqldb.xq.src/nosqldb.h	2013-08-06 15:39:30 +0000
@@ -37,7 +37,7 @@
 #include "JavaVMSingleton.h"
 
 
-#define NOSQLDB_MODULE_NAMESPACE "http://www.zorba-xquery.com/modules/oracle-nosqldb";
+#define NOSQLDB_MODULE_NAMESPACE "http://zorba.io/modules/oracle-nosqldb";
 
 
 namespace zorba

=== modified file 'test/Queries/oracle-nosql-db/all-binary.xq'
--- test/Queries/oracle-nosql-db/all-binary.xq	2013-07-17 07:53:12 +0000
+++ test/Queries/oracle-nosql-db/all-binary.xq	2013-08-06 15:39:30 +0000
@@ -1,4 +1,4 @@
-import module namespace nosql = "http://www.zorba-xquery.com/modules/oracle-nosqldb";;
+import module namespace nosql = "http://zorba.io/modules/oracle-nosqldb";;
 import module namespace base64 = "http://zorba.io/modules/base64";;
 
 {

=== modified file 'test/Queries/oracle-nosql-db/all-text.xq'
--- test/Queries/oracle-nosql-db/all-text.xq	2013-07-17 07:53:12 +0000
+++ test/Queries/oracle-nosql-db/all-text.xq	2013-08-06 15:39:30 +0000
@@ -1,4 +1,4 @@
-import module namespace nosql = "http://www.zorba-xquery.com/modules/oracle-nosqldb";;
+import module namespace nosql = "http://zorba.io/modules/oracle-nosqldb";;
 import module namespace base64 = "http://zorba.io/modules/base64";;
 
 {

=== modified file 'test/Queries/oracle-nosql-db/connect.xq'
--- test/Queries/oracle-nosql-db/connect.xq	2013-01-09 17:56:22 +0000
+++ test/Queries/oracle-nosql-db/connect.xq	2013-08-06 15:39:30 +0000
@@ -1,4 +1,4 @@
-import module namespace nosql = "http://www.zorba-xquery.com/modules/oracle-nosqldb";;
+import module namespace nosql = "http://zorba.io/modules/oracle-nosqldb";;
 
 {
   variable $opt := {

=== modified file 'test/Queries/oracle-nosql-db/delete.xq'
--- test/Queries/oracle-nosql-db/delete.xq	2013-07-17 07:53:12 +0000
+++ test/Queries/oracle-nosql-db/delete.xq	2013-08-06 15:39:30 +0000
@@ -1,4 +1,4 @@
-import module namespace nosql = "http://www.zorba-xquery.com/modules/oracle-nosqldb";;
+import module namespace nosql = "http://zorba.io/modules/oracle-nosqldb";;
 import module namespace base64 = "http://zorba.io/modules/base64";;
 
 {

=== modified file 'test/Queries/oracle-nosql-db/get.xq'
--- test/Queries/oracle-nosql-db/get.xq	2013-07-17 07:53:12 +0000
+++ test/Queries/oracle-nosql-db/get.xq	2013-08-06 15:39:30 +0000
@@ -1,4 +1,4 @@
-import module namespace nosql = "http://www.zorba-xquery.com/modules/oracle-nosqldb";;
+import module namespace nosql = "http://zorba.io/modules/oracle-nosqldb";;
 import module namespace base64 = "http://zorba.io/modules/base64";;
 
 {

=== modified file 'test/Queries/oracle-nosql-db/multiDeletePrefix.xq'
--- test/Queries/oracle-nosql-db/multiDeletePrefix.xq	2013-07-17 07:53:12 +0000
+++ test/Queries/oracle-nosql-db/multiDeletePrefix.xq	2013-08-06 15:39:30 +0000
@@ -1,4 +1,4 @@
-import module namespace nosql = "http://www.zorba-xquery.com/modules/oracle-nosqldb";;
+import module namespace nosql = "http://zorba.io/modules/oracle-nosqldb";;
 import module namespace base64 = "http://zorba.io/modules/base64";;
 
 {

=== modified file 'test/Queries/oracle-nosql-db/multiDeleteStartEnd.xq'
--- test/Queries/oracle-nosql-db/multiDeleteStartEnd.xq	2013-07-17 07:53:12 +0000
+++ test/Queries/oracle-nosql-db/multiDeleteStartEnd.xq	2013-08-06 15:39:30 +0000
@@ -1,4 +1,4 @@
-import module namespace nosql = "http://www.zorba-xquery.com/modules/oracle-nosqldb";;
+import module namespace nosql = "http://zorba.io/modules/oracle-nosqldb";;
 import module namespace base64 = "http://zorba.io/modules/base64";;
 
 {

=== modified file 'test/Queries/oracle-nosql-db/multiGet.xq'
--- test/Queries/oracle-nosql-db/multiGet.xq	2013-07-17 07:53:12 +0000
+++ test/Queries/oracle-nosql-db/multiGet.xq	2013-08-06 15:39:30 +0000
@@ -1,4 +1,4 @@
-import module namespace nosql = "http://www.zorba-xquery.com/modules/oracle-nosqldb";;
+import module namespace nosql = "http://zorba.io/modules/oracle-nosqldb";;
 import module namespace base64 = "http://zorba.io/modules/base64";;
 
 {

=== modified file 'test/Queries/oracle-nosql-db/put.xq'
--- test/Queries/oracle-nosql-db/put.xq	2013-07-17 07:53:12 +0000
+++ test/Queries/oracle-nosql-db/put.xq	2013-08-06 15:39:30 +0000
@@ -1,4 +1,4 @@
-import module namespace nosql = "http://www.zorba-xquery.com/modules/oracle-nosqldb";;
+import module namespace nosql = "http://zorba.io/modules/oracle-nosqldb";;
 import module namespace base64 = "http://zorba.io/modules/base64";;
 
 {

=== modified file 'test/setup.sh'
--- test/setup.sh	2012-12-11 21:01:31 +0000
+++ test/setup.sh	2013-08-06 15:39:30 +0000
@@ -3,6 +3,15 @@
 
 JAVA7=/usr/lib/jvm/java-7-oracle/bin/java
 
+# kv-1.2.123.tar.gz
+TGZ=kv-ce-2.1.8.tar.gz
+
+# kv-1.2.123
+KVDIR=kv-2.1.8 
+
+# kvstore-1.2.123.jar
+KVSTOREJAR=kvstore.jar
+
 while getopts distcvhj: opt
 do
   case "$opt" in
@@ -13,31 +22,31 @@
             ;;
         d)
             echo "Download" 
-            wget http://my.zorba-xquery.com/tmp/kv-1.2.123.tar.gz
+            wget http://my.zorba-xquery.com/tmp/$TGZ
             ;;
         i)
             echo "Install"
-            tar -xvzf kv-1.2.123.tar.gz
+            tar -xvzf $TGZ
             ;;
         s)
             echo "Start"
             echo "   Running with java (JDK7 is required):"
             $JAVA7 -version
-            $JAVA7 -cp ./kv-1.2.123/lib/kvstore-1.2.123.jar -Xms500m -Xmx500m oracle.kv.util.kvlite.KVLite -root ./kv-1.2.123/kvroot -store kvstore -host 127.0.0.1 -port 5000 -admin 5001 &
+            $JAVA7 -cp ./$KVDIR/lib/$KVSTOREJAR -Xms500m -Xmx500m oracle.kv.util.kvlite.KVLite -root ./$KVDIR/kvroot -store kvstore -host 127.0.0.1 -port 5000 -admin 5001 &
             ;;
         t)
             echo "Stop"
             echo "   Running with java :"
             $JAVA7 -version
-            $JAVA7 -jar ./kv-1.2.123/lib/kvstore-1.2.123.jar stop -root ./kv-1.2.123/kvroot
+            $JAVA7 -jar ./$KVDIR/lib/$KVSTOREJAR stop -root ./$KVDIR/kvroot
             ;;
         c)
             echo "Clean data"
-            rm -fR ./kv-1.2.123/kvroot
+            rm -fR ./$KVDIR/kvroot
             ;;
         v)
             echo "Clean everything"
-            rm -fR ./kv-1.2.123 kv-1.2.123.tar.gz
+            rm -fR ./$KVDIR $TGZ
             ;;            
         h)
             echo "usage: $0 [-j java7/path] [-distcvh] "