Grails 2.4.0
Diversos
Merge branch 'master' of https://github.com/lmarques1979/bolao

Conflicts:
	.project
	.settings/org.eclipse.core.resources.prefs
	grails-app/conf/Config.groovy
	grails-app/controllers/bolao/BaseController.groovy
	grails-app/i18n/messages_pt_BR.properties
	grails-app/views/layouts/main.gsp
	grails-app/views/regra/_form.gsp
	grails-app/views/regra/create.gsp
	grails-app/views/regra/edit.gsp
	grails-app/views/regra/index.gsp
	grails-app/views/regra/show.gsp
	grails-app/views/usuario/_form.gsp
	grails-app/views/usuario/create.gsp
	grails-app/views/usuario/edit.gsp
	grails-app/views/usuario/index.gsp
	grails-app/views/usuario/show.gsp
	grails-app/views/usuarioRegra/_form.gsp
	grails-app/views/usuarioRegra/create.gsp
	grails-app/views/usuarioRegra/edit.gsp
	grails-app/views/usuarioRegra/index.gsp
	grails-app/views/usuarioRegra/show.gsp
	grailsw
	src/groovy/myspringsecurity/MyAuthenticationSuccessHandler.groovy
	src/groovy/usuario/DetalheUsuario.groovy
	src/groovy/usuario/UsuarioDetalheService.groovy
	target-eclipse/classes/uglifyjs/test/unit/compress/test/const.js
	target-eclipse/classes/uglifyjs/test/unit/compress/test/if.js
	target-eclipse/classes/uglifyjs/test/unit/compress/test/ifreturn.js
	target-eclipse/classes/uglifyjs/test/unit/compress/test/var.js
	target/classes/BootStrap.class
	target/classes/BuildConfig.class
	target/classes/Config.class
	target/classes/DataSource.class
	target/classes/Mysql/MyCustomMySQL5InnoDBDialect.class
	target/classes/UrlMappings.class
	target/classes/bolao/BaseController$_getPaginacaoParams_closure1.class
	target/classes/bolao/BaseController.class
	target/classes/myspringsecurity/MyAuthenticationSuccessHandler.class
	target/classes/resources.class
	target/classes/usuario/DetalheUsuario.class

target/classes/usuario/UsuarioDetalheService$_loadUserByUsername_closure
1.class
	target/classes/usuario/UsuarioDetalheService.class
	target/stacktrace.log
	target/work/plugin-classes/AssetPipelineBootStrap.class
	target/work/plugin-classes/AssetPipelineGrailsPlugin.class
	target/work/plugin-classes/AssetUrlMappings.class
	target/work/plugin-classes/CacheGrailsPlugin.class
	target/work/plugin-classes/DatabaseMigrationGrailsPlugin.class
	target/work/plugin-classes/DbdocUrlMappings.class
	target/work/plugin-classes/DefaultCacheConfig.class
	target/work/plugin-classes/DefaultSecurityConfig.class
	target/work/plugin-classes/DefaultUiSecurityConfig.class
	target/work/plugin-classes/DefaultWebXmlConfig.class
	target/work/plugin-classes/FamfamfamGrailsPlugin.class
	target/work/plugin-classes/Hibernate4GrailsPlugin.class
	target/work/plugin-classes/JQueryConfig.class
	target/work/plugin-classes/JQueryPluginResources.class
	target/work/plugin-classes/JQueryResourceTagLib.class
	target/work/plugin-classes/JQueryService.class
	target/work/plugin-classes/JQueryTagLib.class
	target/work/plugin-classes/JqueryGrailsPlugin.class
	target/work/plugin-classes/JqueryUiGrailsPlugin.class
	target/work/plugin-classes/JqueryUiPluginResources.class
	target/work/plugin-classes/MailGrailsPlugin.class
	target/work/plugin-classes/ScaffoldingGrailsPlugin.class
	target/work/plugin-classes/SpringSecurityCoreGrailsPlugin.class
	target/work/plugin-classes/SpringSecurityUIPluginResources.class
	target/work/plugin-classes/SpringSecurityUiGrailsPlugin.class
	target/work/plugin-classes/WebxmlGrailsPlugin.class
	target/work/plugin-classes/asset/pipeline/AbstractAssetFile.class
	target/work/plugin-classes/asset/pipeline/AbstractProcessor.class
	target/work/plugin-classes/asset/pipeline/AssetCompiler.class
	target/work/plugin-classes/asset/pipeline/AssetHelper.class
	target/work/plugin-classes/asset/pipeline/AssetMethodTagLib.class
	target/work/plugin-classes/asset/pipeline/AssetPipelineFilter.class
	target/work/plugin-classes/asset/pipeline/AssetProcessorService.class
	target/work/plugin-classes/asset/pipeline/AssetsController.class
	target/work/plugin-classes/asset/pipeline/AssetsTagLib.class
	target/work/plugin-classes/asset/pipeline/CacheManager.class
	target/work/plugin-classes/asset/pipeline/CssAssetFile.class
	target/work/plugin-classes/asset/pipeline/DirectiveProcessor.class
	target/work/plugin-classes/asset/pipeline/HtmlAssetFile.class
	target/work/plugin-classes/asset/pipeline/JsAssetFile.class
	target/work/plugin-classes/asset/pipeline/ManifestAssetFile.class

