Changeset 936 for trunk/grails-app/conf

Timestamp:

Oct 11, 2010, 10:23:13 PM (13 years ago)

Author:

t.w.abma@…

Message:

• Nimble removed, AAAA-plugin installed (based on Spring Security), login panel needs fix still, please login using gscf/login

Location:

trunk/grails-app/conf

Files:

• BootStrap.groovy (modified) (3 diffs)
• BootStrapStudies.groovy (modified) (1 diff)
• BuildConfig.groovy (modified) (1 diff)
• Config.groovy (modified) (1 diff)
• NimbleBootStrap.groovy (deleted)
• NimbleConfig.groovy (deleted)
• NimbleSecurityFilters.groovy (deleted)
• NimbleUrlMappings.groovy (deleted)

trunk/grails-app/conf/BootStrap.groovy

@@ -6 +6 @@
 import org.codehaus.groovy.grails.commons.GrailsApplication
 import grails.util.GrailsUtil
+import org.nmcdsp.plugins.aaaa.SecUser
 
-// Imports for Nimble
-import grails.plugins.nimble.InstanceGenerator
-import grails.plugins.nimble.core.LevelPermission
-import grails.plugins.nimble.core.Role
-import grails.plugins.nimble.core.Group
-import grails.plugins.nimble.core.AdminsService
-import grails.plugins.nimble.core.UserService
 
 /**
@@ -26 +20 @@
  */
 class BootStrap {
-
-        // Injections for Nimble
-        def grailsApplication
-        def nimbleService
-        def userService
-        def adminsService
+        def springSecurityService
 
         def init = {servletContext ->
@@ -37 +26 @@
                 System.setProperty('user.timezone', 'CET')
 
-                // If there are no users yet in the database
-                println "Executing Nimble bootstrap..."
-
-            // The following must be executed
-            nimbleService.init()
-
-            // Add users
-                def user
-
-                if (dbnp.user.User.count() == 0) {
-                        println "Adding example user..."
-
-                        // Create example User account
-                        user = InstanceGenerator.user()
-                        user.username = "user"
-                        user.pass = 'useR123!'
-                        user.passConfirm = 'useR123!'
-                        user.enabled = true
-
-                        def userProfile = InstanceGenerator.profile()
-                        userProfile.fullName = "Test User"
-                        userProfile.owner = user
-                        user.profile = userProfile
-
-                        def savedUser = userService.createUser(user)
-                        if (savedUser.hasErrors()) {
-                          savedUser.errors.each {
-                                log.error(it)
-                          }
-                          throw new RuntimeException("Error creating example user")
-                        }
-
-                        println "Adding example admin user..."
-
-                        // Create example Administrative account
-                        def admins = Role.findByName(AdminsService.ADMIN_ROLE)
-                        def admin = InstanceGenerator.user()
-                        admin.username = "admin"
-                        admin.pass = "admiN123!"
-                        admin.passConfirm = "admiN123!"
-                        admin.enabled = true
-
-                        def adminProfile = InstanceGenerator.profile()
-                        adminProfile.fullName = "Administrator"
-                        adminProfile.owner = admin
-                        admin.profile = adminProfile
-
-                        def savedAdmin = userService.createUser(admin)
-                        if (savedAdmin.hasErrors()) {
-                          savedAdmin.errors.each {
-                                log.error(it)
-                          }
-                          throw new RuntimeException("Error creating administrator")
-                        }
-
-                        adminsService.add(admin)
-                }
-                else {
-                        user = dbnp.user.User.findByUsername("user")
-                }
-
-                println "Done with Nimble bootstrap"
+                def user = SecUser.findByUsername('user') ?: new SecUser(
+                        username: 'user',
+                        password: springSecurityService.encodePassword('useR123!'),
+                        enabled: true).save(failOnError: true)
+                
+                println "Done with SpringSecurity bootstrap, created [user]."
 
                 // If there are no templates yet in the database

trunk/grails-app/conf/BootStrapStudies.groovy

@@ -19 +19 @@
          */
 
-        public static void addExampleStudies(dbnp.user.User owner) {
+        public static void addExampleStudies(org.nmcdsp.plugins.aaaa.SecUser owner) {
 
                 // Look up the used ontologies which should be in the database by now

trunk/grails-app/conf/BuildConfig.groovy

@@ -18 +18 @@
  */
 //grails.plugin.repos.discovery.intient = "http://intient.com/downloads/grails/"
-return true;
+grails.project.dependency.resolution = {
+    // inherit Grails' default dependencies
+    inherits("global") {
+        // uncomment to disable ehcache
+        // excludes 'ehcache'
+    }
+    log "warn" // log level of Ivy resolver, either 'error', 'warn', 'info', 'debug' or 'verbose'
+    repositories {
+        grailsPlugins()
+        grailsHome()
+//        mavenRepo "http://nmcdsp.org:8080/nexus-webapp-1.7.2/content/repositories/releases/"
+        mavenRepo "http://nexus.nmcdsp.org/content/repositories/releases"
+        grailsCentral()
+
+        // uncomment the below to enable remote dependency resolution
+        // from public Maven repositories
+        //mavenLocal()
+        //mavenCentral()
+        //mavenRepo "http://snapshots.repository.codehaus.org"
+        //mavenRepo "http://repository.codehaus.org"
+        //mavenRepo "http://download.java.net/maven/2/"
+        //mavenRepo "http://repository.jboss.com/maven2/"
+    }
+    dependencies {
+        // specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes eg.
+
+        // runtime 'mysql:mysql-connector-java:5.1.5'
+    }
+}
+
+//grails.plugin.location.'aaaa' = '/home/tjeerd/NetBeansProjects/nmcdsp/aaaa'

trunk/grails-app/conf/Config.groovy

@@ -156 +156 @@
 grails.views.javascript.library="jquery"
 
+// Needed for the Spring Security Core plugin:
+grails.plugins.springsecurity.userLookup.userDomainClassName = 'org.nmcdsp.plugins.aaaa.SecUser'
+grails.plugins.springsecurity.userLookup.authorityJoinClassName = 'org.nmcdsp.plugins.aaaa.SecUserSecRole'
+grails.plugins.springsecurity.authority.className = 'org.nmcdsp.plugins.aaaa.SecRole'
+
 // The OAuth consumer key and secret variables are currently replaced by Jeroen's Continuous Integration script.
 // These keys were requested by me (Tjeerd) from myExperiment.