Skip to content

Commit

Permalink
Merge pull request #81 from AtlasOfLivingAustralia/release/7.1.1
Browse files Browse the repository at this point in the history 
Version 7.1.1
  • Loading branch information
@nickdos
nickdos authored Aug 23, 2024
2 parents d69bcc5 + 6a473fb commit 1b53258
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 96 deletions.
66 changes: 12 additions & 54 deletions build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
version "7.1.0"
version "7.1.1"
group "au.org.ala"
}

Expand Down Expand Up @@ -59,20 +59,19 @@ if (inplace) {
plugins {
// When not inplace used, the dependencies below are managed by biocache-hubs plugin
implementation project(':biocache-hubs')
implementation project(':downloads-plugin')
//// implementation project(':ala-charts-plugin')
//// implementation project(':images-client-plugin')
// implementation project(':downloads-plugin')
// implementation project(':ala-charts-plugin')
// implementation project(':images-client-plugin')
// implementation project(':ala-bootstrap3')
// implementation project(':ala-ws-plugin')

// implementation "au.org.ala.plugins.grails:downloads-plugin:3.0", {
// exclude group: 'org.grails.plugins', module: 'cache'
// exclude group: 'org.ehcache', module: 'ehcache'
// exclude group: 'org.grails.plugins', module: 'cache-ehcache'
// }
implementation "org.grails.plugins:ala-bootstrap3:4.1.0", {
exclude group: 'au.org.ala', module: 'ala-cas-client'
}
// implementation "org.grails.plugins:ala-bootstrap3:4.1.0", {
// exclude group: 'au.org.ala', module: 'ala-cas-client'
// }
}
}
}
Expand Down Expand Up @@ -132,42 +131,16 @@ dependencies {
implementation 'xml-apis:xml-apis:1.4.01'

// ALA Plugins
// implementation "org.grails.plugins:ala-auth:3.2.3"
implementation "org.grails.plugins:ala-bootstrap3:4.5.0", {
exclude group: 'au.org.ala', module: 'ala-cas-client'
}
implementation "au.org.ala.plugins.grails:downloads-plugin:5.0.0"

//implementation "org.grails.plugins:ala-admin-plugin:2.2", noCache
if (!inplace) {
implementation "au.org.ala.plugins.grails:biocache-hubs:7.1.0", noCache
implementation "au.org.ala.plugins.grails:downloads-plugin:5.0.0", noCache
implementation "org.grails.plugins:ala-bootstrap3:4.5.0", {
exclude group: 'au.org.ala', module: 'ala-cas-client'
}
implementation "au.org.ala.plugins.grails:biocache-hubs:7.1.1", noCache
}
}

//webdriverBinaries {
// chromedriver "$chromeDriverVersion"
// geckodriver "$geckoDriverVersion"
//}


//tasks.getByName("integrationTest") {
// group JavaBasePlugin.VERIFICATION_GROUP
//
// //outputs.upToDateWhen { false } // Always run tests
//
// systemProperty "geb.build.reportsDir", reporting.file("geb/$name")
//
// systemProperty "geb.env", System.properties['driver']?:"firefox" // firefox by default
// // pass test server by -DbaseUrl
// systemProperty "geb.build.baseUrl", System.properties['baseUrl'] ?: "http://devt.ala.org.au:8081/ala-hub/"
// //Store username and password into the default config file
// systemProperty "configFile",System.properties['configFile']?: "/data/ala-hub/test/default.properties"
// //or pass with -Dusername, -Dpassword
// systemProperty "username", System.properties['username']
// systemProperty "password", System.properties['password']
//}


