Merge pull request #48 from Arkilog/master

Upgrade to grails 3 #44 Merged with work to do.

.travis.yml

@@ -0,0 +1,8 @@
+language: groovy
+jdk:
+- oraclejdk7
+- oraclejdk8
+before_script:
+- rm -rf build
+- chmod +x ./travis-build.sh
+script: ./travis-build.sh

README.md

@@ -0,0 +1,4 @@
+Grails 3 Shiro plugin
+=====================
+
+[![Build Status](https://api.travis-ci.org/Arkilog/grails-shiro.png)](http://travis-ci.org/Arkilog/grails-shiro)

shiro3/.gitignore

@@ -0,0 +1,3 @@
+build/
+.gradle/
+*~

shiro3/LICENSE

@@ -0,0 +1,14 @@
+Copyright 2009 Peter Ledbrook
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+

shiro3/build.gradle

@@ -12,11 +12,11 @@ buildscript {
 }
 
 plugins {
-    id "io.spring.dependency-management" version "0.4.0.RELEASE"
-    id "com.jfrog.bintray" version "1.1"
+    id "io.spring.dependency-management" version "0.5.2.RELEASE"
+    id "com.jfrog.bintray" version "1.2"
 }
 
-version "3.0-SNAPSHOT"
+version "0.1-SNAPSHOT"
 group "org.grails.plugins"
 
 apply plugin: 'maven-publish'
@@ -26,8 +26,8 @@ apply plugin: "spring-boot"
 apply plugin: "org.grails.grails-plugin"
 apply plugin: "org.grails.grails-gsp"
 // Used for publishing to central repository, remove if not needed
-apply from: 'https://raw.githubusercontent.com/grails/grails-profile-repository/master/profiles/plugin/templates/grailsCentralPublishing.gradle'
-apply from: 'https://raw.githubusercontent.com/grails/grails-profile-repository/master/profiles/plugin/templates/bintrayPublishing.gradle'
+apply from:'https://raw.githubusercontent.com/grails/grails-profile-repository/master/profiles/plugin/templates/grailsCentralPublishing.gradle'
+apply from:'https://raw.githubusercontent.com/grails/grails-profile-repository/master/profiles/plugin/templates/bintrayPublishing.gradle'
 
 ext {
     grailsVersion = project.grailsVersion
@@ -64,12 +64,70 @@ dependencies {
     testCompile "org.grails:grails-plugin-testing"
 
     console "org.grails:grails-console"
-
-    compile 'org.apache.shiro:shiro-core:1.2.3'
-    compile 'org.apache.shiro:shiro-web:1.2.3'
-    compile 'org.apache.shiro:shiro-spring:1.2.3'
-    compile 'org.apache.shiro:shiro-ehcache:1.2.3'
-    compile 'org.apache.shiro:shiro-quartz:1.2.3'
+    def shiroVersion = '1.2.3'
+    compile ("org.apache.shiro:shiro-core:$shiroVersion") {
+        exclude module:'ejb'
+        exclude module:'jsf-api'
+        exclude module:'servlet-api'
+        exclude module:'jsp-api'
+        exclude module:'jstl'
+        exclude module:'jms'
+        exclude module:'connector-api'
+        exclude module:'ehcache-core'
+        exclude module:'slf4j-api'
+        exclude module:'commons-logging'
+    }
+    compile ("org.apache.shiro:shiro-web:$shiroVersion") {
+        exclude module:'ejb'
+        exclude module:'jsf-api'
+        exclude module:'servlet-api'
+        exclude module:'jsp-api'
+        exclude module:'jstl'
+        exclude module:'jms'
+        exclude module:'connector-api'
+        exclude module:'ehcache-core'
+        exclude module:'slf4j-api'
+        exclude module:'commons-logging'
+    }
+    compile ("org.apache.shiro:shiro-spring:$shiroVersion") {
+        exclude module:'ejb'
+        exclude module:'jsf-api'
+        exclude module:'servlet-api'
+        exclude module:'jsp-api'
+        exclude module:'jstl'
+        exclude module:'jms'
+        exclude module:'connector-api'
+        exclude module:'ehcache-core'
+        exclude module:'slf4j-api'
+        exclude module:'commons-logging'
+    }
+    compile ("org.apache.shiro:shiro-ehcache:$shiroVersion") {
+        exclude module:'ejb'
+        exclude module:'jsf-api'
+        exclude module:'servlet-api'
+        exclude module:'jsp-api'
+        exclude module:'jstl'
+        exclude module:'jms'
+        exclude module:'connector-api'
+        exclude module:'ehcache-core'
+        exclude module:'slf4j-api'
+        exclude module:'commons-logging'
+    }
+    compile ("org.apache.shiro:shiro-quartz:$shiroVersion") {
+        exclude module:'ejb'
+        exclude module:'jsf-api'
+        exclude module:'servlet-api'
+        exclude module:'jsp-api'
+        exclude module:'jstl'
+        exclude module:'jms'
+        exclude module:'connector-api'
+        exclude module:'ehcache-core'
+        exclude module:'slf4j-api'
+        exclude module:'commons-logging'
+    }
+    // runtime "org.grails.plugins:hibernate:$grailsVersion", {
+    //     export = false
+    // }
 }
 
 task wrapper(type: Wrapper) {

shiro3/gradle.properties

@@ -1,2 +1,2 @@
-grailsVersion=3.0.1
+grailsVersion=3.0.3
 gradleWrapperVersion=2.3

shiro3/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed May 20 00:00:47 EST 2015
+#Wed Feb 04 17:05:29 CST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip

shiro3/grails-app/conf/application.yml

@@ -53,9 +53,6 @@ grails:
         defaultScope: singleton
     converters:
         encoding: UTF-8
-    hibernate:
-        cache:
-            queries: false
     views:
         default:
             codec: html
@@ -67,8 +64,14 @@ grails:
                 scriptlets: html
                 taglib: none
                 staticparts: none
-
 ---
+hibernate:
+    cache:
+        queries: false
+        use_second_level_cache: true
+        use_query_cache: false
+        region.factory_class: 'org.hibernate.cache.ehcache.EhCacheRegionFactory' 
+
 dataSource:
     pooled: true
     jmxExport: true

shiro3/grails-app/init/shiro3/Application.groovy → shiro3/grails-app/init/shiro/Application.groovy

@@ -1,10 +1,10 @@
-package shiro3
+package shiro
 
 import grails.boot.GrailsApp
 import grails.boot.config.GrailsAutoConfiguration
 
 class Application extends GrailsAutoConfiguration {
     static void main(String[] args) {
-        GrailsApp.run(Application)
+        GrailsApp.run(Application, args)
     }
 }