grails-app/conf/BuildConfig.groovy lib/liquibase-1.9.2.jar plugins/hibernate-1.1/HibernateGrailsPlugin.groovy plugins/hibernate-1.1/application.properties plugins/hibernate-1.1/docs/gapi/DefaultPackage/HibernateGrailsPlugin.html plugins/hibernate-1.1/docs/gapi/deprecated-list.html plugins/hibernate-1.1/docs/gapi/help-doc.html plugins/hibernate-1.1/docs/gapi/index-all.html plugins/hibernate-1.1/docs/gapi/inherit.gif plugins/hibernate-1.1/docs/gapi/scripts/_Install.html plugins/hibernate-1.1/docs/gapi/scripts/_Uninstall.html plugins/hibernate-1.1/docs/gapi/scripts/_Upgrade.html plugins/hibernate-1.1/lib/dom4j-1.6.1.jar plugins/hibernate-1.1/lib/hibernate-annotations-3.3.0.jar plugins/hibernate-1.1/lib/hibernate-commons-annotations-3.3.0.jar plugins/hibernate-1.1/lib/hibernate3-3.3.1.jar plugins/hibernate-1.1/lib/javassist-3.4.GA.jar plugins/hibernate-1.1/plugin.xml plugins/hibernate-1.1/scripts/_Install.groovy plugins/hibernate-1.1/scripts/_Uninstall.groovy plugins/hibernate-1.1/scripts/_Upgrade.groovy src/groovy/ColumnCatcher.groovy src/groovy/ConstraintsCatcher.groovy src/groovy/FindCommand.groovy src/groovy/GroovyChangeLogParser.groovy src/groovy/GroovyChangeSet.groovy src/groovy/GroovyCustomPreconditionWrapper.groovy src/groovy/GroovyDatabaseChangeLog.groovy src/groovy/GroovyPrecondition.groovy src/groovy/HelloWorldCommand.groovy src/groovy/LbdslProperties.groovy src/groovy/LiquibaseDsl.groovy src/groovy/MigrateCommand.groovy src/groovy/ParamCatcher.groovy src/groovy/PrintPerlProperties.groovy src/groovy/RunCommand.groovy src/groovy/WhereCatcher.groovy src/java/Assigner.java src/java/ChangeLogParserFactory.java src/java/ChangeLogParserImpl.java src/java/ExampleCustomPrecondition.java src/java/LbdslCommand.java @@ -14,19 +14,18 @@ limitations under the License. */ import org.slf4j.bridge.*; -import liquibase.LiquibaseDsl; -import liquibase.log.LogFactory; -import java.util.logging.Level as JavaLogLevel; import grails.util.GrailsUtil; -import org.codehaus.groovy.grails.commons.ConfigurationHolder -import org.apache.log4j.*; +import org.apache.log4j.* +import liquibase.parser.factory.OpenChangeFactory +import autobase.change.GroovyScriptChange +import java.util.logging.Handler class AutobaseGrailsPlugin { private static final Logger log = Logger.getLogger(AutobaseGrailsPlugin); - def version = '0.8.2.5' + def version = '0.8.3' def dependsOn = [hibernate:GrailsUtil.grailsVersion] def observe = [] def watchedResources = [] @@ -45,16 +44,43 @@ The approach to this plugin is to leave the database update mode ("hbm2ddl.auto" def documentation = "http://github.com/RobertFischer/autobase/wikis" //"http://grails.org/Autobase+Plugin" + private static final Closure doInstallSlf4jBridge = { + try { + SLF4JBridgeHandler.install() + //here we do a little hack. The SLF4JBridgeHandler wants to be the only handler registered with the logger + //but for some reason we get an extra console handler in the array, so we remove it + def logParent = liquibase.log.LogFactory.getLogger().parent + Handler slf4jHandler = (Handler) logParent.handlers.find { it instanceof SLF4JBridgeHandler } + if (logParent.handlers.length > 1 && slf4jHandler) { + def handlersToRemove = logParent.getHandlers() - slf4jHandler + handlersToRemove.each { Handler handler -> + logParent.removeHandler(handler) + } + } + } catch (Throwable e) { + log.error("Error setting up slf4j bridge, message: ${e.getMessage()}", e) + } + } + + //TODO: Formalize how we want to register change/precondition extensions conventionally + private static final Closure doRegisterExtensions = { + try { + OpenChangeFactory.instance.registerChange(GroovyScriptChange.TAG_NAME, GroovyScriptChange.class) + } catch (Throwable e) { + GrailsUtil.deepSanitize(e) + log.error("Error registering extensions, message: ${e.getMessage()}", e) + } + } + private static final Closure doMigrate = {application, appCtx -> try { - SLF4JBridgeHandler.install() - def runOnCreateDrop = application.config.autobase.runOnCreateDrop + def runOnCreateDrop = application.config.autobase.runOnCreateDrop if (runOnCreateDrop == false && application.config.dataSource.dbCreate == 'create-drop') { log.info("Skipping Autobase migration due to create-drop (set 'autobase.runOnCreateDrop' to 'false' in Config.groovy to run anyway)") } else { - log.info("Beginning Autobase migration") + log.info("---- Starting Autobase migrations ----") Autobase.migrate(appCtx) - log.info("Successfully completed Autobase migration") + log.info("---- Autobase migrations completed ----") } } catch(Exception e) { GrailsUtil.deepSanitize(e) @@ -65,9 +91,9 @@ The approach to this plugin is to leave the database update mode ("hbm2ddl.auto" def doWithSpring = { } def doWithApplicationContext = { appCtx -> - println "Starting migration" + doInstallSlf4jBridge() + doRegisterExtensions() doMigrate(application, appCtx) - println "Ended migration" } def doWithWebDescriptor = {} AutobaseGrailsPlugin.groovy @@ -1,3 +1,7 @@ * Cope with Liquibase's use of java.util.logging (UGH) * Remove the println statements and turn them into logging statements * Auto-launch an editor when a migration is created, assuming that $EDITOR is set. +* don't overwrite existing changelog.groovy file (or at least ask) when installing the plugin +* sort migration files according to file name and not according to relative path (i.e. author), + this enables multiple users to decide on the sequence their migrations will be run in using + a naming convention \ No newline at end of file TODO @@ -1,5 +1,5 @@ #utf-8 -#Fri Mar 20 19:59:28 EDT 2009 +#Tue Apr 07 16:05:23 EDT 2009 app.grails.version=1.1 plugins.hibernate=1.1 app.name=autobase application.properties @@ -8,6 +8,7 @@ The approach to this plugin is to leave the database update mode ("hbm2ddl.auto" </description> <documentation>http://github.com/RobertFischer/autobase/wikis</documentation> <resources> + <resource>BuildConfig</resource> <resource>DataSource</resource> <resource>UrlMappings</resource> </resources> plugin.xml @@ -14,7 +14,7 @@ import java.util.*; import org.apache.commons.lang.StringUtils public class GroovyScriptChange implements liquibase.change.Change { - + static final String TAG_NAME = 'groovyScript' String sourceFile; Set<DatabaseObject> affectedObjects = new HashSet<DatabaseObject>(1); def result; @@ -22,7 +22,7 @@ public class GroovyScriptChange implements liquibase.change.Change { FileOpener fileOpener; ChangeSet changeSet; - String getChangeName() { return "groovyScript" } + String getChangeName() { return TAG_NAME } String getTagName() { return this.changeName } void executeStatements(Database db, List<SqlVisitor> sqlVisitors) throws JDBCException, UnsupportedChangeException { src/groovy/GroovyScriptChange.groovy Demo/.classpath Demo/.project Demo/.settings/org.codehaus.groovy.eclipse.preferences.prefs Demo/2 Demo/Demo-0.1.war Demo/Demo-test.launch Demo/Demo.launch Demo/Demo.tmproj Demo/application.properties Demo/autobase.properties Demo/build.xml Demo/common.tests.changelog.xml Demo/dynamic.parameters.properties Demo/grails-app/conf/BootStrap.groovy Demo/grails-app/conf/Config.groovy Demo/grails-app/conf/DataSource.groovy Demo/grails-app/conf/UrlMappings.groovy Demo/grails-app/conf/spring/resources.groovy Demo/grails-app/i18n/messages.properties Demo/grails-app/i18n/messages_de.properties Demo/grails-app/i18n/messages_es.properties Demo/grails-app/i18n/messages_fr.properties Demo/grails-app/i18n/messages_it.properties Demo/grails-app/i18n/messages_ja.properties Demo/grails-app/i18n/messages_nl.properties Demo/grails-app/i18n/messages_pt_BR.properties Demo/grails-app/i18n/messages_ru.properties Demo/grails-app/i18n/messages_th.properties Demo/grails-app/i18n/messages_zh_CN.properties Demo/grails-app/views/error.gsp Demo/grails-app/views/layouts/main.gsp Demo/ivy.xml Demo/ivysettings.xml Demo/migrations/changelog.groovy Demo/migrations/common.tests.changelog.groovy Demo/sample.data1-excel.csv Demo/sample.data1.csv Demo/sample.data2.csv Demo/sample.data3.csv Demo/update_autobase.sh Demo/web-app/WEB-INF/applicationContext.xml Demo/web-app/WEB-INF/sitemesh.xml Demo/web-app/WEB-INF/tld/c.tld Demo/web-app/WEB-INF/tld/fmt.tld Demo/web-app/WEB-INF/tld/grails.tld Demo/web-app/WEB-INF/tld/spring.tld Demo/web-app/css/main.css Demo/web-app/images/favicon.ico Demo/web-app/images/grails_logo.jpg Demo/web-app/images/skin/database_add.png Demo/web-app/images/skin/database_delete.png Demo/web-app/images/skin/database_edit.png Demo/web-app/images/skin/database_save.png Demo/web-app/images/skin/database_table.png Demo/web-app/images/skin/exclamation.png Demo/web-app/images/skin/house.png Demo/web-app/images/skin/information.png Demo/web-app/images/skin/shadow.jpg Demo/web-app/images/skin/sorted_asc.gif Demo/web-app/images/skin/sorted_desc.gif Demo/web-app/images/spinner.gif Demo/web-app/index.gsp Demo/web-app/js/application.js Demo/web-app/js/prototype/animation.js Demo/web-app/js/prototype/builder.js Demo/web-app/js/prototype/controls.js Demo/web-app/js/prototype/dragdrop.js Demo/web-app/js/prototype/effects.js Demo/web-app/js/prototype/prototype.js Demo/web-app/js/prototype/rico.js Demo/web-app/js/prototype/scriptaculous.js Demo/web-app/js/prototype/slider.js Demo/web-app/js/prototype/sound.js Demo/web-app/js/prototype/unittest.js Demo/web-app/plugins/autobase-0.8.2.5/css/main.css Demo/web-app/plugins/autobase-0.8.2.5/images/favicon.ico Demo/web-app/plugins/autobase-0.8.2.5/images/grails_logo.jpg Demo/web-app/plugins/autobase-0.8.2.5/images/skin/database_add.png Demo/web-app/plugins/autobase-0.8.2.5/images/skin/database_delete.png Demo/web-app/plugins/autobase-0.8.2.5/images/skin/database_edit.png Demo/web-app/plugins/autobase-0.8.2.5/images/skin/database_save.png Demo/web-app/plugins/autobase-0.8.2.5/images/skin/database_table.png Demo/web-app/plugins/autobase-0.8.2.5/images/skin/exclamation.png Demo/web-app/plugins/autobase-0.8.2.5/images/skin/house.png Demo/web-app/plugins/autobase-0.8.2.5/images/skin/information.png Demo/web-app/plugins/autobase-0.8.2.5/images/skin/shadow.jpg Demo/web-app/plugins/autobase-0.8.2.5/images/skin/sorted_asc.gif Demo/web-app/plugins/autobase-0.8.2.5/images/skin/sorted_desc.gif Demo/web-app/plugins/autobase-0.8.2.5/images/spinner.gif Demo/web-app/plugins/autobase-0.8.2.5/index.gsp Demo/web-app/plugins/autobase-0.8.2.5/js/application.js Demo/web-app/plugins/autobase-0.8.2.5/js/prototype/animation.js Demo/web-app/plugins/autobase-0.8.2.5/js/prototype/builder.js Demo/web-app/plugins/autobase-0.8.2.5/js/prototype/controls.js Demo/web-app/plugins/autobase-0.8.2.5/js/prototype/dragdrop.js Demo/web-app/plugins/autobase-0.8.2.5/js/prototype/effects.js Demo/web-app/plugins/autobase-0.8.2.5/js/prototype/prototype.js Demo/web-app/plugins/autobase-0.8.2.5/js/prototype/rico.js Demo/web-app/plugins/autobase-0.8.2.5/js/prototype/scriptaculous.js Demo/web-app/plugins/autobase-0.8.2.5/js/prototype/slider.js Demo/web-app/plugins/autobase-0.8.2.5/js/prototype/sound.js Demo/web-app/plugins/autobase-0.8.2.5/js/prototype/unittest.js Demo/web-app/plugins/debug-1.0.2/css/main.css Demo/web-app/plugins/debug-1.0.2/css/tree/check/tree.css Demo/web-app/plugins/debug-1.0.2/css/tree/default/tree.css Demo/web-app/plugins/debug-1.0.2/css/tree/folders/tree.css Demo/web-app/plugins/debug-1.0.2/css/tree/menu/tree.css Demo/web-app/plugins/debug-1.0.2/images/favicon.ico Demo/web-app/plugins/debug-1.0.2/images/grails_logo.jpg Demo/web-app/plugins/debug-1.0.2/images/skin/database_add.png Demo/web-app/plugins/debug-1.0.2/images/skin/database_delete.png Demo/web-app/plugins/debug-1.0.2/images/skin/database_edit.png Demo/web-app/plugins/debug-1.0.2/images/skin/database_save.png Demo/web-app/plugins/debug-1.0.2/images/skin/database_table.png Demo/web-app/plugins/debug-1.0.2/images/skin/exclamation.png Demo/web-app/plugins/debug-1.0.2/images/skin/house.png Demo/web-app/plugins/debug-1.0.2/images/skin/information.png Demo/web-app/plugins/debug-1.0.2/images/skin/shadow.jpg Demo/web-app/plugins/debug-1.0.2/images/skin/sorted_asc.gif Demo/web-app/plugins/debug-1.0.2/images/skin/sorted_desc.gif Demo/web-app/plugins/debug-1.0.2/images/spinner.gif Demo/web-app/plugins/debug-1.0.2/images/tree/bullet.gif Demo/web-app/plugins/debug-1.0.2/images/tree/check/check0.gif Demo/web-app/plugins/debug-1.0.2/images/tree/check/check1.gif Demo/web-app/plugins/debug-1.0.2/images/tree/check/check2.gif Demo/web-app/plugins/debug-1.0.2/images/tree/check/lm.gif Demo/web-app/plugins/debug-1.0.2/images/tree/check/lmh.gif Demo/web-app/plugins/debug-1.0.2/images/tree/check/ln.gif Demo/web-app/plugins/debug-1.0.2/images/tree/check/loading.gif Demo/web-app/plugins/debug-1.0.2/images/tree/check/lp.gif Demo/web-app/plugins/debug-1.0.2/images/tree/check/lph.gif Demo/web-app/plugins/debug-1.0.2/images/tree/check/tm.gif Demo/web-app/plugins/debug-1.0.2/images/tree/check/tmh.gif Demo/web-app/plugins/debug-1.0.2/images/tree/check/tn.gif Demo/web-app/plugins/debug-1.0.2/images/tree/check/tp.gif Demo/web-app/plugins/debug-1.0.2/images/tree/check/tph.gif Demo/web-app/plugins/debug-1.0.2/images/tree/check/vline.gif Demo/web-app/plugins/debug-1.0.2/images/tree/default/lm.gif Demo/web-app/plugins/debug-1.0.2/images/tree/default/lmh.gif Demo/web-app/plugins/debug-1.0.2/images/tree/default/ln.gif Demo/web-app/plugins/debug-1.0.2/images/tree/default/loading.gif Demo/web-app/plugins/debug-1.0.2/images/tree/default/lp.gif Demo/web-app/plugins/debug-1.0.2/images/tree/default/lph.gif Demo/web-app/plugins/debug-1.0.2/images/tree/default/tm.gif Demo/web-app/plugins/debug-1.0.2/images/tree/default/tmh.gif Demo/web-app/plugins/debug-1.0.2/images/tree/default/tn.gif Demo/web-app/plugins/debug-1.0.2/images/tree/default/tp.gif Demo/web-app/plugins/debug-1.0.2/images/tree/default/tph.gif Demo/web-app/plugins/debug-1.0.2/images/tree/default/vline.gif Demo/web-app/plugins/debug-1.0.2/images/tree/folders/lm.gif Demo/web-app/plugins/debug-1.0.2/images/tree/folders/lmh.gif Demo/web-app/plugins/debug-1.0.2/images/tree/folders/ln.gif Demo/web-app/plugins/debug-1.0.2/images/tree/folders/loading.gif Demo/web-app/plugins/debug-1.0.2/images/tree/folders/lp.gif Demo/web-app/plugins/debug-1.0.2/images/tree/folders/lph.gif Demo/web-app/plugins/debug-1.0.2/images/tree/folders/tm.gif Demo/web-app/plugins/debug-1.0.2/images/tree/folders/tmh.gif Demo/web-app/plugins/debug-1.0.2/images/tree/folders/tn.gif Demo/web-app/plugins/debug-1.0.2/images/tree/folders/tp.gif Demo/web-app/plugins/debug-1.0.2/images/tree/folders/tph.gif Demo/web-app/plugins/debug-1.0.2/images/tree/folders/vline.gif Demo/web-app/plugins/debug-1.0.2/images/tree/greybg.png Demo/web-app/plugins/debug-1.0.2/images/tree/header.gif Demo/web-app/plugins/debug-1.0.2/images/tree/logo.gif Demo/web-app/plugins/debug-1.0.2/images/tree/menu/collapse.gif Demo/web-app/plugins/debug-1.0.2/images/tree/menu/collapseh.gif Demo/web-app/plugins/debug-1.0.2/images/tree/menu/collapseon.gif Demo/web-app/plugins/debug-1.0.2/images/tree/menu/dash.gif Demo/web-app/plugins/debug-1.0.2/images/tree/menu/expand.gif Demo/web-app/plugins/debug-1.0.2/images/tree/menu/expandh.gif Demo/web-app/plugins/debug-1.0.2/images/tree/menu/expandon.gif Demo/web-app/plugins/debug-1.0.2/images/tree/menu/loading.gif Demo/web-app/plugins/debug-1.0.2/images/tree/navHover2.png Demo/web-app/plugins/debug-1.0.2/images/tree/qbottom.png Demo/web-app/plugins/debug-1.0.2/images/tree/qmiddle.png Demo/web-app/plugins/debug-1.0.2/images/tree/qtop.png Demo/web-app/plugins/debug-1.0.2/index.gsp Demo/web-app/plugins/debug-1.0.2/js/application.js Demo/web-app/plugins/debug-1.0.2/js/prototype/animation.js Demo/web-app/plugins/debug-1.0.2/js/prototype/builder.js Demo/web-app/plugins/debug-1.0.2/js/prototype/controls.js Demo/web-app/plugins/debug-1.0.2/js/prototype/dragdrop.js Demo/web-app/plugins/debug-1.0.2/js/prototype/effects.js Demo/web-app/plugins/debug-1.0.2/js/prototype/prototype.js Demo/web-app/plugins/debug-1.0.2/js/prototype/rico.js Demo/web-app/plugins/debug-1.0.2/js/prototype/scriptaculous.js Demo/web-app/plugins/debug-1.0.2/js/prototype/slider.js Demo/web-app/plugins/debug-1.0.2/js/prototype/sound.js Demo/web-app/plugins/debug-1.0.2/js/prototype/unittest.js lib/jcl-over-slf4j-1.5.6-sources.jar lib/jcl-over-slf4j-1.5.6.jar lib/lbdsl.jar lib/liquibase-1.9.0.jar lib/slf4j-jcl-1.5.6-sources.jar lib/slf4j-jcl-1.5.6.jar lib/slf4j-migrator-1.5.6.jar lib/slf4j-nop-1.5.6-sources.jar lib/slf4j-nop-1.5.6.jar lib/slf4j-simple-1.5.6-sources.jar lib/slf4j-simple-1.5.6.jar e11224361ca46e5ca76792952dc3e9e6ea50d1d7 Robert Fischer robert.fischer@smokejumperit.com http://github.com/RobertFischer/autobase/commit/8d978fa656ec8dd9c244f2b6c38f73c608d70acd 8d978fa656ec8dd9c244f2b6c38f73c608d70acd 2009-04-07T13:17:16-07:00 2009-04-07T13:17:16-07:00 Checking in liquibase-dsl merge and Matias's updates d3ab95586f9feb1db306017127f32352e8950313 Robert Fischer robert.fischer@smokejumperit.com