bootRun {
ignoreExitValue true
jvmArgs(
Expand All @@ -180,32 +153,17 @@ bootRun {
systemProperty springProfilesActive, System.getProperty(springProfilesActive)
}


tasks.withType(GroovyCompile) {
configure(groovyOptions) {
forkOptions.jvmArgs = ['-Xmx1024m']
}
}

//webdriverBinaries {
// chromedriver '2.45.0'
// geckodriver '0.24.0'
//}
//
//tasks.withType(Test) {
// systemProperty "geb.env", System.getProperty('geb.env')
// systemProperty "geb.build.reportsDir", reporting.file("geb/integrationTest")
// systemProperty "webdriver.chrome.driver", System.getProperty('webdriver.chrome.driver')
// systemProperty "webdriver.gecko.driver", System.getProperty('webdriver.gecko.driver')
//}


assets {
minifyJs = true
minifyCss = true
}


publishing {
repositories {
maven {
Expand Down
63 changes: 35 additions & 28 deletions grails-app/views/error.gsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,46 @@
<html>
<head>
<title><g:if env="development">Grails Runtime Exception</g:if><g:else>Error</g:else></title>
<meta name="layout" content="ala"/>
<meta name="layout" content="${grailsApplication.config.getProperty('skin.layout')}"/>
<g:if env="development"><asset:stylesheet src="errors.css" type="text/css"/></g:if>
<style>
ul.errors H1 {
font-size: 18px;
}
</style>
</head>
<body>
<h1>
Application error
</h1>
<g:if env="development">
<ul class="errors">
<g:if test="${Throwable.isInstance(exception)}">
<li><g:renderException exception="${exception}" /></li>
</g:if>
<g:elseif test="${flash.message}">
<li>${alatag.stripApiKey(message: flash.message)}</li>
</g:elseif>
<g:else>
<li>An error has occurred</li>
<li>Exception: ${exception}</li>
<li>Message: ${message}</li>
<li>Path: ${path}</li>
</g:else>
</ul>
</g:if>
<g:else>
<g:if test="${flash.message}">
<div class="${grailsApplication.config.getProperty('skin.fluidLayout')?'container-fluid':'container'}" id="main-content">
<h1>
Application error
</h1>
<hr />
<g:if env="development">
<ul class="errors">
<li>${alatag.stripApiKey(message: flash.message)}</li>
<g:if test="${Throwable.isInstance(exception)}">
<li><g:renderException exception="${exception}" /></li>
</g:if>
<g:elseif test="${flash.message}">
<li>${alatag.stripApiKey(message: flash.message)}</li>
</g:elseif>
<g:else>
<li>An error has occurred</li>
<li>Exception: ${exception}</li>
<li>Message: ${message}</li>
<li>Path: ${path}</li>
</g:else>
</ul>
</g:if>
</g:else>
<ul class="errors">
<li>If this problem persists, please send an email to <a href="mailto:${grailsApplication.config.supportEmail ?: '[email protected]'}?subject=Reporting error on page: ${request.serverName}${request.forwardURI}">${grailsApplication.config.supportEmail ?: '[email protected]'}</a> and include the URL to this page.</li>
</ul>

<g:else>
<g:if test="${flash.message}">
<ul class="errors">
<li>${alatag.stripApiKey(message: flash.message)}</li>
</ul>
</g:if>
</g:else>
<ul class="errors">
<li>If this problem persists, please send an email to <a href="mailto:${grailsApplication.config.supportEmail ?: '[email protected]'}?subject=Reporting error on page: ${request.serverName}${request.forwardURI}">${grailsApplication.config.supportEmail ?: '[email protected]'}</a> and include the URL to this page.</li>
</ul>
</div>
</body>
</html>
14 changes: 9 additions & 5 deletions grails-app/views/notFound.gsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,18 @@
<html>
<head>
<title>Page Not Found</title>
<meta name="layout" content="main">
<meta name="layout" content="${grailsApplication.config.getProperty('skin.layout')}">
<g:if env="development"><asset:stylesheet src="errors.css"/></g:if>
</head>
<body>
<ul class="errors">
<li>Error: Page Not Found (404)</li>
<li>Path: ${request.forwardURI}</li>
</ul>
<div class="${grailsApplication.config.getProperty('skin.fluidLayout')?'container-fluid':'container'}" id="main-content">
<h1>Page Not Found</h1>
<hr />
<ul class="errors">
<li><b>Error:</b> Page Not Found (404)</li>
<li><b>Path:</b> ${request.forwardURI}</li>
</ul>
</div>
<!-- Test test.heading g:message - <g:message code="test.heading" default="not set"/><br>
Test test.heading alatag:message - <alatag:message code="test.heading" default="not set"/><br>
Test test.app.only g:message - <g:message code="test.app.only" default="not set"/><br>
Expand Down
18 changes: 9 additions & 9 deletions settings.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@ pluginManagement {

rootProject.name='ala-hub'

// Inplace plugin config
// In-place plugin config
// Set to true it needed only for development
boolean inplace = false

if (inplace) {
include ':biocache-hubs'
project(':biocache-hubs').projectDir = new File(settingsDir, '../biocache-hubs')
include ':downloads-plugin'
project(':downloads-plugin').projectDir = new File(settingsDir,'../downloads-plugin')
//// include ':ala-charts-plugin'
//// project(':ala-charts-plugin').projectDir = new File(settingsDir,'../ala-charts-plugin')
//// include ':images-client-plugin'
//// project(':images-client-plugin').projectDir = new File(settingsDir,'../images-client-plugin')
// include ':downloads-plugin'
// project(':downloads-plugin').projectDir = new File(settingsDir,'../downloads-plugin')
// include ':ala-charts-plugin'
// project(':ala-charts-plugin').projectDir = new File(settingsDir,'../ala-charts-plugin')
// include ':images-client-plugin'
// project(':images-client-plugin').projectDir = new File(settingsDir,'../images-client-plugin')
// include ':ala-bootstrap3'
// project(':ala-bootstrap3').projectDir = new File(settingsDir, '../ala-bootstrap3')
//// include ':ala-auth'
//// project(':ala-auth').projectDir = new File(settingsDir,'../ala-auth-plugin')
// include ':ala-auth'
// project(':ala-auth').projectDir = new File(settingsDir,'../ala-auth-plugin')
// include ':ala-ws-plugin'
// project(':ala-ws-plugin').projectDir = new File(settingsDir, '../ala-ws-plugin')
}
Expand Down

0 comments on commit 1b53258

Please sign in to comment.