target/work/plugin-classes/asset/pipeline/grails/AssetResourceLocator.cl
ass

target/work/plugin-classes/asset/pipeline/grails/CachingLinkGenerator.cl
ass
	target/work/plugin-classes/asset/pipeline/grails/LinkGenerator.class

target/work/plugin-classes/asset/pipeline/processors/CssMinifyPostProces
sor.class
	target/work/plugin-classes/asset/pipeline/processors/CssProcessor.class

target/work/plugin-classes/asset/pipeline/processors/UglifyJsProcessor.c
lass

target/work/plugin-classes/com/burtbeckwith/grails/plugin/famfamfam/Famf
amfamTagLib.class

target/work/plugin-classes/com/grailsrocks/jqueryui/JqueryUiTagLib.class
	target/work/plugin-classes/grails/plugin/cache/CacheTagLib.class
	target/work/plugin-classes/grails/plugin/cache/ConfigBuilder.class
	target/work/plugin-classes/grails/plugin/cache/ConfigLoader.class

target/work/plugin-classes/grails/plugin/cache/GrailsCacheAdminService.c
lass

target/work/plugin-classes/grails/plugin/databasemigration/ChangelogXml2
Groovy.class

target/work/plugin-classes/grails/plugin/databasemigration/DbdocControll
er.class

target/work/plugin-classes/grails/plugin/databasemigration/DslBuilder.cl
ass

target/work/plugin-classes/grails/plugin/databasemigration/GormColumn.cl
ass

target/work/plugin-classes/grails/plugin/databasemigration/GormDatabase.
class

target/work/plugin-classes/grails/plugin/databasemigration/GormDatabaseS
napshotGenerator.class

target/work/plugin-classes/grails/plugin/databasemigration/GormDatabaseT
ypeConverter.class

target/work/plugin-classes/grails/plugin/databasemigration/GormDiff.clas
s

target/work/plugin-classes/grails/plugin/databasemigration/GrailsChange$
1.class

target/work/plugin-classes/grails/plugin/databasemigration/GrailsChange.
class

target/work/plugin-classes/grails/plugin/databasemigration/GrailsChangeL
ogParser.class

target/work/plugin-classes/grails/plugin/databasemigration/GrailsClassLo
aderResourceAccessor.class

target/work/plugin-classes/grails/plugin/databasemigration/GrailsDiffSta
tusListener.class

target/work/plugin-classes/grails/plugin/databasemigration/GrailsPrecond
ition$1.class

target/work/plugin-classes/grails/plugin/databasemigration/GrailsPrecond
ition.class

target/work/plugin-classes/grails/plugin/databasemigration/GroovyAwareSt
ringChangeLogSerializer.class

