From bc51d179322875d95c4b0478dddbdff1e0cc4d1a Mon Sep 17 00:00:00 2001 From: Jonathan Bernard Date: Sun, 22 Sep 2013 15:22:44 -0500 Subject: [PATCH] Upgrading to Griffon 1.2.0 --- application.properties | 8 +- griffon-app/conf/BuildConfig.groovy | 191 ++++++++++++++++++ griffon-app/conf/Builder.groovy | 6 +- griffon-app/conf/Config.groovy | 103 ++-------- griffon-app/conf/keys/productionKeystore | Bin 0 -> 1242 bytes griffon-app/conf/webstart/applet.html | 6 +- griffon-app/conf/webstart/applet.jnlp | 18 +- griffon-app/conf/webstart/application.jnlp | 16 +- griffon-app/i18n/resources.properties | 0 griffon-app/lifecycle/Initialize.groovy | 2 - .../resources/griffon-icon-128x128.png | Bin 0 -> 13888 bytes griffon-app/resources/griffon-icon-16x16.png | Bin 0 -> 1030 bytes griffon-app/resources/griffon-icon-24x24.png | Bin 0 -> 1922 bytes .../resources/griffon-icon-256x256.png | Bin 0 -> 31616 bytes griffon-app/resources/griffon-icon-32x32.png | Bin 0 -> 2524 bytes griffon-app/resources/griffon-icon-48x48.png | Bin 0 -> 5172 bytes griffon-app/resources/griffon-icon-64x64.png | Bin 0 -> 5933 bytes griffon-app/resources/griffon.png | Bin 0 -> 15310 bytes .../timestamper/gui/NotesDialogView.groovy | 4 +- .../gui/PunchcardDialogView.groovy | 12 +- .../gui/TimeStamperMainView.groovy | 4 +- griffonw | 165 +++++++++++++++ griffonw.bat | 90 +++++++++ lib/timestamper-lib-1.1.jar | Bin 39474 -> 0 bytes lib/timestamper-lib-1.5.jar | Bin 0 -> 52290 bytes wrapper/griffon-wrapper.jar | Bin 0 -> 42478 bytes wrapper/griffon-wrapper.properties | 7 + 27 files changed, 504 insertions(+), 128 deletions(-) create mode 100644 griffon-app/conf/BuildConfig.groovy mode change 100755 => 100644 griffon-app/conf/Builder.groovy mode change 100755 => 100644 griffon-app/conf/Config.groovy create mode 100644 griffon-app/conf/keys/productionKeystore mode change 100755 => 100644 griffon-app/conf/webstart/applet.html mode change 100755 => 100644 griffon-app/conf/webstart/applet.jnlp mode change 100755 => 100644 griffon-app/conf/webstart/application.jnlp create mode 100644 griffon-app/i18n/resources.properties create mode 100644 griffon-app/resources/griffon-icon-128x128.png create mode 100644 griffon-app/resources/griffon-icon-16x16.png create mode 100644 griffon-app/resources/griffon-icon-24x24.png create mode 100644 griffon-app/resources/griffon-icon-256x256.png create mode 100644 griffon-app/resources/griffon-icon-32x32.png create mode 100644 griffon-app/resources/griffon-icon-48x48.png create mode 100644 griffon-app/resources/griffon-icon-64x64.png create mode 100644 griffon-app/resources/griffon.png create mode 100644 griffonw create mode 100644 griffonw.bat delete mode 100644 lib/timestamper-lib-1.1.jar create mode 100644 lib/timestamper-lib-1.5.jar create mode 100644 wrapper/griffon-wrapper.jar create mode 100644 wrapper/griffon-wrapper.properties diff --git a/application.properties b/application.properties index 1f36118..aaefc60 100755 --- a/application.properties +++ b/application.properties @@ -1,6 +1,10 @@ #Do not edit app.griffon.* properties, they may change automatically. DO NOT put application configuration in here, it is not the right place! -#Sun, 11 Apr 2010 16:00:38 +0200 +#Thu, 25 Apr 2013 06:40:33 -0500 #Thu Apr 01 22:28:40 CDT 2010 app.version=2.1 -app.griffon.version=0.3 +app.griffon.version=1.2.0 app.name=TimeStamper + +plugins.swing=1.2.0 +archetype.default=1.2.0 +app.toolkit=swing diff --git a/griffon-app/conf/BuildConfig.groovy b/griffon-app/conf/BuildConfig.groovy new file mode 100644 index 0000000..0921a82 --- /dev/null +++ b/griffon-app/conf/BuildConfig.groovy @@ -0,0 +1,191 @@ +// key signing information +environments { + development { + signingkey { + params { + // sigfile = 'GRIFFON' + // keystore = "${basedir}/griffon-app/conf/keys/devKeystore" + // alias = 'development' + storepass = 'BadStorePassword' + keypass = 'BadKeyPassword' + lazy = true // only sign when unsigned + } + } + } + test { + griffon { + jars { + sign = false + pack = false + } + } + } + production { + signingkey { + params { + // NOTE: for production keys it is more secure to rely on key prompting + // no value means we will prompt //storepass = 'BadStorePassword' + // no value means we will prompt //keypass = 'BadKeyPassword' + lazy = false // sign, regardless of existing signatures + } + } + + griffon { + jars { + sign = true + pack = true + destDir = "${basedir}/staging" + } + webstart { + codebase = 'CHANGE ME' + } + } + } +} + +griffon { + memory { + //max = '64m' + //min = '2m' + //minPermSize = '2m' + //maxPermSize = '64m' + } + jars { + sign = false + pack = false + destDir = "${basedir}/staging" + jarName = "${appName}.jar" + } + extensions { + jarUrls = [] + jnlpUrls = [] + /* + props { + someProperty = 'someValue' + } + resources { + linux { // windows, macosx, solaris + jars = [] + nativelibs = [] + props { + someProperty = 'someValue' + } + } + } + */ + } + webstart { + codebase = "${new File(griffon.jars.destDir).toURI().toASCIIString()}" + jnlp = 'application.jnlp' + } + applet { + jnlp = 'applet.jnlp' + html = 'applet.html' + } +} + +// required for custom environments +signingkey { + params { + def env = griffon.util.Environment.current.name + sigfile = 'GRIFFON-' + env + keystore = "${basedir}/griffon-app/conf/keys/${env}Keystore" + alias = env + // storepass = 'BadStorePassword' + // keypass = 'BadKeyPassword' + lazy = true // only sign when unsigned + } +} + +griffon { + doc { + logo = 'The Griffon Framework' + sponsorLogo = "
" + footer = "

