Updates for Griffon 0.9.5

.gitignore

@@ -0,0 +1 @@
+target

LwjglGriffonAddon.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2010 the original author or authors.
+ * Copyright 2009-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import griffon.lwjgl.opengl.LWJGLCanvas
  * @author Andres Almiray
  */
 class LwjglGriffonAddon {
-    def factories = [
+    Map factories = [
         lwjglCanvas: new ComponentFactory(LWJGLCanvas)
     ]
 }

LwjglGriffonPlugin.groovy

@@ -18,19 +18,52 @@
  * @author Andres Almiray
  */
 class LwjglGriffonPlugin {
-    def version = 0.4
-    def dependsOn = [:]
-    def toolkits = ['swing']
-    def griffonVersion = '0.9.2 > *'
-    def license = 'Apache Software License 2.0'
-
-    def author = 'Andres Almiray'
-    def authorEmail = 'aalmiray@users.sourceforge.net'
-    def title = 'LWJGL support'
-    def description = '''
-LWJGL support
-'''
+    // the plugin version
+    String version = '0.5'
+    // the version or versions of Griffon the plugin is designed for
+    String griffonVersion = '0.9.5 > *'
+    // the other plugins this plugin depends on
+    Map dependsOn = [swing: '0.9.5']
+    // resources that are included in plugin packaging
+    List pluginIncludes = []
+    // the plugin license
+    String license = 'Apache Software License 2.0'
+    // Toolkit compatibility. No value means compatible with all
+    // Valid values are: swing, javafx, swt, pivot, gtk
+    List toolkits = ['swing']
+    // Platform compatibility. No value means compatible with all
+    // Valid values are:
+    // linux, linux64, windows, windows64, macosx, macosx64, solaris
+    List platforms = []
+    // URL where documentation can be found
+    String documentation = ''
+    // URL where source can be found
+    String source = 'https://github.com/griffon/griffon-lwjgl-plugin'
+
+    List authors = [
+        [
+            name: 'Andres Almiray',
+            email: 'aalmiray@yahoo.com'
+        ]
+    ]
+    String title = "Render 3D content with JWJGL"
+    String description = '''
+Provides integration with [LWJGL][1], the Lightweight Java Game Library.
+
+Usage
+-----
+
+The following nodes will become available on a View script upon installing this plugin
 
-    // URL to the plugin's documentation
-    def documentation = 'http://griffon.codehaus.org/Lwjgl+Plugin'
+| *Node*      | *Type*                             |
+| ----------- | ---------------------------------- |
+| lwjglCanvas | `griffon.lwjgl.opengl.LWJGLCanvas` |
+
+### Example
+
+A trivial example can be found at [https://github.com/aalmiray/griffon_sample_apps/tree/master/3d/lwjgl][2].
+
+[1]: http://lwjgl.org/
+[2]: https://github.com/aalmiray/griffon_sample_apps/tree/master/3d/lwjgl
+'''
 }

application.properties

@@ -1,2 +1,5 @@
-app.griffon.version=0.9.2-beta-3
+#Griffon Metadata file
+#Mon Mar 12 14:23:23 CET 2012
+app.griffon.version=0.9.5-rc2
 app.name=lwjgl
+plugins.swing=0.9.5

griffon-app/conf/BuildConfig.groovy

@@ -2,13 +2,12 @@ griffon.project.dependency.resolution = {
     inherits("global")
     log "warn"
     repositories {
-        griffonPlugins()
         griffonHome()
-        griffonCentral()
-
         mavenCentral()
         mavenRepo 'http://repository.sonatype.org/content/groups/public'
-        flatDir name: 'lwjglPluginLib', dirs: 'lib'
+        griffonHome()
+        String basePath = pluginDirPath? "${pluginDirPath}/" : ''
+        flatDir name: "lwjglLibDir", dirs: ["${basePath}lib"]
     }
     dependencies {
         compile 'net.alchim31.3rd.org.7-zip:lzma:4.65',
@@ -28,5 +27,16 @@ griffon {
     }
 }
 
-griffon.jars.destDir='target/addon'
-griffon.plugin.pack.additional.sources = ['src/gdsl']
+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'
+}

scripts/_Events.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2010 the original author or authors.
+ * Copyright 2009-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@
 
 import griffon.util.Environment
 
-includeTargets << griffonScript("_GriffonSettings")
-
 lwjglJnlpResources = []
 def lwjgl_version = '2.6'
 for(os in ['linux', 'macosx', 'windows', 'solaris']) {
@@ -49,19 +47,6 @@ eventCopyLibsEnd = { jardir ->
     }
 }
 
-def eventClosure2 = binding.variables.containsKey('eventSetClasspath') ? eventSetClasspath : {cl->}
-eventSetClasspath = { cl ->
-    eventClosure2(cl)
-    if(compilingPlugin('lwjgl')) return
-    griffonSettings.dependencyManager.flatDirResolver name: 'griffon-lwjgl-plugin', dirs: "${lwjglPluginDir}/addon"
-    griffonSettings.dependencyManager.addPluginDependency('lwjgl', [
-        conf: 'compile',
-        name: 'griffon-lwjgl-addon',
-        group: 'org.codehaus.griffon.plugins',
-        version: lwjglPluginVersion
-    ])
-}
-
 doWithPlatform = { platformOs ->
     def origPlatformOs = platformOs
     if(platformOs.endsWith('64')) platformOs -= '64'

src/main/griffon/lwjgl/opengl/LWJGLCanvas.groovy

@@ -71,7 +71,7 @@ class LWJGLCanvas extends AWTGLCanvas {
         if(autoSwapBuffers) swapBuffers()
     }
 
-    protected void update(Graphics g) {
+    public void update(Graphics g) {
         super.update(g)
         if(onUpdate) {
             onUpdate.delegate = this