# HG changeset patch # User smith@nwoca.org # Date 1460390030 14400 # Node ID 91703efb1d2917f9b11eae5433be44ab97e6974a # Parent dddcb6d169272564da8ee1a044f1cb494f56ea5b update ssdt-forms and dockerize diff -r dddcb6d16927 -r 91703efb1d29 .hgignore --- a/.hgignore Mon Nov 12 11:30:44 2012 -0500 +++ b/.hgignore Mon Apr 11 11:53:50 2016 -0400 @@ -4,6 +4,7 @@ \.rej$ \.conflict\~$ .*~$ +classes/ glob:out/* glob:lib/* glob:build/* diff -r dddcb6d16927 -r 91703efb1d29 build.gradle --- a/build.gradle Mon Nov 12 11:30:44 2012 -0500 +++ b/build.gradle Mon Apr 11 11:53:50 2016 -0400 @@ -1,4 +1,18 @@ -apply from: "${gradle.ext.has('ssdtDevelkitLocation') ? gradle.ssdtDevelkitLocation : 'http://hg.ssdt-ohio.org/browse/public/develkit'}/init.gradle" +import java.time.Instant +import com.bmuschko.gradle.docker.tasks.image.DockerBuildImage +import com.bmuschko.gradle.docker.tasks.image.Dockerfile + +apply from: "${gradle.ext.has('ssdtDevelkitLocation') ? gradle.ssdtDevelkitLocation : 'http://hg.ssdt-ohio.org/browse/public/develkit'}/init20.gradle" + +buildscript { + repositories { + maven { url 'http://repos.ssdt.nwoca.org/artifactory/gradle-plugins' } + maven { url 'http://repos.ssdt.nwoca.org/artifactory/repo' } + } + dependencies { + classpath 'com.bmuschko:gradle-docker-plugin:2.6.5' + } +} description = "ssdt.forms application" @@ -7,7 +21,7 @@ apply plugin: "groovy" apply plugin: "jetty" apply plugin: "idea" - +apply plugin: 'com.bmuschko.docker-remote-api' sourceCompatibility = "1.5" targetCompatibility = "1.5" @@ -15,27 +29,6 @@ group = "org.ssdt_ohio" version = "1.0-SNAPSHOT" -/* -repositories { - mavenCentral() - - // All things JBoss/Hibernate - mavenRepo name: "JBoss", url: "http://repository.jboss.org/nexus/content/groups/public/" - - // For stable versions of the tapx libraries - mavenRepo name: "HLS", url: "http://howardlewisship.com/repository/" - - // For non-stable versions of the tapx libraries - mavenRepo name: "HLS Snapshots", url: "http://howardlewisship.com/snapshot-repository/" - - // For access to Apache Staging (Preview) packages - mavenRepo name: "Apache Staging", url: "https://repository.apache.org/content/groups/staging" -} -*/ - -// This simulates Maven's "provided" scope, until it is officially supported by Gradle -// See http://jira.codehaus.org/browse/GRADLE-784 - configurations { provided } @@ -52,10 +45,10 @@ dependencies { - groovy 'org.codehaus.groovy:groovy-all:2.0.1' - compile "org.apache.tapestry:tapestry-core:5.3.6" + compile 'org.codehaus.groovy:groovy-all:2.4.5' + compile "org.apache.tapestry:tapestry-core:5.3.8" compile(group: 'me.davesmith', name: 'tapestry-bootstrap', version: '2.1-SNAPSHOT') - compile group: 'org.got5', name: 'tapestry5-jquery', version: '3.2.0' + compile group: 'org.got5', name: 'tapestry5-jquery', version: '3.3.6' compile "org.apache.tapestry:tapestry-yuicompressor:5.3.6" // Uncomment this to add support for file uploads: @@ -84,3 +77,53 @@ webAppSourceDirectory = file("src/main/webapp") httpPort = 8086 } + + +docker { + if (System.env.DOCKER_HOST) { + url = "https:${System.env.DOCKER_HOST?.minus('tcp:')}" + } + if (System.env.DOCKER_CERT_PATH) { + certPath = new File("$System.env.DOCKER_CERT_PATH") + } +} + + +war { + archiveName 'ssdtforms.war' +} + +task createDockerfile(type: Dockerfile) { + group = "Docker" + destFile = project.file('build/docker/Dockerfile') + from 'docker.ssdt.io/ssdt-tomcat:3' + maintainer 'Dave Smith ' + label { + [ + 'io.ssdt.version' : version, + 'io.ssdt.id' : "${project.name}", + 'io.ssdt.type' : "webapp", + 'io.ssdt.app' : "ssdtforms", + 'io.ssdt.build.date' : Instant.now().toString(), + ] + } + copyFile("ssdtforms.war", '/usr/local/tomcat/webapps/ROOT.war') +} + + +task prepareDockerImage(type: Copy) { + group = "Docker" + dependsOn war + dependsOn createDockerfile + from war.getArchivePath() + into project.file('build/docker') +} + +task buildDockerImage(type: DockerBuildImage) { + group = "Docker" + dependsOn prepareDockerImage + inputDir = createDockerfile.destFile.parentFile + tag = "ssdtforms:latest" +} + + diff -r dddcb6d16927 -r 91703efb1d29 gradle/wrapper/gradle-wrapper.jar Binary file gradle/wrapper/gradle-wrapper.jar has changed diff -r dddcb6d16927 -r 91703efb1d29 gradle/wrapper/gradle-wrapper.properties --- a/gradle/wrapper/gradle-wrapper.properties Mon Nov 12 11:30:44 2012 -0500 +++ b/gradle/wrapper/gradle-wrapper.properties Mon Apr 11 11:53:50 2016 -0400 @@ -1,6 +1,6 @@ -#Fri Nov 09 14:45:30 EST 2012 +#Mon Apr 11 11:09:32 EDT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip diff -r dddcb6d16927 -r 91703efb1d29 gradlew --- a/gradlew Mon Nov 12 11:30:44 2012 -0500 +++ b/gradlew Mon Apr 11 11:53:50 2016 -0400 @@ -42,11 +42,6 @@ ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - # Attempt to set APP_HOME # Resolve links: $0 may be a link PRG="$0" @@ -61,9 +56,9 @@ fi done SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" +cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME="`pwd -P`" -cd "$SAVED" +cd "$SAVED" >/dev/null CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -114,6 +109,7 @@ if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` diff -r dddcb6d16927 -r 91703efb1d29 gradlew.bat --- a/gradlew.bat Mon Nov 12 11:30:44 2012 -0500 +++ b/gradlew.bat Mon Apr 11 11:53:50 2016 -0400 @@ -46,7 +46,7 @@ goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args if "%@eval[2+2]" == "4" goto 4NT_args diff -r dddcb6d16927 -r 91703efb1d29 src/main/resources/log4j.properties --- a/src/main/resources/log4j.properties Mon Nov 12 11:30:44 2012 -0500 +++ b/src/main/resources/log4j.properties Mon Apr 11 11:53:50 2016 -0400 @@ -1,5 +1,5 @@ # Default to info level output; this is very handy if you eventually use Hibernate as well. -log4j.rootCategory=info, A1 +log4j.rootCategory=error, A1 # A1 is set to be a ConsoleAppender. log4j.appender.A1=org.apache.log4j.ConsoleAppender @@ -10,14 +10,14 @@ # Service category names are the name of the defining module class # and then the service id. -log4j.category.org.ssdt_ohio.devel.forms.services.AppModule.TimingFilter=info +log4j.category.org.ssdt_ohio.devel.forms.services.AppModule.TimingFilter=error # Outputs a list of pages, components and mixins at startup. -log4j.category.org.apache.tapestry5.services.TapestryModule.ComponentClassResolver=info +log4j.category.org.apache.tapestry5.services.TapestryModule.ComponentClassResolver=error # Outputs startup statistics; elapsed time to setup and initialize the registry, a list of # available services, and a launch banner that includes the Tapestry version number. -log4j.category.org.apache.tapestry5.TapestryFilter=info +log4j.category.org.apache.tapestry5.TapestryFilter=error # Turning on debug mode for a page's or component's transformer logger @@ -41,4 +41,4 @@ # Turn on some verbose debugging about everything in the application. This is nice initially, # while getting everything set up. You'll probably want to remove this once you are # up and running, replacing it with more selective debugging output. -log4j.category.org.ssdt_ohio.devel.forms=debug +log4j.category.org.ssdt_ohio.devel.forms=error \ No newline at end of file diff -r dddcb6d16927 -r 91703efb1d29 src/main/resources/org/ssdt_ohio/devel/forms/pages/OneTwentyPayment.tml --- a/src/main/resources/org/ssdt_ohio/devel/forms/pages/OneTwentyPayment.tml Mon Nov 12 11:30:44 2012 -0500 +++ b/src/main/resources/org/ssdt_ohio/devel/forms/pages/OneTwentyPayment.tml Mon Apr 11 11:53:50 2016 -0400 @@ -1,19 +1,15 @@ + xmlns:t="http://tapestry.apache.org/schema/tapestry_5_3.xsd"> -

SSDT One Twenty Project Payment Form

-
+

SSDT One Twenty Project Payment Form

Instructions:

-

Complete the form below and use the browser to print it and submit to supervisor for approval.

Note: This is not a proper web application. The values will not be recorded.

-
@@ -33,7 +29,7 @@
- +
@@ -41,7 +37,7 @@
-