target/work/plugin-classes/grails/plugin/databasemigration/HibernateAwar
eTypeConverter.class

target/work/plugin-classes/grails/plugin/databasemigration/MigrationRunn
er.class

target/work/plugin-classes/grails/plugin/databasemigration/MigrationUtil
s.class

target/work/plugin-classes/grails/plugin/databasemigration/MySQLCompatib
leChangeLogSerializer.class

target/work/plugin-classes/grails/plugin/databasemigration/MysqlAwareCre
ateTableGenerator.class

target/work/plugin-classes/grails/plugin/databasemigration/NoopVisitor.c
lass

target/work/plugin-classes/grails/plugin/databasemigration/ScriptUtils.c
lass

target/work/plugin-classes/grails/plugin/databasemigration/Slf4jLogger.c
lass

target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/AuthorL
istWriter.class

target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/AuthorW
riter.class

target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/ChangeL
ogListWriter.class

target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/ChangeL
ogWriter.class

target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/ColumnW
riter.class

target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/HTMLLis
tWriter.class

target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/HTMLWri
ter.class

target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/MemoryD
ocVisitor.class

target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/Pending
ChangesWriter.class

target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/Pending
SQLWriter.class

target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/RecentC
hangesWriter.class

target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/TableLi
stWriter.class

target/work/plugin-classes/grails/plugin/databasemigration/dbdoc/TableWr
iter.class
	target/work/plugin-classes/grails/plugin/mail/GrailsMailException.class
	target/work/plugin-classes/grails/plugin/mail/MailMessageBuilder.class

target/work/plugin-classes/grails/plugin/mail/MailMessageBuilderFactory.
class

target/work/plugin-classes/grails/plugin/mail/MailMessageContentRender.c
lass

target/work/plugin-classes/grails/plugin/mail/MailMessageContentRenderer
.class
	target/work/plugin-classes/grails/plugin/mail/MailService.class
	target/work/plugin-classes/grails/plugin/mail/PlainTextMailTagLib.class

target/work/plugin-classes/grails/plugin/springsecurity/InterceptedUrl.c
lass

target/work/plugin-classes/grails/plugin/springsecurity/LoginController.
class

target/work/plugin-classes/grails/plugin/springsecurity/LogoutController
.class

target/work/plugin-classes/grails/plugin/springsecurity/ReflectionUtils.
class

target/work/plugin-classes/grails/plugin/springsecurity/SecurityTagLib.c
lass

target/work/plugin-classes/grails/plugin/springsecurity/SpringSecuritySe
rvice.class

target/work/plugin-classes/grails/plugin/springsecurity/ui/AbstractS2UiC
ontroller.class

target/work/plugin-classes/grails/plugin/springsecurity/ui/AclClassContr
oller.class

target/work/plugin-classes/grails/plugin/springsecurity/ui/AclEntryContr
oller.class

target/work/plugin-classes/grails/plugin/springsecurity/ui/AclObjectIden
tityController.class

target/work/plugin-classes/grails/plugin/springsecurity/ui/AclSidControl
ler.class

target/work/plugin-classes/grails/plugin/springsecurity/ui/PersistentLog
inController.class

target/work/plugin-classes/grails/plugin/springsecurity/ui/RegisterComma
nd.class

target/work/plugin-classes/grails/plugin/springsecurity/ui/RegisterContr
oller.class

target/work/plugin-classes/grails/plugin/springsecurity/ui/RegistrationC
ode.class

target/work/plugin-classes/grails/plugin/springsecurity/ui/RegistrationC
odeController.class

target/work/plugin-classes/grails/plugin/springsecurity/ui/RequestmapCon
troller.class

target/work/plugin-classes/grails/plugin/springsecurity/ui/ResetPassword
Command.class

target/work/plugin-classes/grails/plugin/springsecurity/ui/RoleControlle
r.class

target/work/plugin-classes/grails/plugin/springsecurity/ui/SecurityInfoC
ontroller.class

target/work/plugin-classes/grails/plugin/springsecurity/ui/SecurityUiTag
Lib.class

