Skip to content

Commit

Permalink
Upgraded to griffon 0.9
Browse files Browse the repository at this point in the history
  • Loading branch information
aalmiray committed Jul 27, 2010
1 parent 6d5aa59 commit c663a95
Show file tree
Hide file tree
Showing 16 changed files with 437 additions and 383 deletions.
20 changes: 10 additions & 10 deletions application.properties
@@ -1,11 +1,11 @@
#utf-8 #Griffon Metadata file
#Fri Oct 09 11:16:19 PDT 2009 #Tue Jul 27 11:09:07 CEST 2010
plugins.swingx-builder=0.1 app.griffon.version=0.9
plugins.trident-builder=0.1
app.version=0.1
plugins.gfx-builder=0.2.1
plugins.jide-builder=0.2
plugins.css-builder=0.2
app.griffon.version=0.2-BETA
app.name=griffon-talk app.name=griffon-talk
plugins.transitions=0.1.2 app.version=0.2
plugins.css-builder=0.6
plugins.gfx-builder=0.4
plugins.jide-builder=0.4
plugins.swingx-builder=0.2
plugins.transitions=0.3
plugins.trident-builder=0.4
35 changes: 13 additions & 22 deletions griffon-app/conf/Application.groovy
@@ -1,26 +1,17 @@
application { application {
title = 'Ebay' title="Ebay"
startupGroups = ['init'] startupGroups=["init"]

autoShutdown=true
// Should Griffon exit when no Griffon created frames are showing?
autoShutdown = true

// If you want some non-standard application class, apply it here
//frameClass = 'javax.swing.JFrame'
} }
mvcGroups { mvcGroups {
// MVC Group for "Init" init {
'init' { model="InitModel"
model = 'InitModel' controller="InitController"
controller = 'InitController' view="InitView"
view = 'InitView' }
} deck {

model="DeckModel"
// MVC Group for "deck" controller="DeckController"
'deck' { view="DeckView"
model = 'DeckModel' }
controller = 'DeckController'
view = 'DeckView'
}

} }
127 changes: 127 additions & 0 deletions griffon-app/conf/BuildConfig.groovy
@@ -0,0 +1,127 @@
// 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
}
}
additivity.StackTrace=false
}

// 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 = 'CHANGE ME'
alias = 'CHAMGE ME'
// 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'
}
}
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 {
griffonPlugins()
griffonHome()
griffonCentral()

// 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', 'test' or 'provided' scopes eg.

// runtime 'mysql:mysql-connector-java:5.1.5'
}
}

griffon {
doc {
logo = '<a href="http://griffon.codehaus.org" target="_blank"><img alt="The Griffon Framework" src="../img/griffon.png" border="0"/></a>'
sponsorLogo = "<br/>"
footer = "<br/><br/>Made with Griffon (0.9)"
}
}
4 changes: 2 additions & 2 deletions griffon-app/conf/Builder.groovy
Expand Up @@ -12,12 +12,12 @@ root.'griffon.builder.trident.TridentBuilder'.view = '*'
jx { jx {
'groovy.swing.SwingXBuilder' { 'groovy.swing.SwingXBuilder' {
view = '*' view = '*'
controller = ['withWorker']
} }
} }


root.'griffon.builder.jide.JideBuilder'.view = '*' root.'griffon.builder.jide.JideBuilder'.view = '*'

root.'griffon.builder.gfx.GfxBuilder'.view = '*' root.'griffon.builder.gfx.GfxBuilder'.view = '*'

root.'griffon.builder.css.CSSBuilder'.view = '*' root.'griffon.builder.css.CSSBuilder'.view = '*'
root.'griffon.builder.css.CSSBuilder'.controller = ['CSS'] root.'griffon.builder.css.CSSBuilder'.controller = ['CSS']
root.'TransitionsGriffonAddon'.addon=true
75 changes: 0 additions & 75 deletions griffon-app/conf/Config.groovy
Expand Up @@ -17,78 +17,3 @@ log4j {
} }
additivity.StackTrace=false additivity.StackTrace=false
} }

// 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 = 'CHANGE ME'
alias = 'CHAMGE ME'
// 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'
}
}
8 changes: 4 additions & 4 deletions griffon-app/controllers/DeckController.groovy
@@ -1,9 +1,9 @@
class DeckController { class DeckController {
def close = { evt = null -> def close = { evt = null ->
app.appFrames.last().dispose() app.windowManager.windows.last().dispose()
destroyMVCGroup("deck") destroyMVCGroup("deck")
app.appFrames.pop() app.windowManager.windows.pop()
app.appFrames.first().visible = true app.windowManager.windows.first().visible = true
} }


def runScript = { script -> def runScript = { script ->
Expand All @@ -13,4 +13,4 @@ class DeckController {
} catch(x) {x.printStackTrace()} } catch(x) {x.printStackTrace()}
} }
} }
} }
12 changes: 6 additions & 6 deletions griffon-app/controllers/InitController.groovy
Expand Up @@ -7,12 +7,12 @@ class InitController {


def play = { evt = null -> def play = { evt = null ->
createMVCGroup("deck", "deck",[:]) createMVCGroup("deck", "deck",[:])
app.appFrames[0].visible = false app.windowManager.windows[0].visible = false
def graphicsEnvironment = GraphicsEnvironment.localGraphicsEnvironment def graphicsEnvironment = GraphicsEnvironment.localGraphicsEnvironment
def device = graphicsEnvironment.screenDevices.find{it.fullScreenSupported} def device = graphicsEnvironment.screenDevices.find{it.fullScreenSupported}
device?.setFullScreenWindow(app.appFrames[1]) device?.setFullScreenWindow(app.windowManager.windows[1])
CSSDecorator.decorate("style", app.appFrames[1]) CSSDecorator.decorate("style", app.windowManager.windows[1])
app.appFrames[1].visible = true app.windowManager.windows[1].visible = true
} }


def help = { evt = null -> def help = { evt = null ->
Expand All @@ -34,8 +34,8 @@ class InitController {
return return
} }
if(pack) dialog.pack() if(pack) dialog.pack()
int x = app.appFrames[0].x + (app.appFrames[0].width - dialog.width) / 2 int x = app.windowManager.windows[0].x + (app.windowManager.windows[0].width - dialog.width) / 2
int y = app.appFrames[0].y + (app.appFrames[0].height - dialog.height) / 2 int y = app.windowManager.windows[0].y + (app.windowManager.windows[0].height - dialog.height) / 2
dialog.setLocation(x, y) dialog.setLocation(x, y)
dialog.show() dialog.show()
} }
Expand Down
43 changes: 0 additions & 43 deletions griffon.iml

This file was deleted.

0 comments on commit c663a95

Please sign in to comment.