You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2013/06/25 08:37:12 UTC
[1/3] git commit: MARMOTTA-258 (Making RDF Discoverable from HTML)
fixed
Updated Branches:
refs/heads/develop e931d8bc1 -> 847de8701
MARMOTTA-258 (Making RDF Discoverable from HTML) fixed
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/3b6a31d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/3b6a31d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/3b6a31d3
Branch: refs/heads/develop
Commit: 3b6a31d3d9a8a2faf8b62df5a39fcface3c08125
Parents: e931d8b
Author: Sergio Fernández <wi...@apache.org>
Authored: Tue Jun 25 08:24:26 2013 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Tue Jun 25 08:24:26 2013 +0200
----------------------------------------------------------------------
platform/marmotta-core/src/main/resources/templates/rdfhtml.ftl | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/3b6a31d3/platform/marmotta-core/src/main/resources/templates/rdfhtml.ftl
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/templates/rdfhtml.ftl b/platform/marmotta-core/src/main/resources/templates/rdfhtml.ftl
index 1327e5b..cd4b18b 100644
--- a/platform/marmotta-core/src/main/resources/templates/rdfhtml.ftl
+++ b/platform/marmotta-core/src/main/resources/templates/rdfhtml.ftl
@@ -27,6 +27,11 @@
<script type="text/javascript" src="${SERVER_URL}core/public/js/lib/jquery-1.7.2.js"></script>
<link href="${SERVER_URL}${DEFAULT_STYLE}style.css" rel="stylesheet" type="text/css" />
<link href="${SERVER_URL}${DEFAULT_STYLE}rdfhtml.css" rel="stylesheet" type="text/css" />
+ <link rel="alternate" type="application/rdf+xml" href="${SERVER_URL}resource?uri=${resources[0].encoded_uri}&format=application/rdf%2Bxml" />
+ <link rel="alternate" type="text/rdf+n3" href="${SERVER_URL}resource?uri=${resources[0].encoded_uri}&format=text/rdf%2Bn3" />
+ <link rel="alternate" type="text/turtle" href="${SERVER_URL}resource?uri=${resources[0].encoded_uri}&format=text/turtle" />
+ <link rel="alternate" type="application/rdf+json" href="${SERVER_URL}resource?uri=${resources[0].encoded_uri}&format=application/rdf%2Bjson" />
+ <link rel="alternate" type="application/ld+json" href="${SERVER_URL}resource?uri=${resources[0].encoded_uri}&format=application/ld%2Bjson" />
<script>
$(document).ready(function(){
[3/3] git commit: deploying marmotta in the root context using
embedded tomcat
Posted by wi...@apache.org.
deploying marmotta in the root context using embedded tomcat
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/847de870
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/847de870
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/847de870
Branch: refs/heads/develop
Commit: 847de8701f73fcc8102f3be61669b6a4ff725a39
Parents: 740cb7d
Author: Sergio Fernández <wi...@apache.org>
Authored: Tue Jun 25 08:31:33 2013 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Tue Jun 25 08:31:33 2013 +0200
----------------------------------------------------------------------
launchers/marmotta-webapp/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/847de870/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index 5e4bd0b..50b90e2 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -35,7 +35,7 @@
<properties>
<!-- these are used for the goals tomcat6/7:run or jetty:run -->
<marmotta.home>/tmp/marmotta</marmotta.home>
- <marmotta.context>/marmotta</marmotta.context>
+ <marmotta.context>/</marmotta.context>
<marmotta.port>8080</marmotta.port>
</properties>
[2/3] git commit: MARMOTTA-258: security checking
Posted by wi...@apache.org.
MARMOTTA-258: security checking
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/740cb7d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/740cb7d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/740cb7d8
Branch: refs/heads/develop
Commit: 740cb7d8f7b3edb5c1a585a5f39d06112d77b18f
Parents: 3b6a31d
Author: Sergio Fernández <wi...@apache.org>
Authored: Tue Jun 25 08:30:37 2013 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Tue Jun 25 08:30:37 2013 +0200
----------------------------------------------------------------------
platform/marmotta-core/src/main/resources/templates/rdfhtml.ftl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/740cb7d8/platform/marmotta-core/src/main/resources/templates/rdfhtml.ftl
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/templates/rdfhtml.ftl b/platform/marmotta-core/src/main/resources/templates/rdfhtml.ftl
index cd4b18b..53f89ea 100644
--- a/platform/marmotta-core/src/main/resources/templates/rdfhtml.ftl
+++ b/platform/marmotta-core/src/main/resources/templates/rdfhtml.ftl
@@ -27,12 +27,14 @@
<script type="text/javascript" src="${SERVER_URL}core/public/js/lib/jquery-1.7.2.js"></script>
<link href="${SERVER_URL}${DEFAULT_STYLE}style.css" rel="stylesheet" type="text/css" />
<link href="${SERVER_URL}${DEFAULT_STYLE}rdfhtml.css" rel="stylesheet" type="text/css" />
+ <#if resources?size = 1>
<link rel="alternate" type="application/rdf+xml" href="${SERVER_URL}resource?uri=${resources[0].encoded_uri}&format=application/rdf%2Bxml" />
<link rel="alternate" type="text/rdf+n3" href="${SERVER_URL}resource?uri=${resources[0].encoded_uri}&format=text/rdf%2Bn3" />
<link rel="alternate" type="text/turtle" href="${SERVER_URL}resource?uri=${resources[0].encoded_uri}&format=text/turtle" />
<link rel="alternate" type="application/rdf+json" href="${SERVER_URL}resource?uri=${resources[0].encoded_uri}&format=application/rdf%2Bjson" />
<link rel="alternate" type="application/ld+json" href="${SERVER_URL}resource?uri=${resources[0].encoded_uri}&format=application/ld%2Bjson" />
-
+ </#if>
+
<script>
$(document).ready(function(){
$(".submenu li").click(function(event){