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 2014/09/23 15:44:43 UTC
[1/3] git commit: CLEREZZA-935: re-added typerendering and launchers
Repository: clerezza
Updated Branches:
refs/heads/master fbe580c91 -> 3898f17de
CLEREZZA-935: re-added typerendering and launchers
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/a22b7631
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/a22b7631
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/a22b7631
Branch: refs/heads/master
Commit: a22b76319e1564f5fea13f9c67ba9647cf297efe
Parents: a8e3f6b
Author: Reto Gmür <re...@apache.org>
Authored: Thu Aug 7 14:55:33 2014 +0200
Committer: Reto Gmür <re...@apache.org>
Committed: Thu Aug 7 14:55:33 2014 +0200
----------------------------------------------------------------------
provisioning/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/a22b7631/provisioning/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/pom.xml b/provisioning/pom.xml
index b30a2c1..1a0979f 100644
--- a/provisioning/pom.xml
+++ b/provisioning/pom.xml
@@ -51,13 +51,13 @@
<module>rdf.virtuoso</module>
<module>platform.graphnodeprovider</module>
<module>typehandlerspace</module>
- <!--module>typerendering</module -->
+ <module>typerendering</module>
<module>rdf.web</module>
<module>platform.content</module>
<module>platform.tools</module>
<module>shell</module>
<module>security</module>
- <!--module>launchers</module-->
+ <module>launchers</module>
</modules>
</project>
[3/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/clerezza
Posted by re...@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/3898f17d
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/3898f17d
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/3898f17d
Branch: refs/heads/master
Commit: 3898f17de3a7474dc545a951fbc265b700adc81b
Parents: a04aec6 fbe580c
Author: Reto Gmür <re...@apache.org>
Authored: Tue Sep 23 15:42:04 2014 +0200
Committer: Reto Gmür <re...@apache.org>
Committed: Tue Sep 23 15:42:04 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 6 +-
.../platform.dashboard.core/pom.xml | 2 +-
.../platform.dashboard.ontologies/pom.xml | 2 +-
platform.launcher.storageless.parent/pom.xml | 6 ++
pom.xml | 4 +-
provisioning/typehandlerspace/pom.xml | 6 ++
rdf.core/pom.xml | 7 +-
.../clerezza/rdf/core/access/TcManager.java | 88 +++++++++++-----
.../rdf/core/access/TcProviderMultiplexer.java | 105 ++++++++++++-------
rdf.utils/pom.xml | 1 +
rdf.virtuoso.storage/pom.xml | 12 +++
.../rdf/virtuoso/storage/access/DataAccess.java | 7 ++
.../repo/virtuoso/virtjdbc/4.1/virtjdbc-4.1.jar | Bin 0 -> 214811 bytes
.../repo/virtuoso/virtjdbc/4.1/virtjdbc-4.1.pom | 27 +++++
.../virtuoso/virtjdbc/maven-metadata-local.xml | 30 ++++++
scala-scripting/script-engine/pom.xml | 2 +-
scala-scripting/tests/pom.xml | 2 +-
site/graph.nt | 6 +-
18 files changed, 233 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: CLEREZZA-948: avoid unnecessary merging of a set
wit itself
Posted by re...@apache.org.
CLEREZZA-948: avoid unnecessary merging of a set wit itself
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/a04aec6e
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/a04aec6e
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/a04aec6e
Branch: refs/heads/master
Commit: a04aec6eeb9bc7aaafc35a75002a0477da17e5f1
Parents: a22b763
Author: Reto Gmür <re...@apache.org>
Authored: Thu Aug 28 11:17:19 2014 +0200
Committer: Reto Gmür <re...@apache.org>
Committed: Thu Aug 28 11:17:19 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/clerezza/rdf/utils/smushing/SameAsSmusher.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/a04aec6e/rdf.utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmusher.java
----------------------------------------------------------------------
diff --git a/rdf.utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmusher.java b/rdf.utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmusher.java
index 938abed..e9ccbe0 100644
--- a/rdf.utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmusher.java
+++ b/rdf.utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmusher.java
@@ -81,7 +81,7 @@ public class SameAsSmusher extends BaseSmusher {
}
} else {
Set<NonLiteral> objectSet = node2EquivalenceSet.get(object);
- if (objectSet != null) {
+ if ((objectSet != null) && (objectSet != equivalentNodes)) {
//merge two sets
for (NonLiteral res : objectSet) {
node2EquivalenceSet.remove(res);