You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by mi...@apache.org on 2014/08/04 18:38:43 UTC
[1/2] git commit: CLEREZZA-936: Use column name to detect ASK
response.
Repository: clerezza
Updated Branches:
refs/heads/master 854b72f14 -> 86885e800
CLEREZZA-936: Use column name to detect ASK response.
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/95a9e7e0
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/95a9e7e0
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/95a9e7e0
Branch: refs/heads/master
Commit: 95a9e7e0451305cb7a01ad7b41af71c7e5ac6934
Parents: 317dfc0
Author: Minto van der Sluis <mi...@apache.org>
Authored: Mon Aug 4 18:37:35 2014 +0200
Committer: Minto van der Sluis <mi...@apache.org>
Committed: Mon Aug 4 18:37:35 2014 +0200
----------------------------------------------------------------------
.../clerezza/rdf/virtuoso/storage/access/DataAccess.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95a9e7e0/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java
----------------------------------------------------------------------
diff --git a/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java b/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java
index 56fd298..1af24a4 100644
--- a/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java
+++ b/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java
@@ -108,6 +108,8 @@ public class DataAccess {
private final static UriRef XMLLiteral = new UriRef("http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral");
private final static UriRef XMLLiteralShadowed = new UriRef("urn:x-clerezza:rdf#XMLLiteral");
+ private final static String ASK_COLUMNNAME = "__ask_retval";
+
/**
* Bidirectional map for managing the conversion from virtuoso blank nodes
* (strings) to clerezza blank nodes and vice versa.
@@ -955,9 +957,8 @@ public class DataAccess {
rs = st.getResultSet();
// ASK :: Boolean
if (rs.getMetaData().getColumnCount() == 1
- && rs.getMetaData().getColumnType(1) == 4) {
-// rs.next();
-// returnThis = rs.getBoolean(1);
+ && rs.getMetaData().getColumnType(1) == 4
+ && ASK_COLUMNNAME.equals( rs.getMetaData().getColumnName( 1 )) ) {
if(rs.next()){
returnThis = rs.getBoolean(1);
}else{
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/clerezza
Posted by mi...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/clerezza
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/86885e80
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/86885e80
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/86885e80
Branch: refs/heads/master
Commit: 86885e8007e5fae0ce8cb1aea75e9df6f72c0c14
Parents: 95a9e7e 854b72f
Author: Minto van der Sluis <mi...@apache.org>
Authored: Mon Aug 4 18:38:36 2014 +0200
Committer: Minto van der Sluis <mi...@apache.org>
Committed: Mon Aug 4 18:38:36 2014 +0200
----------------------------------------------------------------------
bundledevtool/pom.xml | 10 +-
clerezza-jar-resource-bundle/pom.xml | 6 +-
ext.com.ibm.icu/pom.xml | 4 +-
ext.javax.mail/pom.xml | 2 +-
ext.org.apache.jena.tdb/pom.xml | 2 +-
ext.org.apache.jena/pom.xml | 2 +-
ext.org.apache.lucene/pom.xml | 2 +-
ext.org.json.simple/pom.xml | 4 +-
ext.org.ops4j.pax.swissbox.tinybundles/pom.xml | 2 +-
ext.virtuoso.jdbc/pom.xml | 9 +-
ext/bundles-pom/pom.xml | 484 +++++++++----------
ext/jena-arq/pom.xml | 238 ++++-----
ext/jena-core/pom.xml | 236 ++++-----
ext/jena-iri/pom.xml | 222 ++++-----
ext/jena-tdb/pom.xml | 226 ++++-----
ext/pom.xml | 106 ++--
internal.archetype/pom.xml | 2 +-
jaxrs.extensions/pom.xml | 4 +-
jaxrs.rdf.providers/pom.xml | 8 +-
jaxrs.stanbol.fragments/pom.xml | 12 +-
jaxrs.utils/pom.xml | 4 +-
jaxrs.whiteboard.jersey/pom.xml | 4 +-
maven-jaxrs-report-plugin/pom.xml | 2 +-
maven-ontologies-plugin/pom.xml | 6 +-
osgi.services/pom.xml | 4 +-
parent/pom.xml | 14 +-
permissiondescriptions/pom.xml | 6 +-
.../platform.accountcontrolpanel.core/pom.xml | 38 +-
.../pom.xml | 8 +-
platform.accountcontrolpanel/pom.xml | 4 +-
.../platform.concepts.core/pom.xml | 28 +-
.../platform.concepts.ontologies/pom.xml | 8 +-
platform.concepts/pom.xml | 4 +-
platform.config.gui/pom.xml | 20 +-
platform.config/pom.xml | 16 +-
platform.content.default404/pom.xml | 8 +-
platform.content.fsadaptor/pom.xml | 14 +-
platform.content.imagemetadata/pom.xml | 12 +-
.../pom.xml | 18 +-
.../pom.xml | 8 +-
platform.content.representations/pom.xml | 4 +-
platform.content/pom.xml | 32 +-
platform.cris/pom.xml | 16 +-
platform.curieprefixmanager/core/pom.xml | 20 +-
platform.curieprefixmanager/ontologies/pom.xml | 8 +-
platform.curieprefixmanager/pom.xml | 6 +-
platform.dashboard.webinterface/pom.xml | 20 +-
.../platform.dashboard.core/pom.xml | 20 +-
.../platform.dashboard.ontologies/pom.xml | 8 +-
platform.dashboard/pom.xml | 4 +-
platform.documentation.viewer/pom.xml | 10 +-
platform.documentation/pom.xml | 10 +-
platform.editor/pom.xml | 34 +-
platform.enrichment/pom.xml | 12 +-
platform.globalmenu.api/pom.xml | 4 +-
platform.graphnodeprovider/pom.xml | 24 +-
platform.graphprovider.content/pom.xml | 12 +-
.../platform.language.core/pom.xml | 20 +-
.../platform.language.ontologies/pom.xml | 8 +-
platform.language/pom.xml | 4 +-
.../platform.launcher.storageless/pom.xml | 2 +-
platform.launcher.storageless.parent/pom.xml | 178 +++----
platform.launcher.tdb/pom.xml | 12 +-
platform.logging/core/pom.xml | 22 +-
platform.logging/initializer/pom.xml | 4 +-
platform.logging/ontologies/pom.xml | 8 +-
platform.logging/pom.xml | 4 +-
platform.mail/pom.xml | 16 +-
platform.scripting.scriptmanager/pom.xml | 22 +-
platform.scripting/pom.xml | 8 +-
platform.security.conditions/pom.xml | 4 +-
platform.security.foafssl/core/pom.xml | 18 +-
platform.security.foafssl/ontologies/pom.xml | 8 +-
platform.security.foafssl/pom.xml | 4 +-
platform.shellcustomizer/pom.xml | 12 +-
platform.style.classic.webguiexamples/pom.xml | 6 +-
platform.style.classic/pom.xml | 12 +-
platform.style.default/pom.xml | 16 +-
platform.typehandlerspace.jaxrs2/pom.xml | 12 +-
platform.typehandlerspace.wink/pom.xml | 14 +-
platform.typehandlerspace/pom.xml | 16 +-
platform.typepriority/pom.xml | 14 +-
platform.typerendering.gui/pom.xml | 18 +-
platform.typerendering.scala/pom.xml | 10 +-
platform.typerendering.scalaserverpages/pom.xml | 12 +-
platform.typerendering.seedsnipe/pom.xml | 14 +-
.../platform.typerendering.core/pom.xml | 18 +-
.../platform.typerendering.ontologies/pom.xml | 8 +-
platform.typerendering/pom.xml | 4 +-
platform.usermanager.webinterface/pom.xml | 32 +-
platform.usermanager/pom.xml | 14 +-
platform.users/core/pom.xml | 16 +-
platform.users/pom.xml | 4 +-
platform.xhtml2html/pom.xml | 4 +-
platform/pom.xml | 6 +-
pom.xml | 46 +-
provisioning/felixosgi/pom.xml | 10 +-
provisioning/felixweb/pom.xml | 8 +-
provisioning/jaxrs-whiteboard/pom.xml | 10 +-
provisioning/launchers/full-launcher/pom.xml | 44 +-
.../launchers/linked-data-launcher/pom.xml | 34 +-
provisioning/launchers/pom.xml | 4 +-
provisioning/launchers/shell-launcher/pom.xml | 20 +-
.../launchers/typerendering-launcher/pom.xml | 30 +-
provisioning/platform.content/pom.xml | 14 +-
provisioning/platform.graphnodeprovider/pom.xml | 26 +-
provisioning/platform.tools/pom.xml | 14 +-
provisioning/pom.xml | 4 +-
provisioning/rdf.tdb/pom.xml | 12 +-
provisioning/rdf.virtuoso/pom.xml | 12 +-
provisioning/rdf.web/pom.xml | 20 +-
provisioning/rdf/pom.xml | 46 +-
provisioning/security/pom.xml | 18 +-
provisioning/shell/pom.xml | 54 +--
provisioning/typehandlerspace/pom.xml | 14 +-
provisioning/typerendering/pom.xml | 44 +-
rdf.core.test/pom.xml | 6 +-
rdf.core/pom.xml | 6 +-
rdf.cris/core/pom.xml | 10 +-
rdf.cris/ontologies/pom.xml | 6 +-
rdf.cris/pom.xml | 4 +-
rdf.enrichment/pom.xml | 16 +-
rdf.file.storage/pom.xml | 12 +-
rdf.jena.commons/pom.xml | 6 +-
rdf.jena.facade/pom.xml | 8 +-
rdf.jena.parser/pom.xml | 6 +-
rdf.jena.serializer/pom.xml | 6 +-
rdf.jena.sparql/pom.xml | 12 +-
rdf.jena.storage/pom.xml | 12 +-
rdf.jena.tdb.storage/pom.xml | 16 +-
rdf.locking/pom.xml | 8 +-
rdf.metadata/pom.xml | 6 +-
rdf.ontologies/pom.xml | 8 +-
rdf.rdfa/pom.xml | 6 +-
rdf.rdfjson/pom.xml | 10 +-
rdf.scala.utils/pom.xml | 8 +-
rdf.schemagen/pom.xml | 8 +-
rdf.simple.storage/pom.xml | 8 +-
rdf.stable.serializer/pom.xml | 12 +-
rdf.storage.externalizer/pom.xml | 6 +-
rdf.storage.web/pom.xml | 14 +-
rdf.utils/pom.xml | 10 +-
rdf.virtuoso.storage/pom.xml | 17 +-
rdf.web/pom.xml | 4 +-
rdf.web/rdf.web.core/pom.xml | 26 +-
rdf.web/rdf.web.ontologies/pom.xml | 6 +-
scala-scripting/pom.xml | 8 +-
scala-scripting/script-engine/pom.xml | 4 +-
scala-scripting/tests/pom.xml | 6 +-
shell.felixshellcommand/pom.xml | 8 +-
shell/pom.xml | 10 +-
slf4j-scala-api/pom.xml | 4 +-
sshshell/pom.xml | 6 +-
ssl.keygen/base/pom.xml | 4 +-
ssl.keygen/pom.xml | 4 +-
templating.seedsnipe/pom.xml | 12 +-
templating/pom.xml | 6 +-
tools.offline/pom.xml | 26 +-
uima/pom.xml | 5 +-
uima/uima.casconsumer/pom.xml | 12 +-
uima/uima.concept-tagging/pom.xml | 12 +-
uima/uima.metadata-generator/pom.xml | 12 +-
uima/uima.ontologies.ao/pom.xml | 8 +-
uima/uima.ontologies/pom.xml | 8 +-
uima/uima.samples/pom.xml | 10 +-
uima/uima.utils/pom.xml | 8 +-
utils.customproperty/pom.xml | 8 +-
utils.imageprocessing/pom.xml | 8 +-
utils/pom.xml | 4 +-
web.fileserver/pom.xml | 6 +-
web.resources.jquery/pom.xml | 6 +-
web.resources.scripts/pom.xml | 8 +-
web.resources.yui/pom.xml | 6 +-
173 files changed, 1810 insertions(+), 1831 deletions(-)
----------------------------------------------------------------------