target/work/plugin-classes/grails/plugin/springsecurity/ui/SpringSecurit
yUiService.class

target/work/plugin-classes/grails/plugin/springsecurity/ui/UserControlle
r.class

target/work/plugin-classes/grails/plugin/springsecurity/userdetails/Gorm
UserDetailsService.class

target/work/plugin-classes/grails/plugin/springsecurity/web/authenticati
on/rememberme/GormPersistentTokenRepository.class
	target/work/plugin-classes/grails/plugin/webxml/FilterManager.class

target/work/plugin-classes/org/codehaus/groovy/grails/plugins/jquery/JQu
eryConfig.class

target/work/plugin-classes/org/codehaus/groovy/grails/plugins/jquery/JQu
eryProvider.class

target/work/plugin-classes/org/codehaus/groovy/grails/scaffolding/Defaul
tGrailsTemplateGenerator.class

target/work/plugins/asset-pipeline-1.8.11/src/groovy/uglifyjs/test/unit/
compress/test/const.js

target/work/plugins/asset-pipeline-1.8.11/src/groovy/uglifyjs/test/unit/
compress/test/if.js

target/work/plugins/asset-pipeline-1.8.11/src/groovy/uglifyjs/test/unit/
compress/test/ifreturn.js

target/work/plugins/asset-pipeline-1.8.11/src/groovy/uglifyjs/test/unit/
compress/test/var.js
	target/work/plugins/database-migration-1.4.0/LICENSE.txt

target/work/plugins/database-migration-1.4.0/grails-app/views/dbdoc/_glo
balnav.gsp

target/work/plugins/database-migration-1.4.0/grails-app/views/dbdoc/_ind
ex.gsp

target/work/plugins/database-migration-1.4.0/grails-app/views/dbdoc/_ove
rview-summary.gsp

target/work/plugins/database-migration-1.4.0/grails-app/views/dbdoc/_sty
lesheet.gsp

target/work/plugins/database-migration-1.4.0/scripts/DbmChangelogSync.gr
oovy

target/work/plugins/database-migration-1.4.0/scripts/DbmChangelogSyncSql
.groovy

target/work/plugins/database-migration-1.4.0/scripts/DbmClearChecksums.g
roovy

target/work/plugins/database-migration-1.4.0/scripts/DbmCreateChangelog.
groovy
	target/work/plugins/database-migration-1.4.0/scripts/DbmDbDoc.groovy
	target/work/plugins/database-migration-1.4.0/scripts/DbmDropAll.groovy

target/work/plugins/database-migration-1.4.0/scripts/DbmFutureRollbackSq
l.groovy

target/work/plugins/database-migration-1.4.0/scripts/DbmGenerateChangelo
g.groovy

target/work/plugins/database-migration-1.4.0/scripts/DbmGenerateGormChan
gelog.groovy
	target/work/plugins/database-migration-1.4.0/scripts/DbmGormDiff.groovy

target/work/plugins/database-migration-1.4.0/scripts/DbmListLocks.groovy
	target/work/plugins/database-migration-1.4.0/scripts/DbmListTags.groovy

target/work/plugins/database-migration-1.4.0/scripts/DbmMarkNextChangese
tRan.groovy

target/work/plugins/database-migration-1.4.0/scripts/DbmPreviousChangese
tSql.groovy

target/work/plugins/database-migration-1.4.0/scripts/DbmRegisterChangelo
g.groovy

target/work/plugins/database-migration-1.4.0/scripts/DbmReleaseLocks.gro
ovy
	target/work/plugins/database-migration-1.4.0/scripts/DbmRollback.groovy

target/work/plugins/database-migration-1.4.0/scripts/DbmRollbackCount.gr
oovy

target/work/plugins/database-migration-1.4.0/scripts/DbmRollbackCountSql
.groovy

target/work/plugins/database-migration-1.4.0/scripts/DbmRollbackSql.groo
vy

target/work/plugins/database-migration-1.4.0/scripts/DbmRollbackToDate.g
roovy

