litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merging rdf link tag addition into trunk

Browse source
This commit is contained in:
bjl23 2010-10-01 18:37:25 +00:00
parent 5bc5c0b93c
commit 183ce8eb33
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupBase.java
View file

@ -79,7 +79,7 @@ public class JenaDataSourceSetupBase {
return makeDBModel(ds, jenaDbModelName, jenaDbOntModelSpec); 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 + "', '" log.debug("makeBasicDataSource('" + dbDriverClassname + "', '"
+ jdbcUrl + "', '" + username + "', '" + password + "')"); + jdbcUrl + "', '" + username + "', '" + password + "')");
BasicDataSource ds = new BasicDataSource(); BasicDataSource ds = new BasicDataSource();

4
webapp/web/templates/entity/entity_inject_head.jsp
View file

@ -34,6 +34,10 @@
<c:url var="tinyMCE" value="/js/tiny_mce/tiny_mce.js"/> <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: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"/> <link rel="stylesheet" type="text/css" href="${themeDir}/css/visualization/visualization.css"/>
<script type="text/javascript" src="${jquery}"></script> <script type="text/javascript" src="${jquery}"></script>
<script type="text/javascript" src="${getURLParam}"></script> <script type="text/javascript" src="${getURLParam}"></script>