You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@clerezza.apache.org by enridaga <en...@apache.org> on 2014/01/24 23:20:22 UTC

Fwd: [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/clerezza

Hi all,
I just did this commit, forced by the fact that I needed to push my recent
changes to the virtuoso tc provider.
But now I am not sure that was correct...
I hope this doesn't break anything...

Best,
Enrico


---------- Forwarded message ----------
From: <en...@apache.org>
Date: 24 January 2014 22:17
Subject: [2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/clerezza
To: commits@clerezza.apache.org


Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/clerezza

Merge before commit


Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/b39deccf
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/b39deccf
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/b39deccf

Branch: refs/heads/master
Commit: b39deccf8f638707137f2fabe08a7ab3840286bf
Parents: 225b5a2 f9dd605
Author: enridaga <en...@apache.org>
Authored: Fri Jan 24 22:16:17 2014 +0000
Committer: enridaga <en...@apache.org>
Committed: Fri Jan 24 22:16:17 2014 +0000

----------------------------------------------------------------------
 ext/jena-arq/pom.xml                            |    2 +-
 ext/jena-core/pom.xml                           |    2 +-
 ext/jena-iri/pom.xml                            |    2 +-
 ext/jena-tdb/pom.xml                            |    2 +-
 nbactions.xml                                   |   10 +
 .../clerezza/platform/content/Editor.java       |   16 +-
 .../tools/editor/scripts/RDFa.1.3.0.js          | 3380 ++++++++++++++++++
 .../tools/editor/scripts/RDFaProcessor.1.3.0.js | 1644 +++++++++
 .../renderlets/HtmlInfoDicobitRDFaNaked.scala   |    4 +-
 .../editor/renderlets/TitledContentEtch.scala   |   83 +-
 .../renderlets/TitledContentRDFaNaked.scala     |    2 +-
 .../rdf/core/sparql/SparqlPreParser.java        |    9 +-
 .../rdf/core/sparql/SparqlPreParserTest.java    |   11 +
 .../rdf/jena/sparql/JenaSparqlEngine.java       |  118 +-
 .../clerezza/rdf/jena/sparql/SimpleTest.java    |    6 +-
 site/graph.nt                                   |    2 +-
 site/pom.xml                                    |  178 +-
 17 files changed, 5315 insertions(+), 156 deletions(-)
----------------------------------------------------------------------





-- 
------------------------------------------------------------------------------
enridaga