From 183ce8eb33da2ad60a17820809300602f8737b38 Mon Sep 17 00:00:00 2001
From: bjl23 <bjl23@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 1 Oct 2010 18:37:25 +0000
Subject: [PATCH] merging rdf link tag addition into trunk

---
 .../vitro/webapp/servlet/setup/JenaDataSourceSetupBase.java   | 2 +-
 webapp/web/templates/entity/entity_inject_head.jsp            | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupBase.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupBase.java
index 79f501482..8d6ed0516 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupBase.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupBase.java
@@ -79,7 +79,7 @@ public class JenaDataSourceSetupBase {
 	   return makeDBModel(ds, jenaDbModelName, jenaDbOntModelSpec);
    }
 
-   protected BasicDataSource makeBasicDataSource(String dbDriverClassname, String jdbcUrl, String username, String password) {
+   public static BasicDataSource makeBasicDataSource(String dbDriverClassname, String jdbcUrl, String username, String password) {
 	   log.debug("makeBasicDataSource('" + dbDriverClassname + "', '"
 				+ jdbcUrl + "', '" + username + "', '" + password + "')");
 	   BasicDataSource ds = new BasicDataSource();
diff --git a/webapp/web/templates/entity/entity_inject_head.jsp b/webapp/web/templates/entity/entity_inject_head.jsp
index b1902b1fa..330f0a1ee 100644
--- a/webapp/web/templates/entity/entity_inject_head.jsp
+++ b/webapp/web/templates/entity/entity_inject_head.jsp
@@ -34,6 +34,10 @@
 <c:url var="tinyMCE" value="/js/tiny_mce/tiny_mce.js"/>
 <c:url var="googleVisualizationAPI" value="http://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D"/>
 
+<c:if test="${!empty entityLinkedDataURL}">
+    <link rel="alternate" type="application/rdf+xml" href="${entityLinkedDataURL}"/>
+</c:if>
+
 <link rel="stylesheet" type="text/css" href="${themeDir}/css/visualization/visualization.css"/>
 <script type="text/javascript" src="${jquery}"></script>
 <script type="text/javascript" src="${getURLParam}"></script>