Permalink
Browse files

Merge pull request #1 from burtbeckwith/master

cleanup from Burt
  • Loading branch information...
2 parents ed1db35 + 9f8496c commit e3b4d8429303139c69005245c52b8d6b89a08d47 @smartiniOnGitHub committed Jan 14, 2013
Showing with 398 additions and 3,533 deletions.
  1. +5 −9 .classpath
  2. +1 −3 .gitignore
  3. +5 −39 AkkaGrailsPlugin.groovy
  4. +0 −3 application.properties
  5. +0 −4 docs/.gitignore
  6. +0 −4 eclipse/.gitignore
  7. +4 −18 grails-app/conf/BuildConfig.groovy
  8. +4 −23 grails-app/conf/Config.groovy
  9. +9 −42 grails-app/conf/DataSource.groovy
  10. +0 −32 grails-app/conf/UrlMappings.groovy
  11. +0 −4 grails-app/conf/hibernate/.gitignore
  12. +0 −4 grails-app/conf/spring/.gitignore
  13. +0 −11 grails-app/views/error.gsp
  14. +0 −8 scripts/_Install.groovy
  15. +0 −5 scripts/_Uninstall.groovy
  16. +0 −10 scripts/_Upgrade.groovy
  17. +0 −4 src/docs/.gitignore
  18. +0 −4 src/docs/css/.gitignore
  19. +0 −4 src/docs/guide/.gitignore
  20. +0 −4 src/docs/ref/.gitignore
  21. +0 −4 src/groovy/.gitignore
  22. +6 −7 {test/integration → src/groovy}/grails_akka/actor/BaseActor.groovy
  23. +9 −10 {test/integration → src/groovy}/grails_akka/actor/GreetingActor.groovy
  24. +14 −18 {test/unit → src/groovy}/grails_akka/command/ActorCommand.groovy
  25. +2 −2 {test/unit → src/groovy}/grails_akka/command/Command.groovy
  26. +8 −10 {test/unit → src/groovy}/grails_akka/command/GenericCommand.groovy
  27. +1 −1 {test/integration → src/groovy}/grails_akka/command/GenericCommandArguments.groovy
  28. +1 −6 {test/integration → src/groovy}/grails_akka/message/BaseMessage.groovy
  29. +6 −7 {test/integration → src/groovy}/grails_akka/message/GenericMessage.groovy
  30. +4 −4 {test/integration → src/groovy}/grails_akka/message/Greeting.groovy
  31. +10 −11 {test/integration → src/groovy}/grails_akka/message/ImmutableMessage.groovy
  32. +1 −8 {test/integration → src/groovy}/grails_akka/message/Shutdown.groovy
  33. +1 −8 {test/unit → src/groovy}/grails_akka/message/Stop.groovy
  34. +8 −11 {test/integration → src/groovy}/grails_akka/message/Wait.groovy
  35. +0 −4 src/java/.gitignore
  36. +0 −4 test/integration/.gitignore
  37. +44 −54 test/integration/grails_akka/LocalAkkaIntegrationTests.groovy
  38. +23 −52 test/integration/grails_akka/RemoteAkkaIntegrationTests.groovy
  39. +0 −62 test/integration/grails_akka/command/ActorCommand.groovy
  40. +0 −25 test/integration/grails_akka/command/Command.groovy
  41. +0 −43 test/integration/grails_akka/command/GenericCommand.groovy
  42. +0 −33 test/integration/grails_akka/message/Stop.groovy
  43. +0 −4 test/unit/.gitignore
  44. +45 −64 test/unit/grails_akka/LocalAkkaUnitTests.groovy
  45. +0 −37 test/unit/grails_akka/actor/BaseActor.groovy
  46. +0 −88 test/unit/grails_akka/actor/GreetingActor.groovy
  47. +0 −25 test/unit/grails_akka/command/GenericCommandArguments.groovy
  48. +0 −33 test/unit/grails_akka/message/BaseMessage.groovy
  49. +0 −39 test/unit/grails_akka/message/GenericMessage.groovy
  50. +0 −35 test/unit/grails_akka/message/Greeting.groovy
  51. +0 −45 test/unit/grails_akka/message/ImmutableMessage.groovy
  52. +0 −33 test/unit/grails_akka/message/Shutdown.groovy
  53. +0 −43 test/unit/grails_akka/message/Wait.groovy
  54. +0 −4 test/webapp/.gitignore
  55. +2 −16 test/webapp/grails-akka-test/grails-app/conf/BootStrap.groovy
  56. +3 −11 test/webapp/grails-akka-test/grails-app/conf/BuildConfig.groovy
  57. +2 −2 test/webapp/grails-akka-test/grails-app/conf/Config.groovy
  58. +6 −7 test/webapp/grails-akka-test/src/groovy/grails_akka/actor/BaseActor.groovy
  59. +9 −10 test/webapp/grails-akka-test/src/groovy/grails_akka/actor/GreetingActor.groovy
  60. +14 −18 test/webapp/grails-akka-test/src/groovy/grails_akka/command/ActorCommand.groovy
  61. +2 −2 test/webapp/grails-akka-test/src/groovy/grails_akka/command/Command.groovy
  62. +8 −10 test/webapp/grails-akka-test/src/groovy/grails_akka/command/GenericCommand.groovy
  63. +1 −1 test/webapp/grails-akka-test/src/groovy/grails_akka/command/GenericCommandArguments.groovy
  64. +1 −6 test/webapp/grails-akka-test/src/groovy/grails_akka/message/BaseMessage.groovy
  65. +6 −7 test/webapp/grails-akka-test/src/groovy/grails_akka/message/GenericMessage.groovy
  66. +4 −5 test/webapp/grails-akka-test/src/groovy/grails_akka/message/Greeting.groovy
  67. +10 −11 test/webapp/grails-akka-test/src/groovy/grails_akka/message/ImmutableMessage.groovy
  68. +1 −8 test/webapp/grails-akka-test/src/groovy/grails_akka/message/Shutdown.groovy
  69. +1 −8 test/webapp/grails-akka-test/src/groovy/grails_akka/message/Stop.groovy
  70. +8 −11 test/webapp/grails-akka-test/src/groovy/grails_akka/message/Wait.groovy
  71. +40 −64 test/webapp/grails-akka-test/test/integration/grails_akka/LocalAkkaIntegrationTests.groovy
  72. +23 −52 test/webapp/grails-akka-test/test/integration/grails_akka/RemoteAkkaIntegrationTests.groovy
  73. +46 −64 test/webapp/grails-akka-test/test/unit/grails_akka/LocalAkkaUnitTests.groovy
  74. +0 −33 web-app/WEB-INF/applicationContext.xml
  75. +0 −14 web-app/WEB-INF/sitemesh.xml
  76. +0 −572 web-app/WEB-INF/tld/c.tld
  77. +0 −671 web-app/WEB-INF/tld/fmt.tld
  78. +0 −550 web-app/WEB-INF/tld/grails.tld
  79. +0 −311 web-app/WEB-INF/tld/spring.tld