Made with Griffon (@griffon.version@)" + } +} + +deploy { + application { + title = "${appName} ${appVersion}" + vendor = System.properties['user.name'] + homepage = "http://localhost/${appName}" + description { + complete = "${appName} ${appVersion}" + oneline = "${appName} ${appVersion}" + minimal = "${appName} ${appVersion}" + tooltip = "${appName} ${appVersion}" + } + icon { + 'default' { + name = 'griffon-icon-64x64.png' + width = '64' + height = '64' + } + splash { + name = 'griffon.png' + width = '391' + height = '123' + } + selected { + name = 'griffon-icon-64x64.png' + width = '64' + height = '64' + } + disabled { + name = 'griffon-icon-64x64.png' + width = '64' + height = '64' + } + rollover { + name = 'griffon-icon-64x64.png' + width = '64' + height = '64' + } + shortcut { + name = 'griffon-icon-64x64.png' + width = '64' + height = '64' + } + } + } +} + +griffon.project.dependency.resolution = { + // inherit Griffon' default dependencies + inherits("global") { + } + log "warn" // log level of Ivy resolver, either 'error', 'warn', 'info', 'debug' or 'verbose' + repositories { + griffonHome() + + // uncomment the below to enable remote dependency resolution + // from public Maven repositories + //mavenLocal() + //mavenCentral() + //mavenRepo "http://snapshots.repository.codehaus.org" + //mavenRepo "http://repository.codehaus.org" + //mavenRepo "http://download.java.net/maven/2/" + //mavenRepo "http://repository.jboss.com/maven2/" + } + dependencies { + // specify dependencies here under either 'build', 'compile', 'runtime' or 'test' scopes eg. + + // runtime 'mysql:mysql-connector-java:5.1.5' + } +} + +log4j = { + // Example of changing the log pattern for the default console + // appender: + appenders { + console name: 'stdout', layout: pattern(conversionPattern: '%d [%t] %-5p %c - %m%n') + } + + error 'org.codehaus.griffon', + 'org.springframework', + 'org.apache.karaf', + 'groovyx.net' + warn 'griffon' +} + diff --git a/griffon-app/conf/Builder.groovy b/griffon-app/conf/Builder.groovy old mode 100755 new mode 100644 index 55a7c1d..90271bb --- a/griffon-app/conf/Builder.groovy +++ b/griffon-app/conf/Builder.groovy @@ -1,9 +1,7 @@ + root { 'groovy.swing.SwingBuilder' { controller = ['Threading'] view = '*' } - 'griffon.app.ApplicationBuilder' { - view = '*' - } -} \ No newline at end of file +} diff --git a/griffon-app/conf/Config.groovy b/griffon-app/conf/Config.groovy old mode 100755 new mode 100644 index d0fdcae..a186a6d --- a/griffon-app/conf/Config.groovy +++ b/griffon-app/conf/Config.groovy @@ -1,94 +1,15 @@ -// log4j configuration -log4j { - appender.stdout = 'org.apache.log4j.ConsoleAppender' - appender.'stdout.layout'='org.apache.log4j.PatternLayout' - appender.'stdout.layout.ConversionPattern'='[%r] %c{2} %m%n' - appender.errors = 'org.apache.log4j.FileAppender' - appender.'errors.layout'='org.apache.log4j.PatternLayout' - appender.'errors.layout.ConversionPattern'='[%r] %c{2} %m%n' - appender.'errors.File'='stacktrace.log' - rootLogger='error,stdout' - logger { - griffon='error' - StackTrace='error,errors' - org { - codehaus.griffon.commons='info' // core / classloading - } +log4j = { + // Example of changing the log pattern for the default console + // appender: + appenders { + console name: 'stdout', layout: pattern(conversionPattern: '%d [%t] %-5p %c - %m%n') } - additivity.StackTrace=false + + error 'org.codehaus.griffon' + + info 'griffon.util', + 'griffon.core', + 'griffon.@application.toolkit@', + 'griffon.app' } -// key signing information -environments { - development { - signingkey { - params { - sigfile = 'GRIFFON' - keystore = "${basedir}/griffon-app/conf/keys/devKeystore" - alias = 'development' - storepass = 'BadStorePassword' - keypass = 'BadKeyPassword' - lazy = true // only sign when unsigned - } - } - - } - test { - griffon { - jars { - sign = false - pack = false - } - } - } - production { - signingkey { - params { - sigfile = 'GRIFFON' - keystore = 'keystore.jks' - alias = 'timestamper' - // NOTE: for production keys it is more secure to rely on key prompting - // no value means we will prompt //storepass = 'BadStorePassword' - // no value means we will prompt //keypass = 'BadKeyPassword' - lazy = false // sign, regardless of existing signatures - } - } - - griffon { - jars { - sign = true - pack = true - destDir = "${basedir}/staging" - } - webstart { - codebase = 'CHANGE ME' - } - } - } -} - -griffon { - memory { - //max = '64m' - //min = '2m' - //maxPermSize = '64m' - } - jars { - sign = false - pack = false - destDir = "${basedir}/staging" - jarName = "${appName}.jar" - } - extensions { - jarUrls = [] - jnlpUrls = [] - } - webstart { - codebase = "${new File(griffon.jars.destDir).toURI().toASCIIString()}" - jnlp = 'application.jnlp' - } - applet { - jnlp = 'applet.jnlp' - html = 'applet.html' - } -} diff --git a/griffon-app/conf/keys/productionKeystore b/griffon-app/conf/keys/productionKeystore new file mode 100644 index 0000000000000000000000000000000000000000..d195af0c2f80900ead19705eb9697bc4de2c7ff0 GIT binary patch literal 1242 zcmezO_TO6u1_mY|W&~rdf};GC(&UoN{5+tL{m&T1Tp-D#QN6&DhB-Hl+bc*7NB<<26|I{hTXu9D5YYPn z+_z~`ik8h(_L}y9-A3oPq%HJtlc-(ud*!bSuUv!*5=%Zgh8*EIDZ>AFBG;v3f8Dig z=AD~XsKPiWws%r`9oMEwqEm8A8=i*VwcgOm(6oe4^5@n$?fp!iiyi;n?h2CLxoY#% z^FiWQt!?!VTw0>{c3oT2*;`8^Qo8ImU%8t9{$T3ocL%=inZ2%HZcFNV>4cJ&@ac2p z)VSBw{yDlR-OozwU}@G%Q6ZUmeoI;Be4nxA(Vp24)@~GE`ar_W(0P@x!m4e%<>Ptv zoTgP;owq%lAj>K2bw=~?&*%&5Z|dfCEjJZ!>|p=#ecpEO!>eC{qlz^`&(y$@fq|L9 zpo!@Z5bs*R%*4pV#1i=O;uiyMHg>Hxk8>6*%&ZIsiG~8e*kcZ5;Sy$dFUm|y%g-|u zF%SZYa0_$0q?V=TJbnT7QnOH1+<+*9)uf>U$Sbb~X~^HNh3yi+R` zbafT{@=Fxb@{1G#;EBaRPMp`!*udP-(#Y7<)YvEr#5FW9G>3BO;e;l}9l&&|1M@f| zkR#93*vRm=KDbe~R7f-EzSkVRH&32_6WktT^WKHwu$+Cvwm`K^*H{Ooz~7O!y%E3m zAN{(^;M?ihp*hzZts7)b@;{{|Y|owkqJp{gm2KGy%vdulN^wlaX+vHPp8 z_aC!s+6SZ>)O6N7@6=G$P;{MK@IT5$=+9>TN7puNjR^O9Q($NlLkGJpfd!5)mY@K;Qq%S@l;p~+&tRa#B%&dZA?Wcm;{0~gqmR;N z{%_I=i#ft15_T&^OwI26E|!|LeHXP}yYntmO%|=ycDz!%@=Crt!?mJk2On)(eq=fT Dlu-J+ literal 0 HcmV?d00001 diff --git a/griffon-app/conf/webstart/applet.html b/griffon-app/conf/webstart/applet.html old mode 100755 new mode 100644 index f616be6..741952f --- a/griffon-app/conf/webstart/applet.html +++ b/griffon-app/conf/webstart/applet.html @@ -8,7 +8,7 @@