Zorba

Merge lp:~zorba-coders/zorba/zio-oracle-nosql into lp:zorba/oracle-nosql-db-module

  1. zio-oracle-nosql
  2. Merge into f-nosqldb-module
Proposed by Cezar Andrei
Status: Merged
Approved by: Cezar Andrei
Approved revision: 33
Merged at revision: 33
Proposed branch: lp:~zorba-coders/zorba/zio-oracle-nosql
Merge into: lp:zorba/oracle-nosql-db-module
Diff against target: 220 lines (+33/-21)
14 files modified
CMakeLists.txt (+1/-1)
src/CMakeLists.txt (+1/-1)
src/nosqldb.xq (+6/-3)
src/nosqldb.xq.src/nosqldb.h (+1/-1)
test/Queries/oracle-nosql-db/all-binary.xq (+1/-1)
test/Queries/oracle-nosql-db/all-text.xq (+1/-1)
test/Queries/oracle-nosql-db/connect.xq (+1/-1)
test/Queries/oracle-nosql-db/delete.xq (+1/-1)
test/Queries/oracle-nosql-db/get.xq (+1/-1)
test/Queries/oracle-nosql-db/multiDeletePrefix.xq (+1/-1)
test/Queries/oracle-nosql-db/multiDeleteStartEnd.xq (+1/-1)
test/Queries/oracle-nosql-db/multiGet.xq (+1/-1)
test/Queries/oracle-nosql-db/put.xq (+1/-1)
test/setup.sh (+15/-6)
To merge this branch: bzr merge lp:~zorba-coders/zorba/zio-oracle-nosql
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Cezar Andrei Approve
Review via email: mp+178785@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Cezar Andrei (cezar-andrei) :
review: Approve
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/zio-oracle-nosql/+merge/178785

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2012-12-17 20:35:19 +0000
3+++ CMakeLists.txt 2013-08-06 15:39:30 +0000
4@@ -29,7 +29,7 @@
5 MESSAGE (STATUS "NOSQLDB_HOME = " $ENV{NOSQLDB_HOME})
6
7 IF (WIN32)
8- 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")
9+ 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")
10 MESSAGE (STATUS "pdfbox fontbox jars searching path: " ${NOSQLDB_PATH} )
11 ELSE (WIN32)
12 SET (NOSQLDB_PATH $ENV{NOSQLDB_HOME} $ENV{NOSQLDB_HOME}/lib
13
14=== modified file 'src/CMakeLists.txt'
15--- src/CMakeLists.txt 2012-11-21 21:58:30 +0000
16+++ src/CMakeLists.txt 2013-08-06 15:39:30 +0000
17@@ -27,7 +27,7 @@
18 INCLUDE_DIRECTORIES (${JAVA_INCLUDE_PATH})
19
20 DECLARE_ZORBA_MODULE (
21- URI "http://www.zorba-xquery.com/modules/oracle-nosqldb"
22+ URI "http://zorba.io/modules/oracle-nosqldb"
23 VERSION 1.0
24 FILE "nosqldb.xq"
25 ### CONFIG_FILES ../srcJava/org/zorbaxquery/modules/nosqldb/Config.java.in
26
27=== modified file 'src/nosqldb.xq'
28--- src/nosqldb.xq 2013-07-17 07:53:12 +0000
29+++ src/nosqldb.xq 2013-08-06 15:39:30 +0000
30@@ -17,7 +17,9 @@
31
32
33 (:~
34- : 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>.
35+ : This module provides minimal functionality to interact with an
36+ : <a href="http://www.oracle.com/technetwork/products/nosqldb/overview/index.html">
37+ : Oracle NoSQL Database</a>.
38 :
39 : Oracle NoSQL Database is built upon the proven Oracle Berkeley DB Java Edition
40 : high-availability storage engine, which is in widespread use in enterprises across
41@@ -25,7 +27,8 @@
42 : The resulting solution provides distributed, highly available key/value storage that is well
43 : suited to large-volume, latency-sensitive applications.<br/>
44 :
45- : The kvclient library is used to implement these functions. Set the NOSQLDB_HOME environment variable to use this module.
46+ : The kvclient library is used to implement these functions. Set the NOSQLDB_HOME
47+ : environment variable when compilling this module.
48 : <br />
49 : <br />
50 : <br /><b>Note:</b> Since this module has a Java library dependency a JVM required
51@@ -35,7 +38,7 @@
52 : @author Cezar Andrei
53 : @project DB Drivers/ORACLE NoSQL
54 :)
55-module namespace nosql = "http://www.zorba-xquery.com/modules/oracle-nosqldb";
56+module namespace nosql = "http://zorba.io/modules/oracle-nosqldb";
57
58 (:~
59 : Import module for encoding/decoding base64Binary to/from string.
60
61=== modified file 'src/nosqldb.xq.src/nosqldb.h'
62--- src/nosqldb.xq.src/nosqldb.h 2013-06-12 13:59:19 +0000
63+++ src/nosqldb.xq.src/nosqldb.h 2013-08-06 15:39:30 +0000
64@@ -37,7 +37,7 @@
65 #include "JavaVMSingleton.h"
66
67
68-#define NOSQLDB_MODULE_NAMESPACE "http://www.zorba-xquery.com/modules/oracle-nosqldb"
69+#define NOSQLDB_MODULE_NAMESPACE "http://zorba.io/modules/oracle-nosqldb"
70
71
72 namespace zorba
73
74=== modified file 'test/Queries/oracle-nosql-db/all-binary.xq'
75--- test/Queries/oracle-nosql-db/all-binary.xq 2013-07-17 07:53:12 +0000
76+++ test/Queries/oracle-nosql-db/all-binary.xq 2013-08-06 15:39:30 +0000
77@@ -1,4 +1,4 @@
78-import module namespace nosql = "http://www.zorba-xquery.com/modules/oracle-nosqldb";
79+import module namespace nosql = "http://zorba.io/modules/oracle-nosqldb";
80 import module namespace base64 = "http://zorba.io/modules/base64";
81
82 {
83
84=== modified file 'test/Queries/oracle-nosql-db/all-text.xq'
85--- test/Queries/oracle-nosql-db/all-text.xq 2013-07-17 07:53:12 +0000
86+++ test/Queries/oracle-nosql-db/all-text.xq 2013-08-06 15:39:30 +0000
87@@ -1,4 +1,4 @@
88-import module namespace nosql = "http://www.zorba-xquery.com/modules/oracle-nosqldb";
89+import module namespace nosql = "http://zorba.io/modules/oracle-nosqldb";
90 import module namespace base64 = "http://zorba.io/modules/base64";
91
92 {
93
94=== modified file 'test/Queries/oracle-nosql-db/connect.xq'
95--- test/Queries/oracle-nosql-db/connect.xq 2013-01-09 17:56:22 +0000
96+++ test/Queries/oracle-nosql-db/connect.xq 2013-08-06 15:39:30 +0000
97@@ -1,4 +1,4 @@
98-import module namespace nosql = "http://www.zorba-xquery.com/modules/oracle-nosqldb";
99+import module namespace nosql = "http://zorba.io/modules/oracle-nosqldb";
100
101 {
102 variable $opt := {
103
104=== modified file 'test/Queries/oracle-nosql-db/delete.xq'
105--- test/Queries/oracle-nosql-db/delete.xq 2013-07-17 07:53:12 +0000
106+++ test/Queries/oracle-nosql-db/delete.xq 2013-08-06 15:39:30 +0000
107@@ -1,4 +1,4 @@
108-import module namespace nosql = "http://www.zorba-xquery.com/modules/oracle-nosqldb";
109+import module namespace nosql = "http://zorba.io/modules/oracle-nosqldb";
110 import module namespace base64 = "http://zorba.io/modules/base64";
111
112 {
113
114=== modified file 'test/Queries/oracle-nosql-db/get.xq'
115--- test/Queries/oracle-nosql-db/get.xq 2013-07-17 07:53:12 +0000
116+++ test/Queries/oracle-nosql-db/get.xq 2013-08-06 15:39:30 +0000
117@@ -1,4 +1,4 @@
118-import module namespace nosql = "http://www.zorba-xquery.com/modules/oracle-nosqldb";
119+import module namespace nosql = "http://zorba.io/modules/oracle-nosqldb";
120 import module namespace base64 = "http://zorba.io/modules/base64";
121
122 {
123
124=== modified file 'test/Queries/oracle-nosql-db/multiDeletePrefix.xq'
125--- test/Queries/oracle-nosql-db/multiDeletePrefix.xq 2013-07-17 07:53:12 +0000
126+++ test/Queries/oracle-nosql-db/multiDeletePrefix.xq 2013-08-06 15:39:30 +0000
127@@ -1,4 +1,4 @@
128-import module namespace nosql = "http://www.zorba-xquery.com/modules/oracle-nosqldb";
129+import module namespace nosql = "http://zorba.io/modules/oracle-nosqldb";
130 import module namespace base64 = "http://zorba.io/modules/base64";
131
132 {
133
134=== modified file 'test/Queries/oracle-nosql-db/multiDeleteStartEnd.xq'
135--- test/Queries/oracle-nosql-db/multiDeleteStartEnd.xq 2013-07-17 07:53:12 +0000
136+++ test/Queries/oracle-nosql-db/multiDeleteStartEnd.xq 2013-08-06 15:39:30 +0000
137@@ -1,4 +1,4 @@
138-import module namespace nosql = "http://www.zorba-xquery.com/modules/oracle-nosqldb";
139+import module namespace nosql = "http://zorba.io/modules/oracle-nosqldb";
140 import module namespace base64 = "http://zorba.io/modules/base64";
141
142 {
143
144=== modified file 'test/Queries/oracle-nosql-db/multiGet.xq'
145--- test/Queries/oracle-nosql-db/multiGet.xq 2013-07-17 07:53:12 +0000
146+++ test/Queries/oracle-nosql-db/multiGet.xq 2013-08-06 15:39:30 +0000
147@@ -1,4 +1,4 @@
148-import module namespace nosql = "http://www.zorba-xquery.com/modules/oracle-nosqldb";
149+import module namespace nosql = "http://zorba.io/modules/oracle-nosqldb";
150 import module namespace base64 = "http://zorba.io/modules/base64";
151
152 {
153
154=== modified file 'test/Queries/oracle-nosql-db/put.xq'
155--- test/Queries/oracle-nosql-db/put.xq 2013-07-17 07:53:12 +0000
156+++ test/Queries/oracle-nosql-db/put.xq 2013-08-06 15:39:30 +0000
157@@ -1,4 +1,4 @@
158-import module namespace nosql = "http://www.zorba-xquery.com/modules/oracle-nosqldb";
159+import module namespace nosql = "http://zorba.io/modules/oracle-nosqldb";
160 import module namespace base64 = "http://zorba.io/modules/base64";
161
162 {
163
164=== modified file 'test/setup.sh'
165--- test/setup.sh 2012-12-11 21:01:31 +0000
166+++ test/setup.sh 2013-08-06 15:39:30 +0000
167@@ -3,6 +3,15 @@
168
169 JAVA7=/usr/lib/jvm/java-7-oracle/bin/java
170
171+# kv-1.2.123.tar.gz
172+TGZ=kv-ce-2.1.8.tar.gz
173+
174+# kv-1.2.123
175+KVDIR=kv-2.1.8
176+
177+# kvstore-1.2.123.jar
178+KVSTOREJAR=kvstore.jar
179+
180 while getopts distcvhj: opt
181 do
182 case "$opt" in
183@@ -13,31 +22,31 @@
184 ;;
185 d)
186 echo "Download"
187- wget http://my.zorba-xquery.com/tmp/kv-1.2.123.tar.gz
188+ wget http://my.zorba-xquery.com/tmp/$TGZ
189 ;;
190 i)
191 echo "Install"
192- tar -xvzf kv-1.2.123.tar.gz
193+ tar -xvzf $TGZ
194 ;;
195 s)
196 echo "Start"
197 echo " Running with java (JDK7 is required):"
198 $JAVA7 -version
199- $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 &
200+ $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 &
201 ;;
202 t)
203 echo "Stop"
204 echo " Running with java :"
205 $JAVA7 -version
206- $JAVA7 -jar ./kv-1.2.123/lib/kvstore-1.2.123.jar stop -root ./kv-1.2.123/kvroot
207+ $JAVA7 -jar ./$KVDIR/lib/$KVSTOREJAR stop -root ./$KVDIR/kvroot
208 ;;
209 c)
210 echo "Clean data"
211- rm -fR ./kv-1.2.123/kvroot
212+ rm -fR ./$KVDIR/kvroot
213 ;;
214 v)
215 echo "Clean everything"
216- rm -fR ./kv-1.2.123 kv-1.2.123.tar.gz
217+ rm -fR ./$KVDIR $TGZ
218 ;;
219 h)
220 echo "usage: $0 [-j java7/path] [-distcvh] "

Subscribers

People subscribed via source and target branches

to all changes: