Merge branch 'release-3.0.3'

Author: kkanthet

.gitignore

@@ -25,3 +25,4 @@ buildSrc/build
 bin
 creds
 .idea
+*/gradle/wrapper/gradle-wrapper.properties

README.md

@@ -1,4 +1,4 @@
-# marklogic-jena v3.0.2
+# marklogic-jena v3.0.3
 
 ## Introduction
 
@@ -46,7 +46,7 @@ gradle install
 For gradle-based projects include this dependency in `build.gradle`:
 ```
 dependencies {
-   compile 'com.marklogic:marklogic-jena:3.0.2'
+   compile 'com.marklogic:marklogic-jena:3.0.3'
 }
 ```
 
@@ -56,7 +56,7 @@ Maven-based projects use this block in `pom.xml`:
 <dependency>
     <groupId>com.marklogic</groupId>
     <artifactId>marklogic-jena</artifactId>
-    <version>3.0.2</version>
+    <version>3.0.3</version>
 </dependency>
 ```
 

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.marklogic.ml-gradle" version "2.3.3"
+    id "com.marklogic.ml-gradle" version "2.5.0"
 }
 
 subprojects {
@@ -9,9 +9,6 @@ subprojects {
     apply plugin: 'jacoco'
     jacoco{toolVersion="0.7.4.201502262128"}
 
-    sourceCompatibility = "1.8"
-    targetCompatibility = "1.8"
-
     configure(allprojects){
         ext.slf4jVersion = '1.7.21'
         ext.logbackVersion = '1.1.7'

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Tue Jan 12 14:52:40 PST 2016
+#Thu Feb 09 09:47:25 PST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -6,12 +6,30 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

gradlew

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args

gradlew.bat

@@ -8,20 +8,34 @@ apply plugin: 'eclipse'
 apply plugin: 'java'
 
 
-evaluationDependsOn(":marklogic-jena")
 
 dependencies {
-  compile('com.marklogic:marklogic-jena:3.0.2'){
-    changing=true
-    exclude(group: 'org.slf4j')
-    exclude(group: 'log4j')
-    exclude(group: 'ch.qos.logback')
-  }
-  
-  compile("org.slf4j:slf4j-api:$slf4jVersion")
-  compile "ch.qos.logback:logback-classic:$logbackVersion"
+  compile project (':marklogic-jena')
   compile 'org.openjdk.jmh:jmh-core:1.3.2'
   compile 'org.openjdk.jmh:jmh-generator-annprocess:1.3.2'
 }
 
-compileJava.dependsOn ":marklogic-jena:install"
+task runGraphExample(type: JavaExec) {
+    classpath = sourceSets.main.runtimeClasspath
+    main = 'com.marklogic.jena.examples.GraphCRUDExample'
+}
+
+task runModelExample(type: JavaExec) {
+    classpath = sourceSets.main.runtimeClasspath
+    main = 'com.marklogic.jena.examples.ModelCRUDExample'
+}
+
+task runRIOTExample(type: JavaExec) {
+    classpath = sourceSets.main.runtimeClasspath
+    main = 'com.marklogic.jena.examples.RIOTExample'
+}
+
+task runQueryExample(type: JavaExec) {
+    classpath = sourceSets.main.runtimeClasspath
+    main = 'com.marklogic.jena.examples.SPARQLQueryExample'
+}
+
+task runUpdateExample(type: JavaExec) {
+    classpath = sourceSets.main.runtimeClasspath
+    main = 'com.marklogic.jena.examples.SPARQLUpdateExample'
+}

marklogic-jena-examples/build.gradle

@@ -1,5 +1,5 @@
 group=com.marklogic
-version=3.0.2-SNAPSHOT
+version=3.0-SNAPSHOT
 
 mlConfigDir=marklogic-jena-examples/src/main/ml-config
 mlHost=localhost

marklogic-jena-examples/gradle.properties

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016-2017 MarkLogic Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.marklogic.jena.examples;
 
 import java.io.FileInputStream;
@@ -6,28 +21,34 @@
 
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.DatabaseClientFactory;
-import com.marklogic.client.DatabaseClientFactory.Authentication;
 import com.marklogic.semantics.jena.MarkLogicDatasetGraph;
 import com.marklogic.semantics.jena.MarkLogicDatasetGraphFactory;
+import org.apache.commons.io.FileUtils;
 
 public class ExampleUtils {
 
 
     public static MarkLogicDatasetGraph loadPropsAndInit() {
         Properties props = new Properties();
+        // two attempts to load
         try {
-            props.load(new FileInputStream("gradle.properties"));
+            props.load(new FileInputStream("marklogic-jena-examples/gradle.properties"));
         } catch (IOException e) {
-            System.err.println("problem loading properties file.");
-            System.exit(1);
+            // gradle prefers this path.
+            try {
+                props.load(new FileInputStream("gradle.properties"));
+            } catch (IOException e2) {
+                System.err.println("problem loading properties file.");
+                System.exit(1);
+            }
         }
         String host = props.getProperty("mlHost");
         int port = Integer.parseInt(props.getProperty("mlRestPort"));
         String user = props.getProperty("writerUser");
         String pass = props.getProperty("writerPassword");
 
         DatabaseClient client = DatabaseClientFactory.newClient(host, port,
-                user, pass, Authentication.DIGEST);
+                new DatabaseClientFactory.DigestAuthContext(user, pass));
         MarkLogicDatasetGraph dg = MarkLogicDatasetGraphFactory
                 .createDatasetGraph(client);
         return dg;