You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/08/28 11:44:38 UTC
[1/3] jena git commit: jetty 9.3 notes
Repository: jena
Updated Branches:
refs/heads/master f62c53e64 -> 4fc76ddf0
jetty 9.3 notes
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a03b48fb
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a03b48fb
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a03b48fb
Branch: refs/heads/master
Commit: a03b48fb8870fc13c61ff495d07b8572bb81734d
Parents: f62c53e
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Aug 27 17:00:50 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Aug 27 17:00:50 2015 +0100
----------------------------------------------------------------------
jena-fuseki2/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a03b48fb/jena-fuseki2/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/pom.xml b/jena-fuseki2/pom.xml
index 6e46fe1..cf1f897 100644
--- a/jena-fuseki2/pom.xml
+++ b/jena-fuseki2/pom.xml
@@ -62,6 +62,7 @@
<properties>
<ver.jetty>9.1.1.v20140108</ver.jetty>
+ <!-- <ver.jetty>9.3.2.v20150730</ver.jetty> -->
<ver.shiro>1.2.2</ver.shiro>
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
<build.time.xsd>${maven.build.timestamp}</build.time.xsd>
[3/3] jena git commit: Remove restriction on ARQ syntax.
Posted by an...@apache.org.
Remove restriction on ARQ syntax.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4fc76ddf
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4fc76ddf
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4fc76ddf
Branch: refs/heads/master
Commit: 4fc76ddf06edf6dd6b9d53b49852e253a74ce5c9
Parents: fbc0dd0
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Aug 28 10:44:25 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Aug 28 10:44:25 2015 +0100
----------------------------------------------------------------------
.../jena/sparql/engine/QueryExecutionBase.java | 20 ++------------------
1 file changed, 2 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/4fc76ddf/jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryExecutionBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryExecutionBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryExecutionBase.java
index c04675b..c72cd18 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryExecutionBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryExecutionBase.java
@@ -28,21 +28,8 @@ import org.apache.jena.atlas.lib.AlarmClock;
import org.apache.jena.atlas.logging.Log;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.Triple;
-import org.apache.jena.query.ARQ;
-import org.apache.jena.query.Dataset;
-import org.apache.jena.query.DatasetFactory;
-import org.apache.jena.query.Query;
-import org.apache.jena.query.QueryCancelledException;
-import org.apache.jena.query.QueryExecException;
-import org.apache.jena.query.QueryExecution;
-import org.apache.jena.query.QuerySolution;
-import org.apache.jena.query.ResultSet;
-import org.apache.jena.query.Syntax;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdf.model.RDFNode;
-import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.rdf.model.Statement;
+import org.apache.jena.query.* ;
+import org.apache.jena.rdf.model.* ;
import org.apache.jena.riot.system.IRIResolver;
import org.apache.jena.shared.PrefixMapping;
import org.apache.jena.sparql.ARQConstants;
@@ -265,9 +252,6 @@ public class QueryExecutionBase implements QueryExecution
throw new QueryExecException("Attempt to get a CONSTRUCT model from a "+labelForQuery(query)+" query") ;
// This causes there to be no PROJECT around the pattern.
// That in turn, exposes the initial bindings.
- if ( ! Syntax.syntaxARQ.equals( query.getSyntax() ) )
- throw new QueryExecException("Attempt to CONSTRUCT quads from a "+labelForQuery(query)+" query, which is not ARQ Syntax") ;
-
query.setQueryResultStar(true) ;
startQueryIterator() ;
[2/3] jena git commit: Better formatting of the rebuild message
Posted by an...@apache.org.
Better formatting of the rebuild message
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/fbc0dd0b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/fbc0dd0b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/fbc0dd0b
Branch: refs/heads/master
Commit: fbc0dd0bfb4a02231f605bf29e9069fef8647f01
Parents: a03b48f
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Aug 27 17:01:13 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Aug 27 17:01:13 2015 +0100
----------------------------------------------------------------------
jena-fuseki2/jena-fuseki-core/fuseki-dev | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/fbc0dd0b/jena-fuseki2/jena-fuseki-core/fuseki-dev
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/fuseki-dev b/jena-fuseki2/jena-fuseki-core/fuseki-dev
index cd27cf2..b027fff 100755
--- a/jena-fuseki2/jena-fuseki-core/fuseki-dev
+++ b/jena-fuseki2/jena-fuseki-core/fuseki-dev
@@ -43,7 +43,7 @@ CPF="$FUSEKI_HOME/fuseki.classpath"
if [ ! -e "$CPF" ]; then
echo "Need to create Fuseki classpath file"
echo "Ensure maven is upto date with the latest snapshots and then run"
- echo -e "cd $FUSEKI_HOME ; \nmvn dependency:build-classpath -Dmdep.outputFile=fuseki.classpath"
+ echo -e "( cd $FUSEKI_HOME ; \n mvn dependency:build-classpath -Dmdep.outputFile=fuseki.classpath )"
exit 1
fi
CP="$(cat $CPF)"