You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2013/12/04 15:50:19 UTC
[1/3] git commit: replaced tabs with spaces
Updated Branches:
refs/heads/master ec828771d -> a7d9d0fc3
replaced tabs with spaces
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/00369916
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/00369916
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/00369916
Branch: refs/heads/master
Commit: 00369916671b32841096c32d0f7a10a802f28957
Parents: ec82877
Author: retobg <re...@apache.org>
Authored: Wed Dec 4 12:28:14 2013 +0100
Committer: retobg <re...@apache.org>
Committed: Wed Dec 4 12:28:14 2013 +0100
----------------------------------------------------------------------
.../rdf/jena/sparql/JenaSparqlEngine.java | 90 ++++++++++----------
1 file changed, 45 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/00369916/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java
----------------------------------------------------------------------
diff --git a/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java b/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java
index 6ccbc8c..5dfe7a9 100644
--- a/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java
+++ b/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java
@@ -52,35 +52,35 @@ import com.hp.hpl.jena.update.UpdateRequest;
*/
public class JenaSparqlEngine implements QueryEngine {
- // ------------------------------------------------------------------------
- // Implementing QueryEngine
- // ------------------------------------------------------------------------
+ // ------------------------------------------------------------------------
+ // Implementing QueryEngine
+ // ------------------------------------------------------------------------
- @Override
- public Object execute(TcManager tcManager, TripleCollection defaultGraph,
- final Query query) {
- return execute(tcManager, defaultGraph, query.toString());
- }
+ @Override
+ public Object execute(TcManager tcManager, TripleCollection defaultGraph,
+ final Query query) {
+ return execute(tcManager, defaultGraph, query.toString());
+ }
- @Override
- public Object execute(TcManager tcManager, TripleCollection defaultGraph,
- final String query) {
- final Dataset dataset = new TcDataset(tcManager, defaultGraph);
+ @Override
+ public Object execute(TcManager tcManager, TripleCollection defaultGraph,
+ final String query) {
+ final Dataset dataset = new TcDataset(tcManager, defaultGraph);
- // Missing permission (java.lang.RuntimePermission getClassLoader)
- // when calling QueryFactory.create causes ExceptionInInitializerError
- // to be thrown.
- // QueryExecutionFactory.create requires
- // (java.io.FilePermission [etc/]location-mapping.* read)
- // Thus, they are placed within doPrivileged
- QueryExecution qexec = AccessController
- .doPrivileged(new PrivilegedAction<QueryExecution>() {
+ // Missing permission (java.lang.RuntimePermission getClassLoader)
+ // when calling QueryFactory.create causes ExceptionInInitializerError
+ // to be thrown.
+ // QueryExecutionFactory.create requires
+ // (java.io.FilePermission [etc/]location-mapping.* read)
+ // Thus, they are placed within doPrivileged
+ QueryExecution qexec = AccessController
+ .doPrivileged(new PrivilegedAction<QueryExecution>() {
- @Override
- public QueryExecution run() {
+ @Override
+ public QueryExecution run() {
try {
com.hp.hpl.jena.query.Query jenaQuery = QueryFactory
- .create(query);
+ .create(query);
if (jenaQuery.isUnknownType()) {
return null;
}
@@ -89,32 +89,32 @@ public class JenaSparqlEngine implements QueryEngine {
return null;
}
- }
- });
+ }
+ });
if (qexec == null) {
return executeUpdate(dataset, query);
}
//TODO check with rather than trial and error: if (qexec.getQuery().isSelectType()) {
- try {
- try {
- return new ResultSetWrapper(qexec.execSelect());
- } catch (QueryExecException e) {
- try {
- return Boolean.valueOf(qexec.execAsk());
- } catch (QueryExecException e2) {
- try {
- return new JenaGraphAdaptor(qexec.execDescribe()
- .getGraph()).getGraph();
- } catch (QueryExecException e3) {
- return new JenaGraphAdaptor(qexec.execConstruct()
- .getGraph()).getGraph();
- }
- }
- }
- } finally {
- qexec.close();
- }
- }
+ try {
+ try {
+ return new ResultSetWrapper(qexec.execSelect());
+ } catch (QueryExecException e) {
+ try {
+ return Boolean.valueOf(qexec.execAsk());
+ } catch (QueryExecException e2) {
+ try {
+ return new JenaGraphAdaptor(qexec.execDescribe()
+ .getGraph()).getGraph();
+ } catch (QueryExecException e3) {
+ return new JenaGraphAdaptor(qexec.execConstruct()
+ .getGraph()).getGraph();
+ }
+ }
+ }
+ } finally {
+ qexec.close();
+ }
+ }
private Object executeUpdate(Dataset dataset, String query) {
GraphStore graphStore = GraphStoreFactory.create(dataset) ;
[3/3] git commit: CLEREZZA-846:simplification as suggested by Andy
Seaborne
Posted by re...@apache.org.
CLEREZZA-846:simplification as suggested by Andy Seaborne
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/a7d9d0fc
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/a7d9d0fc
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/a7d9d0fc
Branch: refs/heads/master
Commit: a7d9d0fc3928541c4a17bb391ce94ed9034155dd
Parents: 8447814
Author: retobg <re...@apache.org>
Authored: Wed Dec 4 15:50:05 2013 +0100
Committer: retobg <re...@apache.org>
Committed: Wed Dec 4 15:50:05 2013 +0100
----------------------------------------------------------------------
rdf.jena.sparql/nbactions.xml | 11 ++
.../rdf/jena/sparql/JenaSparqlEngine.java | 5 +-
.../clerezza/rdf/jena/sparql/TcDataset.java | 168 -------------------
3 files changed, 15 insertions(+), 169 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/a7d9d0fc/rdf.jena.sparql/nbactions.xml
----------------------------------------------------------------------
diff --git a/rdf.jena.sparql/nbactions.xml b/rdf.jena.sparql/nbactions.xml
new file mode 100644
index 0000000..49e8307
--- /dev/null
+++ b/rdf.jena.sparql/nbactions.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+ <action>
+ <actionName>CUSTOM-deploy to localhost:8080</actionName>
+ <displayName>deploy to localhost:8080</displayName>
+ <goals>
+ <goal>install</goal>
+ <goal>org.apache.sling:maven-sling-plugin:install</goal>
+ </goals>
+ </action>
+</actions>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/a7d9d0fc/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java
----------------------------------------------------------------------
diff --git a/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java b/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java
index 8d9da34..f7f39d0 100644
--- a/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java
+++ b/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java
@@ -28,11 +28,13 @@ import org.apache.clerezza.rdf.core.sparql.query.Query;
import org.apache.clerezza.rdf.jena.storage.JenaGraphAdaptor;
import com.hp.hpl.jena.query.Dataset;
+import com.hp.hpl.jena.query.DatasetFactory;
import com.hp.hpl.jena.query.QueryException;
import com.hp.hpl.jena.query.QueryExecException;
import com.hp.hpl.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.sparql.core.DatasetGraph;
import com.hp.hpl.jena.update.GraphStore;
import com.hp.hpl.jena.update.GraphStoreFactory;
import com.hp.hpl.jena.update.UpdateAction;
@@ -57,7 +59,8 @@ public class JenaSparqlEngine implements QueryEngine {
@Override
public Object execute(TcManager tcManager, TripleCollection defaultGraph,
final String query) {
- final Dataset dataset = new TcDataset(tcManager, defaultGraph);
+ final DatasetGraph datasetGraph = new TcDatasetGraph(tcManager, defaultGraph);
+ final Dataset dataset = DatasetFactory.create(datasetGraph);
// Missing permission (java.lang.RuntimePermission getClassLoader)
// when calling QueryFactory.create causes ExceptionInInitializerError
http://git-wip-us.apache.org/repos/asf/clerezza/blob/a7d9d0fc/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDataset.java
----------------------------------------------------------------------
diff --git a/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDataset.java b/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDataset.java
deleted file mode 100644
index 48b70a3..0000000
--- a/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDataset.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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 org.apache.clerezza.rdf.jena.sparql;
-
-import com.hp.hpl.jena.query.Dataset;
-import com.hp.hpl.jena.query.LabelExistsException;
-import com.hp.hpl.jena.query.ReadWrite;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.shared.Lock;
-import com.hp.hpl.jena.sparql.core.DatasetGraph;
-import com.hp.hpl.jena.sparql.util.Context;
-
-import java.util.Iterator;
-import org.apache.clerezza.rdf.core.TripleCollection;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
-import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.clerezza.rdf.jena.facade.JenaGraph;
-
-/**
- *
- * @author rbn
- */
-public class TcDataset implements Dataset {
-
- private TcManager tcManager;
- private TripleCollection defaultGraph;
-
- TcDataset(TcManager tcManager, TripleCollection defaultGraph) {
- this.tcManager = tcManager;
- this.defaultGraph = defaultGraph;
- }
-
- @Override
- public Model getDefaultModel() {
- final JenaGraph jenaGraph = new JenaGraph(defaultGraph);
- final Model model = ModelFactory.createModelForGraph(jenaGraph);
- return model;
- }
-
- @Override
- public Model getNamedModel(String name) {
- final JenaGraph jenaGraph = new JenaGraph(
- tcManager.getTriples(new UriRef(name)));
- final Model model = ModelFactory.createModelForGraph(jenaGraph);
- return model;
- }
-
- @Override
- public boolean containsNamedModel(String name) {
- try {
- tcManager.getTriples(new UriRef(name));
- return true;
- } catch (NoSuchEntityException e) {
- return false;
- }
- }
-
- @Override
- public Iterator<String> listNames() {
- final Iterator<UriRef> tcs = tcManager.listTripleCollections().iterator();
- return new Iterator<String>() {
-
- @Override
- public boolean hasNext() {
- return tcs.hasNext();
- }
-
- @Override
- public String next() {
- UriRef next = tcs.next();
- return next != null ? next.getUnicodeString() : null;
- }
-
- @Override
- public void remove() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
- };
-
- }
-
- @Override
- public Lock getLock() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public DatasetGraph asDatasetGraph() {
- return new TcDatasetGraph(tcManager, defaultGraph);
- }
-
- @Override
- public void close() {
- }
-
- @Override
- public void setDefaultModel( Model model ) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public void addNamedModel( String uri, Model model ) throws LabelExistsException {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public void removeNamedModel( String uri ) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public void replaceNamedModel( String uri, Model model ) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public Context getContext() {
- return null;
- }
-
- @Override
- public boolean supportsTransactions() {
- return false;
- }
-
- @Override
- public void begin( ReadWrite readWrite ) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public void commit() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public void abort() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public boolean isInTransaction() {
- return false;
- }
-
- @Override
- public void end() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-}
[2/3] git commit: Using scr annotation, fixed imports
Posted by re...@apache.org.
Using scr annotation, fixed imports
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/84478142
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/84478142
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/84478142
Branch: refs/heads/master
Commit: 844781428867d1c4cc1a13fab972b6eb1e5809a1
Parents: 0036991
Author: retobg <re...@apache.org>
Authored: Wed Dec 4 12:30:26 2013 +0100
Committer: retobg <re...@apache.org>
Committed: Wed Dec 4 12:30:26 2013 +0100
----------------------------------------------------------------------
.../rdf/jena/sparql/JenaSparqlEngine.java | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/84478142/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java
----------------------------------------------------------------------
diff --git a/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java b/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java
index 5dfe7a9..8d9da34 100644
--- a/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java
+++ b/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java
@@ -24,9 +24,6 @@ import java.security.PrivilegedAction;
import org.apache.clerezza.rdf.core.TripleCollection;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.sparql.QueryEngine;
-import org.apache.clerezza.rdf.core.sparql.query.AskQuery;
-import org.apache.clerezza.rdf.core.sparql.query.ConstructQuery;
-import org.apache.clerezza.rdf.core.sparql.query.DescribeQuery;
import org.apache.clerezza.rdf.core.sparql.query.Query;
import org.apache.clerezza.rdf.jena.storage.JenaGraphAdaptor;
@@ -36,20 +33,15 @@ import com.hp.hpl.jena.query.QueryExecException;
import com.hp.hpl.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.QueryFactory;
-import com.hp.hpl.jena.sparql.resultset.SPARQLResult;
import com.hp.hpl.jena.update.GraphStore;
import com.hp.hpl.jena.update.GraphStoreFactory;
import com.hp.hpl.jena.update.UpdateAction;
-import com.hp.hpl.jena.update.UpdateFactory;
-import com.hp.hpl.jena.update.UpdateRequest;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Service;
-/**
- *
- * @scr.component
- * @scr.service interface="org.apache.clerezza.rdf.core.sparql.QueryEngine"
- *
- * @author rbn
- */
+
+@Component
+@Service(QueryEngine.class)
public class JenaSparqlEngine implements QueryEngine {
// ------------------------------------------------------------------------