View
@@ -1,22 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/java"/>
<classpathentry kind="src" path="src/groovy"/>
+ <classpathentry kind="src" path="src/docs"/>
<classpathentry kind="src" path="grails-app/conf"/>
- <classpathentry kind="src" path="grails-app/controllers"/>
- <classpathentry kind="src" path="grails-app/domain"/>
- <classpathentry kind="src" path="grails-app/services"/>
- <classpathentry kind="src" path="grails-app/taglib"/>
- <classpathentry kind="src" path="grails-app/utils"/>
<classpathentry kind="src" path="test/integration"/>
<classpathentry kind="src" path="test/unit"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="src" path=".link_to_grails_plugins/release-2.0.4/src/groovy">
+ <classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
+ <classpathentry kind="src" path=".link_to_grails_plugins/release-2.2.0/src/groovy">
<attributes>
<attribute name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path=".link_to_grails_plugins/release-2.0.4/src/java">
+ <classpathentry kind="src" path=".link_to_grails_plugins/release-2.2.0/src/java">
<attributes>
<attribute name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
</attributes>
@@ -27,5 +23,5 @@
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.grails.ide.eclipse.core.CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target-eclipse/classes"/>
+ <classpathentry kind="output" path="target/eclipseclasses"/>
</classpath>
View
@@ -17,7 +17,6 @@
/*.db
/*.zip
/plugin.xml
-/*.log
/*DB.*
/*.ser
/.link_to_grails_plugins/
@@ -28,5 +27,4 @@
/target/
/target-eclipse/
/temp/
-/web-app/plugins
-/web-app/WEB-INF/classes
+/web-app
View
@@ -15,55 +15,21 @@
* limitations under the License.
*/
-// import org.apache.log4j.Logger
-
class AkkaGrailsPlugin {
def version = "0.6.1"
def grailsVersion = "2.0 > *"
- def dependsOn = [:]
- def pluginExcludes = [
- "grails-app/views/error.gsp"
- // , "src/docs/"
- ]
-
def title = "Akka Integration"
def author = "Sandro Martini"
def authorEmail = "sandro.martini@gmail.com"
- def description = '''\
-Akka actors integration from Groovy and Java, in a Servlet 3.x environment.
-'''
+ def description = 'Akka actors integration from Groovy and Java, in a Servlet 3.x environment'
def documentation = "http://smartiniongithub.github.com/grails-akka/"
- // Extra (optional) plugin metadata
def license = "APACHE"
- // def organization = [ name: "MartinS", url: "https://github.com/smartiniOnGitHub/grails-akka/" ]
- // def developers = [ [ name: "other developer", email: "other.developer@my-company.com" ]]
def issueManagement = [ system: "github", url: "https://github.com/smartiniOnGitHub/grails-akka/issues/" ]
def scm = [ url: "https://github.com/smartiniOnGitHub/grails-akka/" ]
-
- // private Logger log = Logger.getLogger('grails.plugin.akka.AkkaGrailsPlugin')
-
-
- def doWithWebDescriptor = { xml ->
- }
-
- def doWithSpring = {
- }
-
- def doWithDynamicMethods = { ctx ->
- }
-
- def doWithApplicationContext = { applicationContext ->
- }
-
- def onChange = { event ->
- }
-
- def onConfigChange = { event ->
- }
-
- def onShutdown = { event ->
- }
-
+ def pluginExcludes = [
+ 'src/docs/**',
+ 'src/groovy/**'
+ ]
}
View
@@ -1,4 +1 @@
-#Grails Metadata file
-#Fri Jan 04 20:09:53 CET 2013
app.grails.version=2.0.4
-app.name=akka
View
@@ -1,4 +0,0 @@
-.DS_Store
-.hg
-.settings
-.svn
View
@@ -1,4 +0,0 @@
-.DS_Store
-.hg
-.settings
-.svn
@@ -15,37 +15,24 @@
* limitations under the License.
*/
-// grails.servlet.version = "3.0" // verify if makes sense to enable this even here ...
-grails.project.class.dir = "target/classes"
+grails.project.work.dir = "target"
// grails.project.docs.output.dir = 'docs/manual'
-grails.project.test.class.dir = "target/test-classes"
-grails.project.test.reports.dir = "target/test-reports"
grails.project.source.level = 1.6
grails.project.target.level = 1.6
-// grails.project.war.file = "target/${appName}-${appVersion}.war"
-// grails.project.work.dir = 'target'
-
def akkaVersion = '2.0.5'
grails.project.dependency.resolution = {
- // inherit Grails' default dependencies
- inherits("global") {
- // excludes 'ehcache' // uncomment to disable ehcache
- }
- log "warn" // log level of Ivy resolver, either 'error', 'warn', 'info', 'debug' or 'verbose'
+ inherits 'global'
+ log 'warn'
repositories {
grailsCentral()
- //mavenCentral()
- //mavenLocal()
mavenRepo "http://repo.typesafe.com/typesafe/releases/"
}
dependencies {
- // specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes eg.
-
def excludes = {
// disable excludes, or compile errors will happen ...
// // exclude, to avoid version conflict
@@ -60,9 +47,8 @@ grails.project.dependency.resolution = {
}
plugins {
- build(":release:2.2.0") {
+ build(":release:2.2.0", ":rest-client-builder:1.0.3") {
export = false
}
}
-
}
@@ -15,32 +15,13 @@
* limitations under the License.
*/
-// configuration for plugin testing - will not be included in the plugin zip
-
log4j = {
- // Example of changing the log pattern for the default console
- // appender:
- //
- //appenders {
- // console name:'stdout', layout:pattern(conversionPattern: '%c{2} %m%n')
- //}
-
- error 'org.codehaus.groovy.grails.web.servlet', // controllers
- 'org.codehaus.groovy.grails.web.pages', // GSP
- 'org.codehaus.groovy.grails.web.sitemesh', // layouts
- 'org.codehaus.groovy.grails.web.mapping.filter', // URL mapping
- 'org.codehaus.groovy.grails.web.mapping', // URL mapping
- 'org.codehaus.groovy.grails.commons', // core / classloading
- 'org.codehaus.groovy.grails.plugins', // plugins
- 'org.codehaus.groovy.grails.orm.hibernate', // hibernate integration
- 'org.springframework',
- 'org.hibernate',
- 'net.sf.ehcache.hibernate'
-
- warn 'org.mortbay.log'
+ error 'org.codehaus.groovy.grails',
+ 'org.springframework',
+ 'org.hibernate',
+ 'net.sf.ehcache.hibernate'
}
-
grails.doc.authors = 'Sandro Martini'
grails.doc.license = 'Apache License 2.0'
grails.doc.title = 'Akka Integration'
@@ -16,49 +16,16 @@
*/
dataSource {
- pooled = true
- driverClassName = "org.h2.Driver"
- username = "sa"
- password = ""
+ pooled = true
+ driverClassName = 'org.h2.Driver'
+ username = 'sa'
+ password = ''
+ dbCreate = 'update'
+ url = 'jdbc:h2:mem:testDb'
}
hibernate {
- cache.use_second_level_cache = true
- cache.use_query_cache = false
- cache.region.factory_class = 'net.sf.ehcache.hibernate.EhCacheRegionFactory'
-}
-
-// environment specific settings
-environments
-{
- development {
- dataSource {
- dbCreate = "create-drop" // one of 'create', 'create-drop', 'update', 'validate', ''
- url = "jdbc:h2:mem:devDb;MVCC=TRUE;LOCK_TIMEOUT=10000"
- }
- }
- test {
- dataSource {
- dbCreate = "update"
- url = "jdbc:h2:mem:testDb;MVCC=TRUE;LOCK_TIMEOUT=10000"
- }
- }
- production {
- dataSource {
- dbCreate = "update"
- url = "jdbc:h2:prodDb;MVCC=TRUE;LOCK_TIMEOUT=10000"
- pooled = true
- properties {
- maxActive = -1
- minEvictableIdleTimeMillis=1800000
- timeBetweenEvictionRunsMillis=1800000
- numTestsPerEvictionRun=3
- testOnBorrow=true
- testWhileIdle=true
- testOnReturn=true
- validationQuery="SELECT 1"
- }
- }
- }
-
+ cache.use_second_level_cache = false
+ cache.use_query_cache = false
+ cache.provider_class = 'org.hibernate.cache.EhCacheProvider'
}
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-class UrlMappings
-{
-
- static mappings = {
- "/$controller/$action?/$id?"{
- constraints {
- // apply constraints here
- }
- }
-
- "/"(view:"/index")
- "500"(view:'/error')
- }
-
-}
@@ -1,4 +0,0 @@
-.DS_Store
-.hg
-.settings
-.svn
@@ -1,4 +0,0 @@
-.DS_Store
-.hg
-.settings
-.svn
View
@@ -1,11 +0,0 @@
-<!doctype html>
-<html>
- <head>
- <title>Grails Runtime Exception</title>
- <meta name="layout" content="main">
- <link rel="stylesheet" href="${resource(dir: 'css', file: 'errors.css')}" type="text/css">
- </head>
- <body>
- <g:renderException exception="${exception}" />
- </body>
-</html>
View
@@ -1,8 +0,0 @@
-//
-// This script is executed by Grails after plugin was installed to project.
-// This script is a Gant script so you can use all special variables provided
-// by Gant (such as 'baseDir' which points on project base dir). You can
-// use 'ant' to access a global instance of AntBuilder
-//
-Ant.property(environment: "env")
-// Ant.mkdir(dir: "${basedir}/src/scala")
@@ -1,5 +0,0 @@
-//
-// This script is executed by Grails when the plugin is uninstalled from project.
-// Use this script if you intend to do any additional clean-up on uninstall, but
-// beware of messing up SVN directories!
-//
View
@@ -1,10 +0,0 @@
-//
-// This script is executed by Grails during application upgrade ('grails upgrade'
-// command). This script is a Gant script so you can use all special variables
-// provided by Gant (such as 'baseDir' which points on project base dir). You can
-// use 'ant' to access a global instance of AntBuilder
-//
-// For example you can create directory under project tree:
-//
-// ant.mkdir(dir:"${basedir}/grails-app/jobs")
-//
View
@@ -1,4 +0,0 @@
-.DS_Store
-.hg
-.settings
-.svn
View
@@ -1,4 +0,0 @@
-.DS_Store
-.hg
-.settings
-.svn
@@ -1,4 +0,0 @@
-.DS_Store
-.hg
-.settings
-.svn
View
@@ -1,4 +0,0 @@
-.DS_Store
-.hg
-.settings
-.svn
View
@@ -1,4 +0,0 @@
-.DS_Store
-.hg
-.settings
-.svn
Oops, something went wrong.

0 comments on commit e3b4d84

Please sign in to comment.