Author: bdaw Date: 2009-11-13 04:58:22 -0500 (Fri, 13 Nov 2009) New Revision: 937 Modified: idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMDeployer.java idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/HibernatePopulator.java idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMService.java Log: - remove bsh usage Modified: idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMDeployer.java =================================================================== --- idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMDeployer.java 2009-11-13 08:51:49 UTC (rev 936) +++ idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMDeployer.java 2009-11-13 09:58:22 UTC (rev 937) @@ -58,7 +58,6 @@ service.setExitSQL(initializers.getSqlInitializer().getExitSQL()); } if (initializers.getHibernateInitializer() != null) { - service.setSetupLocation(initializers.getHibernateInitializer().getSetupLocation()); service.setDoChecking(initializers.getHibernateInitializer().isDoChecking()); } } Modified: idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/HibernatePopulator.java =================================================================== --- idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/HibernatePopulator.java 2009-11-13 08:51:49 UTC (rev 936) +++ idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/HibernatePopulator.java 2009-11-13 09:58:22 UTC (rev 937) @@ -6,13 +6,11 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; -import java.net.URL; import java.util.Collection; import java.util.Iterator; import java.util.logging.Level; import java.util.logging.Logger; -import javax.transaction.TransactionManager; import org.hibernate.Query; import org.hibernate.Session; @@ -22,13 +20,7 @@ import org.hibernate.metadata.ClassMetadata; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.hbm2ddl.SchemaUpdate; -import org.jboss.identity.idm.common.transaction.TransactionManagerProvider; -import org.jboss.identity.idm.common.transaction.Transactions; -import org.jboss.identity.idm.impl.helper.SecurityActions; -import bsh.EvalError; -import bsh.Interpreter; - /** * * Using the Hibernate built-in SchemaExport. @@ -59,7 +51,7 @@ private SessionFactory sessionFactory; - public HibernatePopulator(boolean doChecking, String setupLocation, Configuration config) { + public HibernatePopulator(boolean doChecking, Configuration config) { this.doChecking = doChecking; this.setupLocation = setupLocation; this.config = config; @@ -82,8 +74,6 @@ break; case RESULT_CREATE: createSchema(); - createContent(); - break; } } else { @@ -172,52 +162,7 @@ SchemaUpdate update = new SchemaUpdate(config); update.execute(false, true); } - - - private void createContent() - { - - if (setupLocation != null) { - URL setupResource = SecurityActions.getContextClassLoader().getResource(setupLocation) ; - if ( setupResource != null ) { - try - { - logger.info("Creating database content"); - final String script = getString(setupResource.openStream()); - - // Create an interpreter and configures it - final Interpreter interpreter = new Interpreter(); - interpreter.setClassLoader(Thread.currentThread().getContextClassLoader()); - interpreter.setOut(System.out); - interpreter.set("SessionFactory", sessionFactory); - - TransactionManager tm = TransactionManagerProvider.JBOSS_PROVIDER.getTransactionManager(); - Transactions.required(tm, new Transactions.Runnable() - { - public Object run() throws Exception - { - interpreter.eval(script); - return null; - } - }); - } - catch (EvalError e) - { - logger.info("Error in the bsh script: " + e); - } - catch (IllegalStateException e) - { - logger.info("Cannot load setup script: " + e); - } - catch (Exception e) - { - logger.info("Error in bsh script execution: " + e); - } - } - } - } - private String getString(InputStream in) { try { ByteArrayOutputStream out = new ByteArrayOutputStream(in.available()); Modified: idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMService.java =================================================================== --- idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMService.java 2009-11-13 08:51:49 UTC (rev 936) +++ idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMService.java 2009-11-13 09:58:22 UTC (rev 937) @@ -56,11 +56,6 @@ /** If hibernateConfigLocation option is present created SessionFactory will be registered in JNDI with this name*/ private String hibernateSessionFactoryJNDIName; - /** BSH script. If "doChecking" option is set and schema need to be created provided script will be invoked. This will - * happen after IdentitySessionFactory is created. hibernateSessionFactory and identitySessionFactory object - * are accessible in the script. */ - private String setupLocation; - /** If true checks the schema existence on start and create it if necessary. */ private boolean doChecking; @@ -120,16 +115,6 @@ this.hibernateConfigLocation = hibernateConfigLocation; } - public String getSetupLocation() - { - return setupLocation; - } - - public void setSetupLocation(String setupLocation) - { - this.setupLocation = setupLocation; - } - public boolean isDoChecking() { return doChecking; @@ -168,7 +153,7 @@ this.transactionManager = transactionManager; } -public void start() throws Exception { + public void start() throws Exception { logger.info("Starting the JBoss Identity Management Service"); @@ -201,7 +186,7 @@ } Configuration configuration = new Configuration().configure(hibernateConfigLocation); logger.fine("starting to populate the schema from file [" + hibernateConfigLocation + "]"); - HibernatePopulator hibernatePopulator = new HibernatePopulator(doChecking, setupLocation, configuration); + HibernatePopulator hibernatePopulator = new HibernatePopulator(doChecking, configuration); hibernatePopulator.populateSchema(); }