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

VIVO-82 Use ModelAccess to get or set the UserAccounts model

Browse source
This commit is contained in:
j2blake 2013-05-16 18:11:13 -04:00
parent 4764751905
commit 1c95d4e4a9
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ModelAccess.java
View file

@ -82,6 +82,14 @@ public class ModelAccess {
this.parent = parent; this.parent = parent;
} }
public void setUserAccountsModel(OntModel m) {
setOntModel(ModelID.USER_ACCOUNTS, m);
}
public OntModel getUserAccountsModel() {
return getOntModel(ModelID.USER_ACCOUNTS);
}
public void setDisplayModel(OntModel m) { public void setDisplayModel(OntModel m) {
setOntModel(ModelID.DISPLAY, m); setOntModel(ModelID.DISPLAY, m);
} }
@ -101,14 +109,6 @@ public class ModelAccess {
// "ModelAccess.getAssertionsOntModel not implemented."); // "ModelAccess.getAssertionsOntModel not implemented.");
// } // }
// //
// public void setUserAccountsModel(OntModel m) {
// setOntModel(ModelID.USER_ACCOUNTS, m);
// }
//
// public OntModel getUserAccountsModel() {
// return getOntModel(ModelID.USER_ACCOUNTS);
// }
//
// public OntModel getDisplayTboxOntModel() { // public OntModel getDisplayTboxOntModel() {
// throw new RuntimeException( // throw new RuntimeException(
// "ModelAccess.getDisplayTboxOntModel not implemented."); // "ModelAccess.getDisplayTboxOntModel not implemented.");

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

@ -71,7 +71,7 @@ public class ContentModelSetup extends JenaDataSourceSetupBase
JenaDataSourceSetupBase.thisIsFirstStartup(); JenaDataSourceSetupBase.thisIsFirstStartup();
} }
OntModel userAccountsModel = ontModelFromContextAttribute(ctx, "userAccountsOntModel"); OntModel userAccountsModel = ModelAccess.on(ctx).getUserAccountsModel();
OntModel displayModel = ModelAccess.on(ctx).getDisplayModel(); OntModel displayModel = ModelAccess.on(ctx).getDisplayModel();
OntModel baseABoxModel = createNamedModelFromDataset(dataset, JENA_DB_MODEL); OntModel baseABoxModel = createNamedModelFromDataset(dataset, JENA_DB_MODEL);
OntModel inferenceABoxModel = createNamedModelFromDataset(dataset, JENA_INF_MODEL); OntModel inferenceABoxModel = createNamedModelFromDataset(dataset, JENA_INF_MODEL);

4
webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UserModelSetup.java
View file

@ -6,7 +6,6 @@ import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener; import javax.servlet.ServletContextListener;
import javax.sql.DataSource; import javax.sql.DataSource;
import org.apache.commons.dbcp.BasicDataSource;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -14,6 +13,7 @@ import com.hp.hpl.jena.ontology.OntModel;
import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory; import com.hp.hpl.jena.rdf.model.ModelFactory;
import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelSynchronizer; import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelSynchronizer;
import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus; import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
@ -65,7 +65,7 @@ public class UserModelSetup extends JenaDataSourceSetupBase
userAccountsModel.add(userAccountsDbModel); userAccountsModel.add(userAccountsDbModel);
userAccountsModel.getBaseModel().register( userAccountsModel.getBaseModel().register(
new ModelSynchronizer(userAccountsDbModel)); new ModelSynchronizer(userAccountsDbModel));
ctx.setAttribute("userAccountsOntModel", userAccountsModel); ModelAccess.on(ctx).setUserAccountsModel(userAccountsModel);
} catch (Throwable t) { } catch (Throwable t) {
log.error("Unable to load user accounts model from DB", t); log.error("Unable to load user accounts model from DB", t);