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

Datastar cleanup release - including changes to access permissions review and editing as well as fedora utilities.

Browse source
This commit is contained in:
hjk54 2010-05-14 17:37:55 +00:00
parent e402b03ac9
commit 73172f4f40
9 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/ConfigurationProperties.java
View file

@ -195,7 +195,7 @@ public class ConfigurationProperties {
* @throws IllegalArgumentException
* If the path fails to locate a file or a resource.
*/
private static InputStream getConfigurationInputStream(String configPath) {
public static InputStream getConfigurationInputStream(String configPath) {
InputStream inStream = null;
// Try to find this as a file.

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/FedoraDatastreamController.java
View file

@ -630,7 +630,7 @@ public class FedoraDatastreamController extends VitroHttpServlet implements Cons
}
}
private void setup(OntModel model, ServletContext context) {
public void setup(OntModel model, ServletContext context) {
this.configurationStatus = "";
StringBuffer status = new StringBuffer("");

1
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java
View file

@ -55,7 +55,6 @@ public class MailUsersServlet extends VitroHttpServlet {
private String getSmtpHostFromProperties() {
String host = ConfigurationProperties.getProperty("Vitro.smtpHost");
if (host != null && !host.equals("")) {
System.out.println("Found Vitro.smtpHost value is " + host);
//LOG.info("Found Vitro.smtpHost value of " + host);
} else {
System.out.println("No Vitro.smtpHost specified");

2
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java
View file

@ -57,12 +57,14 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
Map<String, ObjectProperty> uriToObjectProperty = new HashMap<String,ObjectProperty>();
ObjectPropertyDaoJena opDaoJena = new ObjectPropertyDaoJena(getWebappDaoFactory());
Resource ind = getOntModel().getResource(entity.getURI());
List<ObjectPropertyStatement> objPropertyStmtList = new ArrayList<ObjectPropertyStatement>();
ClosableIterator propIt = ind.listProperties();
try {
while (propIt.hasNext()) {
Statement st = (Statement) propIt.next();
if (st.getObject().isResource() && !(NONUSER_NAMESPACES.contains(st.getPredicate().getNameSpace()))) {
try {
ObjectPropertyStatement objPropertyStmt = new ObjectPropertyStatementImpl();

4
webapp/src/edu/cornell/mannlib/vitro/webapp/utils/FedoraConfiguration.java
View file

@ -24,7 +24,7 @@ public class FedoraConfiguration {
private static String FEDORA_PROPERTIES = "/WEB-INF/fedora.properties";
private String fedoraUrl = null;
public String fedoraUrl = null;
private String adminUser = null;
private String adminPassword = null;
private String pidNamespace = null;
@ -118,7 +118,7 @@ public class FedoraConfiguration {
this.configurationStatus += status.toString();
}
private boolean canConnectToFedoraServer( ){
public boolean canConnectToFedoraServer( ){
try{
FedoraClient fc = new FedoraClient(fedoraUrl,adminUser, adminPassword);
String fedoraVersion = fc.getServerVersion();

2
webapp/web/edit/editRequestDispatch.jsp
View file

@ -230,7 +230,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
//case where a form was passed as a http parameter
form = formParam;
}
System.out.println("Edit request dispatch - forwarding to form is " + form);
request.setAttribute("form", form);
%>
<jsp:forward page="/edit/forms/${form}" />

2
webapp/web/edit/processRdfForm2.jsp
View file

@ -41,6 +41,8 @@
<%@page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.ModelChangePreprocessor"%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
<%@ page import="java.net.URLDecoder" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<%-- 2nd prototype of processing.

3
webapp/web/templates/entity/entityMergedPropsList.jsp
View file

@ -33,6 +33,7 @@
<%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep" %>
<%@ page import="edu.cornell.mannlib.vedit.beans.LoginFormBean" %>
<jsp:useBean id="loginHandler" class="edu.cornell.mannlib.vedit.beans.LoginFormBean" scope="session" />
ENTITY merged props list
<%!
public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.templates.entity.entityMergedPropsList.jsp");
%>
@ -59,6 +60,8 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
throw new Error("Subject individual must be in request scope for entityMergedPropsList.jsp");
}
System.out.println("Entity Merged Props list for " + subject.getURI());
// Nick wants not to use explicit parameters to trigger visibility of a div, but for now we don't just want to always show the 1st one
String openingGroupLocalName = (String) request.getParameter("curgroup");
VitroRequest vreq = new VitroRequest(request);

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

@ -37,7 +37,7 @@
<%@ page import="org.apache.commons.logging.Log" %>
<%@ page import="org.apache.commons.logging.LogFactory" %>
ENTITY merged props list ungrouped
<jsp:useBean id="loginHandler" class="edu.cornell.mannlib.vedit.beans.LoginFormBean" scope="session" />
<%!
public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.templates.entity.entityMergedPropsList.jsp");
@ -58,7 +58,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
if (subject==null) {
throw new Error("Subject individual must be in request scope for dashboardPropsList.jsp");
}
System.out.println("Entity merged props list ungrouped for " + subject.getURI());
// Nick wants not to use explicit parameters to trigger visibility of a div, but for now we don't just want to always show the 1st one
String openingGroupLocalName = (String) request.getParameter("curgroup");
VitroRequest vreq = new VitroRequest(request);