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 = '
'
+ 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 0000000..d195af0
Binary files /dev/null and b/griffon-app/conf/keys/productionKeystore differ
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 @@