Merge branch 'tuakiri-develop'

* tuakiri-develop: (48 commits)
  Grails2.5: upgrade complete, bump version to 2.9.5
  Grails2.5: upgrade highcharts for jQuery 1.11.1 compatibility
  Grails2.5: update web.xml once more also for plugins/administrative
  IDPService: avoid GORM executeUpdate in delete()
  Grails2.5: remove remaining scripts related to aaf-patched-groovy
  Grails2.5: WORKAROUND: def grailsApplication for email templates
  Branding: replace (new) Support link with REANNZ mailto
  Branding: remove all remaining references to Zenbox
  Grails2.5: fix error handling for adminstration plugin
  Grails2.5: render 403 and 404 via ErrorController
  Doc: remove instructions for building aaf-patched-groovy
  Submodules: remove aaf-patched-groovy - no longer needed
  Grails/Base: drop invalid nullable constraint on boolean Contact.active
  Grails2.5: update web.xml once more
  Grails2.5/Test/Metadata: avoid doubled-up SSOServices
  Grails: make build-test-data plugin a test dep only
  Grails2.5: explicitly enable console plugin
  Grails2.5: update core grails plugins
  Grails: upgrade to 2.5.6 - BREAKING CHANGE
  Grails2.4: update web.xml (as per upgrade instructions)
  Grails2.4: use maven as dependency resolver
  Grails2.4/Base/Test: fix tests: set endpoint index where needed
  Grails2.4: update twitter-bootstrap
  Grails2.4: use HTTPS repos - because we now have Java8
  Grails2.4/Hibernate: drop connection.provider_class
  Grails2.4: remove grailsResourceLoader from applicationContext.xml
  Grails2.4/Test/Base: pass correct HTTP method to controller
  Grails2.4/DataSource: update EhCacheRegionFactory class name
  Grails2.4: force shiro upgrade from 1.1.3 (pulled by fed-grails) to 1.2.1
  Grails2.4: update plugins to 2.4.x-compatible
  Grails2.4: update core plugins (Tomcat,mail,Hibernate)
  Grails: upgrade to 2.4.5 - BREAKING CHANGE
  Grails2.3: update cache plugin from 1.0.0 to 1.1.7 - deprecation warnings
  Grails2.3/BuildConfig: update jquery + db-mig plugins
  Grails2.3/Test: switch to new spock interface
  Grails/2.3: remove spock plugin - now included in Grails
  Grails/2.3: update build-test-data plugin to 2.2.3
  Grails2.3/Config: add new settings (commented out)
  Grails2.3: merge spring updates
  Grails/2.3: fix tomcat+hibernate plugin versions: use versions bundled with Grails 2.3.11
  Grails: upgrade to 2.3.11 - BREAKING CHANGE
  Grails2.3: remove dep on groovy-all:2.0.8+aaf.groovy7664
  Grails: upgrade to 2.2.5 - so far so good.
  Plugis/export: add missing spring/resources.groovy
  Grails: use https repo URLs where possible
  Grails: update Grails repo URL
  Grails: update MySQL connector (dependency+lib)
  Submodules/aaf-patched-groovy: switch to REANNZ repo

README.md

@@ -21,28 +21,6 @@ The Federation Registry project provides an extensible, open web application tha
 - In-depth reporting to gain insight to the workings of the entire federation
 - Federation integrated, automatically provisioned user accounts with fine grained access control
 
-## Local Dependencies
-As of FR 2.7.0 (March 2017) there is an extra step required to build the AAF
-patched version of Groovy for dependency resolution purposes.
-
-To build AAF Groovy:
-
-1. Be on Java 7
-1. Be in the root directory of the federationregistry project checked out from
-Github
-1. `git submodule init`
-1. `git submodule update`
-1. cd aaf-patched-groovy
-1. ./gradlew clean dist
-
-To build FR WAR file:
-
-1. Return to ../app/federationregisty and use `grails war` as normal.
-
-To develop FR code:
-
-1. Return to ../app/plugin/X and use `grails Y` as normal.
-
 ## License Notice
 This product includes software developed at Highcharts - http://www.highcharts.com 
 

