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

If files exist in WEB-INF/ontologies/auth, read them into the User Accounts model - useful for selenium tests.

Browse source
This commit is contained in:
j2blake 2012-05-31 15:53:44 +00:00
parent 8ee4d7cd8e
commit 49fe3f8e26
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,6 +23,7 @@ import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
*/
public class UserModelSetup extends JenaDataSourceSetupBase
implements ServletContextListener {
protected static String AUTHPATH = BASE + "auth/";
private static final Log log = LogFactory.getLog(
UserModelSetup.class.getName());
@ -55,7 +56,12 @@ public class UserModelSetup extends JenaDataSourceSetupBase
OntModel userAccountsModel =
ModelFactory.createOntologyModel( MEM_ONT_MODEL_SPEC);
userAccountsModel.add(userAccountsDbModel);
// This is used in Selenium testing, when we load user accounts from a file.
if (userAccountsDbModel.isEmpty()) {
readOntologyFilesInPathSet(AUTHPATH, ctx, userAccountsDbModel);
}
userAccountsModel.add(userAccountsDbModel);
userAccountsModel.getBaseModel().register(
new ModelSynchronizer(userAccountsDbModel));
ctx.setAttribute("userAccountsOntModel", userAccountsModel);
@ -65,5 +71,4 @@ public class UserModelSetup extends JenaDataSourceSetupBase
ss.fatal(this, "Unable to load user accounts model from DB", t);
}
}
}