AtlasOfLivingAustralia/maintenance#63

-Java 8, Grails 2.5.6 and Asset pipeline ready

ImagesClientPluginGrailsPlugin.groovy

@@ -1,6 +1,6 @@
 class ImagesClientPluginGrailsPlugin {
     // the plugin version
-    def version = "0.7.9"
+    def version = "0.7.10-SHAPSHOT"
     // the version or versions of Grails the plugin is designed for
     def grailsVersion = "2.2 > *"
     // resources that are excluded from plugin packaging

application.properties

@@ -1,4 +1,4 @@
 #Grails Metadata file
 #Mon Jul 07 15:14:16 EST 2014
-app.grails.version=2.3.11
+app.grails.version=2.5.6
 app.name=images-client-plugin

grails-app/assets/javascripts/ala/images-client-gallery.js

@@ -0,0 +1,7 @@
+/*
+ * Replaces image-gallery resource in old resources plugin
+//= encoding UTF-8
+//= require ala/images-client
+//= require img-gallery/js/img-gallery.js
+//= require img-gallery/lib/slider-pro/js/jquery.sliderPro.custom.js
+ */

grails-app/assets/javascripts/ala/images-client.js

@@ -0,0 +1,11 @@
+/*
+ * Replaces image-viewer resource in old resources plugin
+//= encoding UTF-8
+ * // require jquery
+ * // require bootstrap
+//= require_tree leaflet
+//= require_tree leaflet.draw
+//= require_tree leaflet.loading
+//= require ala-image-viewer.js
+//= require bootbox.min.js
+ */

grails-app/assets/stylesheets/ala/images-client-gallery.css

@@ -0,0 +1,7 @@
+/*
+ * Replaces image-gallery resource in old resources plugin
+ *= encoding UTF-8
+ *= require ala/images-client
+ *= require img-gallery/img-gallery.css
+ *= require img-gallery/lib/slider-pro/css/slider-pro.css
+ */

grails-app/assets/stylesheets/ala/images-client.css

@@ -0,0 +1,10 @@
+/*
+ * Replaces image-viewer resource in old resources plugin
+ *= encoding UTF-8
+ * // require jquery
+ * // require bootstrap
+ *= require_tree leaflet
+ *= require_tree leaflet.draw
+ *= require_tree leaflet.loading
+ *= require font-awesome
+ */

grails-app/conf/BuildConfig.groovy

@@ -35,6 +35,7 @@ grails.project.dependency.resolution = {
     dependencies {
         // specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes eg.
         // runtime 'mysql:mysql-connector-java:5.1.27'
+        compile "commons-httpclient:commons-httpclient:3.1"
         compile('org.codehaus.groovy.modules.http-builder:http-builder:0.7') {
             excludes "commons-logging", "xml-apis", "groovy"
         }
@@ -45,7 +46,7 @@ grails.project.dependency.resolution = {
               ":rest-client-builder:1.0.3") {
             export = false
         }
-        compile ':ala-auth:1.3.4'
+        compile ':ala-auth:2.1.3'
         runtime ':font-awesome-resources:4.3.0.1'
     }
 }

grails-app/conf/ImagesClientResources.groovy

@@ -35,12 +35,14 @@ modules = {
         resource url: [plugin: "images-client-plugin", dir: 'js/audiojs', file: 'audio.min.js']
     }
 
+    // assets pipeline replaces this module with ala/images-client.js and ala/images-client.css
     'image-viewer' {
         dependsOn 'jquery', 'bootstrap', 'leaflet', 'leaflet-fullscreen', 'leaflet-measure', 'leaflet-draw', 'leaflet-loading', 'font-awesome'
         resource url: [plugin: "images-client-plugin", dir: 'js', file: 'ala-image-viewer.js']
         resource url: [plugin: "images-client-plugin", dir: 'js', file: 'bootbox.min.js']
     }
 
+    // assets pipeline replaces this module with ala/images-client-gallery.js and ala/images-client-gallery.css
     'img-gallery' {
         dependsOn 'image-viewer'
         resource url: [plugin: "images-client-plugin", dir: 'js/img-gallery/lib/slider-pro/css', file: 'slider-pro.css']

grails-app/controllers/images/client/plugin/ImageClientController.groovy

@@ -1,7 +1,6 @@
 package images.client.plugin
 
-import au.org.ala.web.AlaSecured
-import au.org.ala.web.CASRoles
+import au.org.ala.web.AuthService
 import grails.converters.JSON
 import grails.converters.XML
 import org.apache.commons.httpclient.HttpStatus
@@ -14,7 +13,7 @@ class ImageClientController {
     def imagesWebService
     def speciesListWebService
     def bieWebService
-    def authService
+    AuthService authService
 
     def createSubImage(){
         [userId: authService.getUserId()]

grails-app/taglib/images/client/plugin/ImageClientTagLib.groovy

@@ -1,12 +1,14 @@
 package images.client.plugin
 
+import au.org.ala.web.AuthService
+
 /**
  * Image Client Tag Lib to be used in the gsp related to image client plugin feature
  *
  */
 class ImageClientTagLib {
 
-    def authService
+    AuthService authService
     static namespace = 'imageClient'
 
     /**