You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by rv...@apache.org on 2015/07/28 14:04:11 UTC
[1/3] jena git commit: Fix up package names in examples
Repository: jena
Updated Branches:
refs/heads/master 67a0cb0d0 -> 290c66394
Fix up package names in examples
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4f69d00c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4f69d00c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4f69d00c
Branch: refs/heads/master
Commit: 4f69d00cea1683a0239bbe5dde3b01f3fe1b793c
Parents: 62558f4
Author: Rob Vesse <rv...@apache.org>
Authored: Tue Jul 28 12:23:57 2015 +0100
Committer: Rob Vesse <rv...@apache.org>
Committed: Tue Jul 28 12:23:57 2015 +0100
----------------------------------------------------------------------
.../apache/jena/example/helloworld/HelloWorld.java | 8 ++++----
.../apache/jena/example/pizza/PizzaSparqlNoInf.java | 16 ++++++++--------
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/4f69d00c/jena-examples/src/main/java/org/apache/jena/example/helloworld/HelloWorld.java
----------------------------------------------------------------------
diff --git a/jena-examples/src/main/java/org/apache/jena/example/helloworld/HelloWorld.java b/jena-examples/src/main/java/org/apache/jena/example/helloworld/HelloWorld.java
index 9325511..1545f89 100644
--- a/jena-examples/src/main/java/org/apache/jena/example/helloworld/HelloWorld.java
+++ b/jena-examples/src/main/java/org/apache/jena/example/helloworld/HelloWorld.java
@@ -25,10 +25,10 @@ import org.apache.jena.example.CheeseBase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.hp.hpl.jena.rdf.model.*;
-import com.hp.hpl.jena.util.FileManager;
-import com.hp.hpl.jena.vocabulary.RDF;
-import com.hp.hpl.jena.vocabulary.RDFS;
+import org.apache.jena.rdf.model.*;
+import org.apache.jena.util.FileManager;
+import org.apache.jena.vocabulary.RDF;
+import org.apache.jena.vocabulary.RDFS;
/**
* <h2>Apache Jena Getting Started Guide - Step 1: Hello World</h2>
http://git-wip-us.apache.org/repos/asf/jena/blob/4f69d00c/jena-examples/src/main/java/org/apache/jena/example/pizza/PizzaSparqlNoInf.java
----------------------------------------------------------------------
diff --git a/jena-examples/src/main/java/org/apache/jena/example/pizza/PizzaSparqlNoInf.java b/jena-examples/src/main/java/org/apache/jena/example/pizza/PizzaSparqlNoInf.java
index 3738d8a..35286aa 100644
--- a/jena-examples/src/main/java/org/apache/jena/example/pizza/PizzaSparqlNoInf.java
+++ b/jena-examples/src/main/java/org/apache/jena/example/pizza/PizzaSparqlNoInf.java
@@ -25,14 +25,14 @@ import org.apache.jena.example.Base;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntModelSpec;
-import com.hp.hpl.jena.query.*;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.util.FileManager;
-import com.hp.hpl.jena.vocabulary.OWL;
-import com.hp.hpl.jena.vocabulary.RDFS;
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.ontology.OntModelSpec;
+import org.apache.jena.query.*;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.util.FileManager;
+import org.apache.jena.vocabulary.OWL;
+import org.apache.jena.vocabulary.RDFS;
/**
* <p>TODO class comment</p>
[3/3] jena git commit: Only check SORT_TEMP_DIR if discoverable
(JENA-977)
Posted by rv...@apache.org.
Only check SORT_TEMP_DIR if discoverable (JENA-977)
In some environments tdbloader2index may not be able to figure out what
the sort temp directory is going to be in which case we should skip
trying to check the available space on it
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/290c6639
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/290c6639
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/290c6639
Branch: refs/heads/master
Commit: 290c66394b132ad03ac70ddbcfe190900a442290
Parents: a426799
Author: Rob Vesse <rv...@apache.org>
Authored: Tue Jul 28 13:03:17 2015 +0100
Committer: Rob Vesse <rv...@apache.org>
Committed: Tue Jul 28 13:03:17 2015 +0100
----------------------------------------------------------------------
apache-jena/bin/tdbloader2index | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/290c6639/apache-jena/bin/tdbloader2index
----------------------------------------------------------------------
diff --git a/apache-jena/bin/tdbloader2index b/apache-jena/bin/tdbloader2index
index eca1aae..d26072f 100755
--- a/apache-jena/bin/tdbloader2index
+++ b/apache-jena/bin/tdbloader2index
@@ -298,17 +298,20 @@ else
# Using the system temp directory
SORT_TEMP_DIR="$TMPDIR"
fi
-SORT_TEMP_DIR=$(makeAbsolute "$SORT_TEMP_DIR")
-debug "Sort Temp Directory: $SORT_TEMP_DIR"
-SORT_DRIVE_INFO=($(getDriveInfo "${SORT_TEMP_DIR}"))
-if [ "${#SORT_DRIVE_INFO[@]}" -gt 0 ]; then
- debug "Sort Temp Directory is on disk ${SORT_DRIVE_INFO[0]} which has ${SORT_DRIVE_INFO[2]}% free space (${SORT_DRIVE_INFO[3]} bytes)"
-
- if [ "${SORT_DRIVE_INFO[2]}" -le 10 ]; then
- warn "-----"
- warn "Sort Temp Directory ${SORT_TEMP_DIR} is on disk ${SORT_DRIVE_INFO[0]} which only has ${SORT_DRIVE_INFO[2]}% free space (${SORT_DRIVE_INFO[3]} bytes) available"
- warn "This may result in sort failures if the data to be indexed is large"
- warn "-----"
+if [ -n "$SORT_TEMP_DIR" ]; then
+ # If we've figured out the sort temporary directory then check it
+ SORT_TEMP_DIR=$(makeAbsolute "$SORT_TEMP_DIR")
+ debug "Sort Temp Directory: $SORT_TEMP_DIR"
+ SORT_DRIVE_INFO=($(getDriveInfo "${SORT_TEMP_DIR}"))
+ if [ "${#SORT_DRIVE_INFO[@]}" -gt 0 ]; then
+ debug "Sort Temp Directory is on disk ${SORT_DRIVE_INFO[0]} which has ${SORT_DRIVE_INFO[2]}% free space (${SORT_DRIVE_INFO[3]} bytes)"
+
+ if [ "${SORT_DRIVE_INFO[2]}" -le 10 ]; then
+ warn "-----"
+ warn "Sort Temp Directory ${SORT_TEMP_DIR} is on disk ${SORT_DRIVE_INFO[0]} which only has ${SORT_DRIVE_INFO[2]}% free space (${SORT_DRIVE_INFO[3]} bytes) available"
+ warn "This may result in sort failures if the data to be indexed is large"
+ warn "-----"
+ fi
fi
fi
[2/3] jena git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/jena
Posted by rv...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/jena
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a4267993
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a4267993
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a4267993
Branch: refs/heads/master
Commit: a4267993ea8c8a67a52cf346d9ec5da0e18a2088
Parents: 4f69d00 67a0cb0
Author: Rob Vesse <rv...@apache.org>
Authored: Tue Jul 28 12:28:37 2015 +0100
Committer: Rob Vesse <rv...@apache.org>
Committed: Tue Jul 28 12:28:37 2015 +0100
----------------------------------------------------------------------
apache-jena-libs/pom.xml | 6 +++---
apache-jena-osgi/jena-osgi/pom.xml | 12 ++++++------
apache-jena-osgi/pom.xml | 4 ++--
apache-jena/bin/tdbloader2common | 13 ++++++------
apache-jena/pom.xml | 25 ++++++++++++------------
jena-arq/pom.xml | 12 ++++++------
jena-base/pom.xml | 6 +++---
jena-core/pom.xml | 13 ++++++------
jena-csv/pom.xml | 8 ++++----
jena-elephas/jena-elephas-common/pom.xml | 2 +-
jena-elephas/jena-elephas-io/pom.xml | 2 +-
jena-elephas/jena-elephas-mapreduce/pom.xml | 2 +-
jena-elephas/jena-elephas-stats/pom.xml | 2 +-
jena-elephas/pom.xml | 6 +++---
jena-extras/jena-querybuilder/pom.xml | 2 +-
jena-extras/pom.xml | 6 +++---
jena-fuseki1/pom.xml | 18 ++++++++---------
jena-fuseki2/apache-jena-fuseki/pom.xml | 4 ++--
jena-fuseki2/jena-fuseki-core/pom.xml | 14 ++++++-------
jena-fuseki2/jena-fuseki-server/pom.xml | 2 +-
jena-fuseki2/jena-fuseki-war/pom.xml | 2 +-
jena-fuseki2/pom.xml | 4 ++--
jena-iri/pom.xml | 4 ++--
jena-jdbc/jena-jdbc-core/pom.xml | 4 ++--
jena-jdbc/jena-jdbc-driver-bundle/pom.xml | 20 +++++++++----------
jena-jdbc/jena-jdbc-driver-mem/pom.xml | 6 +++---
jena-jdbc/jena-jdbc-driver-remote/pom.xml | 10 +++++-----
jena-jdbc/jena-jdbc-driver-tdb/pom.xml | 10 +++++-----
jena-jdbc/pom.xml | 4 ++--
jena-maven-tools/pom.xml | 6 +++---
jena-parent/pom.xml | 2 +-
jena-permissions/pom.xml | 4 ++--
jena-sdb/pom.xml | 12 ++++++------
jena-shaded-guava/pom.xml | 4 ++--
jena-spatial/pom.xml | 8 ++++----
jena-tdb/pom.xml | 12 ++++++------
jena-text/pom.xml | 8 ++++----
pom.xml | 2 +-
38 files changed, 140 insertions(+), 141 deletions(-)
----------------------------------------------------------------------