app/federationregistry/application.properties

@@ -1,5 +1,6 @@
 #Grails Metadata file
-#Thu Sep 12 09:22:30 EST 2013
-app.grails.version=2.2.4
+#Wed May 13 16:19:06 NZST 2020
+app.grails.version=2.5.6
 app.name=federationregistry
-app.version=2.9.0-tuakiri5
+app.servlet.version=3.0
+app.version=2.9.5-tuakiri1

app/federationregistry/grails-app/conf/ApplicationResources.groovy

@@ -59,7 +59,7 @@ modules = {
   'highcharts' {
     defaultBundle 'app'
 
-    resource url:'js/highcharts-2.2.0.js'
+    resource url:'js/highcharts-2.2.5.js'
   }
   'bootstrap-datepicker' {
     // Source: http://www.eyecon.ro/bootstrap-datepicker/

app/federationregistry/grails-app/conf/BuildConfig.groovy

@@ -24,26 +24,23 @@ grails.project.dependency.resolution = {
   repositories {
     inherits true
 
-    flatDir name:"aaf-patched-groovy", dirs:"../../aaf-patched-groovy/target/libs"
-
     grailsCentral()
     grailsPlugins()
     grailsHome()
 
     mavenLocal()
-    mavenCentral()
+    // mavenCentral()
+    mavenRepo "https://repo1.maven.org/maven2"
 
-    mavenRepo "http://repo.grails.org/grails/repo/"
-    mavenRepo "http://download.java.net/maven/2/"
-    mavenRepo "http://repository.jboss.com/maven2/"
+    mavenRepo "https://repo.grails.org/grails/plugins-releases/"
+    mavenRepo "https://download.java.net/maven/2/"
+    mavenRepo "https://repository.jboss.org/maven2/"
   }
 
   dependencies {
-    compile "org.codehaus:groovy-all:2.0.8+aaf.groovy7664"
     compile "commons-collections:commons-collections:3.2.2"
 
-    test 'mysql:mysql-connector-java:5.1.18'
-    test "org.spockframework:spock-grails-support:0.7-groovy-2.0"
+    test 'mysql:mysql-connector-java:5.1.49'
   }
 
   plugins {
@@ -55,34 +52,33 @@ grails.project.dependency.resolution = {
     provided: Dependencies needed at development time, but not during WAR deployment
     */
 
-    build ":tomcat:$grailsVersion"
+    build ":tomcat:7.0.55.2"
 
-    compile ':cache:1.0.0'
-    compile ":mail:1.0"
-    compile ":build-test-data:2.0.3"
-    compile ":hibernate:$grailsVersion"
+    compile ':cache:1.1.8'
+    compile ":mail:1.0.7"
+    compile ":hibernate4:4.3.10"
 
-    runtime ":resources:1.1.6"
-    runtime ":zipped-resources:1.0"
-    runtime ":cached-resources:1.0"
+    runtime ":resources:1.2.14"
+    runtime ":zipped-resources:1.0.1"
+    runtime ":cached-resources:1.1"
     runtime ":yui-minify-resources:0.1.4"
-    runtime ":database-migration:1.1"
-    runtime ":jquery:1.7.2"
+    runtime ":database-migration:1.4.0"
+    runtime ":jquery:1.11.1"
     runtime ":modernizr:2.5.3"
-    runtime (":twitter-bootstrap:2.1.1") { excludes "svn" }
+    runtime (":twitter-bootstrap:2.3.2.3") { excludes "svn" }
     runtime 'org.grails.plugins:constraintkeys:0.1'
-    runtime ":console:1.2"
-    runtime ":cache-headers:1.1.5"
-    runtime ":audit-logging:0.5.4"
+    runtime ":console:1.5.9"
+    runtime ":cache-headers:1.1.7"
+    runtime ":audit-logging:1.0.7"
 
-    test(":spock:0.7") {
-      exclude "spock-grails-support"
-    }
+    test ":build-test-data:2.4.0"
 
     provided ":greenmail:1.3.4"
   }
 }
 
+grails.project.dependency.resolver = "maven"
+
 codenarc.reports = {
     HTMLReport('html') {
         outputFile = 'target/test-reports/codenarc.html'

app/federationregistry/grails-app/conf/Config.groovy

@@ -18,6 +18,9 @@ auditLog {
   }
 }
 
+// Enable console plugin
+grails.plugin.console.enabled = true
+
 grails.converters.xml.pretty.print = true
 
 grails.mime.file.extensions = true
@@ -55,3 +58,27 @@ public String getFromEnvironment(final String name) {
 
   return System.getenv(name);
 }
+
+// Uncomment and edit the following lines to start using Grails encoding & escaping improvements
+
+/* remove this line 
+// GSP settings
+grails {
+    views {
+        gsp {
+            encoding = 'UTF-8'
+            htmlcodec = 'xml' // use xml escaping instead of HTML4 escaping
+            codecs {
+                expression = 'html' // escapes values inside null
+                scriptlet = 'none' // escapes output from scriptlets in GSPs
+                taglib = 'none' // escapes output from taglibs
+                staticparts = 'none' // escapes output from static template parts
+            }
+        }
+        // escapes all not-encoded output at final stage of outputting
+        filteringCodecForContentType {
+            //'text/html' = 'html'
+        }
+    }
+}
+remove this line */

app/federationregistry/grails-app/conf/DataSource.groovy

@@ -2,7 +2,8 @@
 hibernate {
     cache.use_second_level_cache = true
     cache.use_query_cache = true
-    cache.region.factory_class = 'net.sf.ehcache.hibernate.EhCacheRegionFactory'
+    // cache.region.factory_class = 'net.sf.ehcache.hibernate.EhCacheRegionFactory' // Hibernate 3
+    cache.region.factory_class = 'org.hibernate.cache.ehcache.EhCacheRegionFactory' // Hibernate 4
 }
 
 // environment specific settings
@@ -30,4 +31,4 @@ environments {
 			dbCreate = "update"
 		}
 	}
-}
+}

app/federationregistry/grails-app/conf/UrlMappings.groovy

@@ -13,8 +13,8 @@ class UrlMappings {
       controller = "initialBootstrap"
     }
 
-    "403"(view:'/403')
-    "404"(view:'/404')
+    "403"(controller:'error', action:'notPermitted')
+    "404"(controller:'error', action:'notFound')
     "500"(view:'/500')
 
     // Development only.

app/federationregistry/grails-app/conf/hibernate/hibernate.cfg.xml

@@ -4,7 +4,6 @@
           "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
 <hibernate-configuration>
     <session-factory>
-		<property name="connection.provider_class">org.hibernate.connection.C3P0ConnectionProvider</property>
 		<property name="hibernate.c3p0.min_size">5</property>
 		<property name="hibernate.c3p0.max_size">20</property>
 		<property name="hibernate.c3p0.timeout">1800</property>
@@ -13,4 +12,4 @@
 		<property name="hibernate.c3p0.preferredTestQuery">select 1;</property>
 		<property name="hibernate.c3p0.testConnectionOnCheckout">true</property>
 	</session-factory>
-</hibernate-configuration>
+</hibernate-configuration>

app/federationregistry/grails-app/controllers/aaf/fr/app/ErrorController.groovy

@@ -0,0 +1,13 @@
+package aaf.fr.app
+
+class ErrorController {
+
+  def notFound() {
+    render view: "/404"
+  }
+
+  def notPermitted() {
+    render view: "/403"
+  }
+
+}

app/federationregistry/scripts/_Events.groovy

@@ -17,7 +17,3 @@ eventCompileStart = {
 eventAllTestsStart = {
    classLoader.addURL(new File("$basedir/test/common".toString()).toURL())
 }
-
-eventCreateWarStart = { name, stagingDir ->
-  ant.delete(dir:"${stagingDir}/WEB-INF/lib/", includes: "groovy-all-2.0.8.jar", verbose: true)
-}

app/federationregistry/src/templates/war/web.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.5"
+<web-app version="3.0"
          metadata-complete="true"
          xmlns="http://java.sun.com/xml/ns/javaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
 
     <display-name>/@grails.project.key@</display-name>
 
@@ -17,11 +17,6 @@
         <param-value>@grails.project.key@</param-value>
     </context-param>
 
-    <filter>
-        <filter-name>sitemesh</filter-name>
-        <filter-class>org.codehaus.groovy.grails.web.sitemesh.GrailsPageFilter</filter-class>
-    </filter>
-
     <filter>
         <filter-name>charEncodingFilter</filter-name>
         <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
@@ -40,13 +35,6 @@
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
-    <filter-mapping>
-        <filter-name>sitemesh</filter-name>
-        <url-pattern>/*</url-pattern>
-        <dispatcher>REQUEST</dispatcher>
-        <dispatcher>ERROR</dispatcher>
-    </filter-mapping>
-
     <listener>
         <listener-class>org.codehaus.groovy.grails.web.context.GrailsContextLoaderListener</listener-class>
     </listener>
@@ -55,7 +43,12 @@
     <servlet>
         <servlet-name>grails</servlet-name>
         <servlet-class>org.codehaus.groovy.grails.web.servlet.GrailsDispatcherServlet</servlet-class>
+        <init-param>
+            <param-name>dispatchOptionsRequest</param-name>
+            <param-value>true</param-value>
+        </init-param>
         <load-on-startup>1</load-on-startup>
+        <async-supported>true</async-supported>
     </servlet>
 
     <!-- The Groovy Server Pages servlet -->
@@ -79,23 +72,4 @@
         <welcome-file>index.gsp</welcome-file>
     </welcome-file-list>
 
-    <jsp-config>
-        <taglib>
-            <taglib-uri>http://java.sun.com/jsp/jstl/core</taglib-uri>
-            <taglib-location>/WEB-INF/tld/c.tld</taglib-location>
-        </taglib>
-        <taglib>
-            <taglib-uri>http://java.sun.com/jsp/jstl/fmt</taglib-uri>
-            <taglib-location>/WEB-INF/tld/fmt.tld</taglib-location>
-        </taglib>
-        <taglib>
-            <taglib-uri>http://www.springframework.org/tags</taglib-uri>
-            <taglib-location>/WEB-INF/tld/spring.tld</taglib-location>
-        </taglib>
-        <taglib>
-            <taglib-uri>http://grails.codehaus.org/tags</taglib-uri>
-            <taglib-location>/WEB-INF/tld/grails.tld</taglib-location>
-        </taglib>
-    </jsp-config>
-
 </web-app>

app/federationregistry/web-app/WEB-INF/applicationContext.xml

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="grailsApplication" class="org.codehaus.groovy.grails.commons.GrailsApplicationFactoryBean">
 		<description>Grails application factory bean</description>
 		<property name="grailsDescriptor" value="/WEB-INF/grails.xml" />
-		<property name="grailsResourceLoader" ref="grailsResourceLoader" />
 	</bean>
 
 	<bean id="pluginManager" class="org.codehaus.groovy.grails.plugins.GrailsPluginManagerFactoryBean">
@@ -23,11 +21,11 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
 		<property name="pluginManager" ref="pluginManager" />
 	</bean>
 
-	<bean id="grailsResourceLoader" class="org.codehaus.groovy.grails.commons.GrailsResourceLoaderFactoryBean" />
-
 	<bean id="characterEncodingFilter" class="org.springframework.web.filter.CharacterEncodingFilter">
 		<property name="encoding">
 			<value>utf-8</value>
 		</property>
 	</bean>
-</beans>
+
+	<bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean" />
+</beans>