target/work/plugins/database-migration-1.4.0/scripts/DbmRollbackToDateSq
l.groovy
	target/work/plugins/database-migration-1.4.0/scripts/DbmStatus.groovy
	target/work/plugins/database-migration-1.4.0/scripts/DbmTag.groovy
	target/work/plugins/database-migration-1.4.0/scripts/DbmUpdate.groovy

target/work/plugins/database-migration-1.4.0/scripts/DbmUpdateCount.groo
vy

target/work/plugins/database-migration-1.4.0/scripts/DbmUpdateCountSql.g
roovy

target/work/plugins/database-migration-1.4.0/scripts/DbmUpdateSql.groovy
	target/work/plugins/database-migration-1.4.0/scripts/DbmValidate.groovy

target/work/plugins/database-migration-1.4.0/src/groovy/grails/plugin/da
tabasemigration/dbdoc/AuthorListWriter.groovy

target/work/plugins/database-migration-1.4.0/src/groovy/grails/plugin/da
tabasemigration/dbdoc/AuthorWriter.groovy

target/work/plugins/database-migration-1.4.0/src/groovy/grails/plugin/da
tabasemigration/dbdoc/ChangeLogListWriter.groovy

target/work/plugins/database-migration-1.4.0/src/groovy/grails/plugin/da
tabasemigration/dbdoc/ChangeLogWriter.groovy

target/work/plugins/database-migration-1.4.0/src/groovy/grails/plugin/da
tabasemigration/dbdoc/ColumnWriter.groovy

target/work/plugins/database-migration-1.4.0/src/groovy/grails/plugin/da
tabasemigration/dbdoc/HTMLListWriter.groovy

target/work/plugins/database-migration-1.4.0/src/groovy/grails/plugin/da
tabasemigration/dbdoc/HTMLWriter.groovy

target/work/plugins/database-migration-1.4.0/src/groovy/grails/plugin/da
tabasemigration/dbdoc/PendingChangesWriter.groovy

target/work/plugins/database-migration-1.4.0/src/groovy/grails/plugin/da
tabasemigration/dbdoc/PendingSQLWriter.groovy

target/work/plugins/database-migration-1.4.0/src/groovy/grails/plugin/da
tabasemigration/dbdoc/RecentChangesWriter.groovy

target/work/plugins/database-migration-1.4.0/src/groovy/grails/plugin/da
tabasemigration/dbdoc/TableListWriter.groovy

target/work/plugins/database-migration-1.4.0/src/groovy/grails/plugin/da
tabasemigration/dbdoc/TableWriter.groovy
	target/work/plugins/famfamfam-1.0.1/LICENSE.txt
	target/work/plugins/famfamfam-1.0.1/readme.html
	target/work/plugins/famfamfam-1.0.1/readme.txt
	target/work/plugins/spring-security-core-2.0-RC3/LICENSE.txt

target/work/plugins/spring-security-core-2.0-RC3/grails-app/controllers/
grails/plugin/springsecurity/LoginController.groovy

target/work/plugins/spring-security-core-2.0-RC3/grails-app/controllers/
grails/plugin/springsecurity/LogoutController.groovy
	target/work/plugins/spring-security-ui-1.0-RC2/LICENSE.txt
	target/work/plugins/spring-security-ui-1.0-RC2/web-app/css/reset.css
	target/work/plugins/webxml-1.4.1/LICENSE.txt

target/work/plugins/webxml-1.4.1/grails-app/conf/DefaultWebXmlConfig.gro
ovy
	target/work/plugins/webxml-1.4.1/src/samples/_WebXmlConfig.groovy
	target/work/resources/grails-app/i18n/messages_pt_BR.properties
	target/work/resources/uglifyjs/test/unit/compress/test/const.js
	target/work/resources/uglifyjs/test/unit/compress/test/if.js
	target/work/resources/uglifyjs/test/unit/compress/test/ifreturn.js
	target/work/resources/uglifyjs/test/unit/compress/test/var.js