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
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();