Browse files

updated package for test classes (bundled in the plugin, and copied e…

…ven in its test webapp) from grails_akka to grails_akka_test, so they are excluded from plugin-package (but not grails_akka, to add soon in the plugin)
  • Loading branch information...
1 parent e3b4d84 commit 2f13c23d8a9e02dd030252bae200eb7a89631dcd @smartiniOnGitHub committed Jan 19, 2013
Showing with 100 additions and 76 deletions.
  1. +2 −2 AkkaGrailsPlugin.groovy
  2. +3 −0 application.properties
  3. +14 −3 docs/TODO.md
  4. +4 −0 src/docs/guide/1.1 History.gdoc
  5. +1 −1 src/groovy/{grails_akka → grails_akka_test}/actor/BaseActor.groovy
  6. +5 −5 ...grails-akka-test/src/groovy/grails_akka → src/groovy/grails_akka_test}/actor/GreetingActor.groovy
  7. +1 −1 ...rails-akka-test/src/groovy/grails_akka → src/groovy/grails_akka_test}/command/ActorCommand.groovy
  8. +1 −1 ...app/grails-akka-test/src/groovy/grails_akka → src/groovy/grails_akka_test}/command/Command.groovy
  9. +1 −1 ...ils-akka-test/src/groovy/grails_akka → src/groovy/grails_akka_test}/command/GenericCommand.groovy
  10. +1 −1 ...test/src/groovy/grails_akka → src/groovy/grails_akka_test}/command/GenericCommandArguments.groovy
  11. +1 −1 src/groovy/{grails_akka → grails_akka_test}/message/BaseMessage.groovy
  12. +1 −1 src/groovy/{grails_akka → grails_akka_test}/message/GenericMessage.groovy
  13. +1 −1 src/groovy/{grails_akka → grails_akka_test}/message/Greeting.groovy
  14. +1 −1 src/groovy/{grails_akka → grails_akka_test}/message/ImmutableMessage.groovy
  15. +1 −1 src/groovy/{grails_akka → grails_akka_test}/message/Shutdown.groovy
  16. +1 −1 src/groovy/{grails_akka → grails_akka_test}/message/Stop.groovy
  17. +1 −1 src/groovy/{grails_akka → grails_akka_test}/message/Wait.groovy
  18. +6 −6 test/integration/grails_akka/LocalAkkaIntegrationTests.groovy
  19. +1 −1 test/integration/grails_akka/RemoteAkkaIntegrationTests.groovy
  20. +6 −6 test/unit/grails_akka/LocalAkkaUnitTests.groovy
  21. +1 −1 test/webapp/grails-akka-test/src/groovy/{grails_akka → grails_akka_test}/actor/BaseActor.groovy
  22. +5 −5 ...rails_akka → test/webapp/grails-akka-test/src/groovy/grails_akka_test}/actor/GreetingActor.groovy
  23. +1 −1 ...ails_akka → test/webapp/grails-akka-test/src/groovy/grails_akka_test}/command/ActorCommand.groovy
  24. +1 −1 ...vy/grails_akka → test/webapp/grails-akka-test/src/groovy/grails_akka_test}/command/Command.groovy
  25. +1 −1 ...ls_akka → test/webapp/grails-akka-test/src/groovy/grails_akka_test}/command/GenericCommand.groovy
  26. +1 −1 ... test/webapp/grails-akka-test/src/groovy/grails_akka_test}/command/GenericCommandArguments.groovy
  27. +1 −1 test/webapp/grails-akka-test/src/groovy/{grails_akka → grails_akka_test}/message/BaseMessage.groovy
  28. +1 −1 ...webapp/grails-akka-test/src/groovy/{grails_akka → grails_akka_test}/message/GenericMessage.groovy
  29. +2 −1 test/webapp/grails-akka-test/src/groovy/{grails_akka → grails_akka_test}/message/Greeting.groovy
  30. +1 −1 ...bapp/grails-akka-test/src/groovy/{grails_akka → grails_akka_test}/message/ImmutableMessage.groovy
  31. +1 −1 test/webapp/grails-akka-test/src/groovy/{grails_akka → grails_akka_test}/message/Shutdown.groovy
  32. +1 −1 test/webapp/grails-akka-test/src/groovy/{grails_akka → grails_akka_test}/message/Stop.groovy
  33. +1 −1 test/webapp/grails-akka-test/src/groovy/{grails_akka → grails_akka_test}/message/Wait.groovy
  34. +0 −4 test/webapp/grails-akka-test/test/integration/.gitignore
  35. +21 −7 test/webapp/grails-akka-test/test/integration/grails_akka/LocalAkkaIntegrationTests.groovy
  36. +1 −1 test/webapp/grails-akka-test/test/integration/grails_akka/RemoteAkkaIntegrationTests.groovy
  37. +0 −4 test/webapp/grails-akka-test/test/unit/.gitignore
  38. +7 −8 test/webapp/grails-akka-test/test/unit/grails_akka/LocalAkkaUnitTests.groovy
View
4 AkkaGrailsPlugin.groovy
@@ -16,7 +16,7 @@
*/
class AkkaGrailsPlugin {
- def version = "0.6.1"
+ def version = "0.6.2"
def grailsVersion = "2.0 > *"
def title = "Akka Integration"
def author = "Sandro Martini"
@@ -30,6 +30,6 @@ class AkkaGrailsPlugin {
def pluginExcludes = [
'src/docs/**',
- 'src/groovy/**'
+ 'src/groovy/grails_akka_test/**'
]
}
View
3 application.properties
@@ -1 +1,4 @@
+#Grails Metadata file
+#Sat Jan 19 17:13:32 CET 2013
app.grails.version=2.0.4
+plugins.tomcat=2.0.4
View
17 docs/TODO.md
@@ -4,9 +4,13 @@ grails-akka - TODO
TODO
----
-- for release 0.6.1 (maintenance public release):
- + publish the plugin ...
- + then set version to 0.7 (or 0.8) for the next release ...
+- for release 0.6.2 (maintenance public release):
+ + generate a new (empty grails webapp), and check if the (new, lighter) version of the plugin is good,
+ for example copying test classes by the usual plugin test webapp ...
+
+- for release 0.6.5 (maintenance public release):
+ + verify if add an akkaService ... but check how to configure it from outside
+ + do other tests and small adjustments ...
- for release 1.0:
@@ -108,6 +112,13 @@ cls && grails test-app integration: -echoOut
- for release 0.6.1 (maintenance public release):
+ update akka to 2.0.5 ... ok
+ + publish the plugin, and then update generated gdocs on github-pages ... ok
+
+- for release 0.6.2 (maintenance public release):
+ + accept pull request (for cleanup) from Burt ... ok
+ + rename package of test classes and exclude it from packaging ... ok
+ + run many tests on plugin, and the test webapp ... ok
+ + publish the plugin, and then update generated gdocs on github-pages ... ok
---------------
View
4 src/docs/guide/1.1 History.gdoc
@@ -1,6 +1,10 @@
h4. History
* January 2013
+** 0.6.2 release
+*** Cleanup of plugin (removed unnecessary files, and other small adjustments)
+
+* January 2013
** 0.6.1 release
*** Updated Akka to 2.0.5
View
2 ...groovy/grails_akka/actor/BaseActor.groovy → ...y/grails_akka_test/actor/BaseActor.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.actor
+package grails_akka_test.actor
import akka.actor.UntypedActor
import akka.event.Logging
View
10 ...vy/grails_akka/actor/GreetingActor.groovy → ...ails_akka_test/actor/GreetingActor.groovy
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.actor
+package grails_akka_test.actor
-import grails_akka.message.Greeting
-import grails_akka.message.Shutdown
-import grails_akka.message.Stop
-import grails_akka.message.Wait
+import grails_akka_test.message.Greeting
+import grails_akka_test.message.Shutdown
+import grails_akka_test.message.Stop
+import grails_akka_test.message.Wait
import akka.actor.UntypedActor
import akka.event.Logging
import akka.event.LoggingAdapter
View
2 ...y/grails_akka/command/ActorCommand.groovy → ...ils_akka_test/command/ActorCommand.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.command
+package grails_akka_test.command
import groovy.transform.EqualsAndHashCode
import groovy.transform.ToString
View
2 ...groovy/grails_akka/command/Command.groovy → ...y/grails_akka_test/command/Command.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.command
+package grails_akka_test.command
/**
* The Command pattern.
View
2 ...grails_akka/command/GenericCommand.groovy → ...s_akka_test/command/GenericCommand.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.command
+package grails_akka_test.command
import org.springframework.util.Assert
View
2 ...ka/command/GenericCommandArguments.groovy → ...st/command/GenericCommandArguments.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.command
+package grails_akka_test.command
/**
* Enum with standard keys to use as keys (but as Strings) in the GenericCommand arguments map.
View
2 ...vy/grails_akka/message/BaseMessage.groovy → ...ails_akka_test/message/BaseMessage.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.message
+package grails_akka_test.message
/**
* Abstract base message class, to use (when desired) as base class for all other messages here.
View
2 ...grails_akka/message/GenericMessage.groovy → ...s_akka_test/message/GenericMessage.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.message
+package grails_akka_test.message
import groovy.transform.EqualsAndHashCode
import groovy.transform.ToString
View
2 ...roovy/grails_akka/message/Greeting.groovy → .../grails_akka_test/message/Greeting.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.message
+package grails_akka_test.message
/**
* Greeting message, as a sample.
View
2 ...ails_akka/message/ImmutableMessage.groovy → ...akka_test/message/ImmutableMessage.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.message
+package grails_akka_test.message
/**
* ImmutableMessage, as a sample.
View
2 ...roovy/grails_akka/message/Shutdown.groovy → .../grails_akka_test/message/Shutdown.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.message
+package grails_akka_test.message
/**
* Shutdown message, as a sample.
View
2 src/groovy/grails_akka/message/Stop.groovy → ...oovy/grails_akka_test/message/Stop.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.message
+package grails_akka_test.message
/**
* Stop message, as a sample.
View
2 src/groovy/grails_akka/message/Wait.groovy → ...oovy/grails_akka_test/message/Wait.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.message
+package grails_akka_test.message
import groovy.transform.EqualsAndHashCode
import groovy.transform.ToString
View
12 test/integration/grails_akka/LocalAkkaIntegrationTests.groovy
@@ -17,12 +17,12 @@
package grails_akka
import static org.junit.Assert.*
-import grails_akka.actor.GreetingActor
-import grails_akka.command.ActorCommand
-import grails_akka.message.GenericMessage
-import grails_akka.message.Greeting
-import grails_akka.message.Stop
-import grails_akka.message.Wait
+import grails_akka_test.actor.GreetingActor
+import grails_akka_test.command.ActorCommand
+import grails_akka_test.message.GenericMessage
+import grails_akka_test.message.Greeting
+import grails_akka_test.message.Stop
+import grails_akka_test.message.Wait
import org.junit.After
import org.junit.Before
View
2 test/integration/grails_akka/RemoteAkkaIntegrationTests.groovy
@@ -17,7 +17,7 @@
package grails_akka
import static org.junit.Assert.*
-import grails_akka.actor.GreetingActor
+import grails_akka_test.actor.GreetingActor
import org.junit.Before
import org.junit.Test
View
12 test/unit/grails_akka/LocalAkkaUnitTests.groovy
@@ -18,12 +18,12 @@ package grails_akka
import grails.test.mixin.TestMixin
import grails.test.mixin.support.GrailsUnitTestMixin
-import grails_akka.actor.GreetingActor
-import grails_akka.command.ActorCommand
-import grails_akka.message.GenericMessage
-import grails_akka.message.Greeting
-import grails_akka.message.Stop
-import grails_akka.message.Wait
+import grails_akka_test.actor.GreetingActor
+import grails_akka_test.command.ActorCommand
+import grails_akka_test.message.GenericMessage
+import grails_akka_test.message.Greeting
+import grails_akka_test.message.Stop
+import grails_akka_test.message.Wait
import org.junit.Before
import org.junit.Test
View
2 ...groovy/grails_akka/actor/BaseActor.groovy → ...y/grails_akka_test/actor/BaseActor.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.actor
+package grails_akka_test.actor
import akka.actor.UntypedActor
import akka.event.Logging
View
10 ...vy/grails_akka/actor/GreetingActor.groovy → ...ails_akka_test/actor/GreetingActor.groovy
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.actor
+package grails_akka_test.actor
-import grails_akka.message.Greeting
-import grails_akka.message.Shutdown
-import grails_akka.message.Stop
-import grails_akka.message.Wait
+import grails_akka_test.message.Greeting
+import grails_akka_test.message.Shutdown
+import grails_akka_test.message.Stop
+import grails_akka_test.message.Wait
import akka.actor.UntypedActor
import akka.event.Logging
import akka.event.LoggingAdapter
View
2 ...y/grails_akka/command/ActorCommand.groovy → ...ils_akka_test/command/ActorCommand.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.command
+package grails_akka_test.command
import groovy.transform.EqualsAndHashCode
import groovy.transform.ToString
View
2 ...groovy/grails_akka/command/Command.groovy → ...y/grails_akka_test/command/Command.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.command
+package grails_akka_test.command
/**
* The Command pattern.
View
2 ...grails_akka/command/GenericCommand.groovy → ...s_akka_test/command/GenericCommand.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.command
+package grails_akka_test.command
import org.springframework.util.Assert
View
2 ...ka/command/GenericCommandArguments.groovy → ...st/command/GenericCommandArguments.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.command
+package grails_akka_test.command
/**
* Enum with standard keys to use as keys (but as Strings) in the GenericCommand arguments map.
View
2 ...vy/grails_akka/message/BaseMessage.groovy → ...ails_akka_test/message/BaseMessage.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.message
+package grails_akka_test.message
/**
* Abstract base message class, to use (when desired) as base class for all other messages here.
View
2 ...grails_akka/message/GenericMessage.groovy → ...s_akka_test/message/GenericMessage.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.message
+package grails_akka_test.message
import groovy.transform.EqualsAndHashCode
import groovy.transform.ToString
View
3 ...roovy/grails_akka/message/Greeting.groovy → .../grails_akka_test/message/Greeting.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.message
+package grails_akka_test.message
/**
* Greeting message, as a sample.
@@ -31,4 +31,5 @@ class Greeting implements Serializable
{
this.who = who
}
+
}
View
2 ...ails_akka/message/ImmutableMessage.groovy → ...akka_test/message/ImmutableMessage.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.message
+package grails_akka_test.message
/**
* ImmutableMessage, as a sample.
View
2 ...roovy/grails_akka/message/Shutdown.groovy → .../grails_akka_test/message/Shutdown.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.message
+package grails_akka_test.message
/**
* Shutdown message, as a sample.
View
2 ...rc/groovy/grails_akka/message/Stop.groovy → ...oovy/grails_akka_test/message/Stop.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.message
+package grails_akka_test.message
/**
* Stop message, as a sample.
View
2 ...rc/groovy/grails_akka/message/Wait.groovy → ...oovy/grails_akka_test/message/Wait.groovy
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails_akka.message
+package grails_akka_test.message
import groovy.transform.EqualsAndHashCode
import groovy.transform.ToString
View
4 test/webapp/grails-akka-test/test/integration/.gitignore
@@ -1,4 +0,0 @@
-.DS_Store
-.hg
-.settings
-.svn
View
28 test/webapp/grails-akka-test/test/integration/grails_akka/LocalAkkaIntegrationTests.groovy
@@ -17,13 +17,14 @@
package grails_akka
import static org.junit.Assert.*
-import grails_akka.actor.GreetingActor
-import grails_akka.command.ActorCommand
-import grails_akka.message.GenericMessage
-import grails_akka.message.Greeting
-import grails_akka.message.Stop
-import grails_akka.message.Wait
-
+import grails_akka_test.actor.GreetingActor
+import grails_akka_test.command.ActorCommand
+import grails_akka_test.message.GenericMessage
+import grails_akka_test.message.Greeting
+import grails_akka_test.message.Stop
+import grails_akka_test.message.Wait
+
+import org.junit.After
import org.junit.Before
import org.junit.Test
@@ -74,6 +75,19 @@ class LocalAkkaIntegrationTests
// mock.tell("Hello", probe.ref())
}
+ @After
+ void tearDown()
+ {
+ // shutdown the local actor system
+ // if (actor != null) {
+ // actor.stop()
+ // }
+ // if (system != null) {
+ // println("Shutting down Local Actor System instance: $system")
+ // system.shutdown()
+ // }
+ }
+
@Test(expected = InstantiationException)
void testClassAvailable_UntypedActor()
{
View
2 test/webapp/grails-akka-test/test/integration/grails_akka/RemoteAkkaIntegrationTests.groovy
@@ -17,7 +17,7 @@
package grails_akka
import static org.junit.Assert.*
-import grails_akka.actor.GreetingActor
+import grails_akka_test.actor.GreetingActor
import org.junit.Before
import org.junit.Test
View
4 test/webapp/grails-akka-test/test/unit/.gitignore
@@ -1,4 +0,0 @@
-.DS_Store
-.hg
-.settings
-.svn
View
15 test/webapp/grails-akka-test/test/unit/grails_akka/LocalAkkaUnitTests.groovy
@@ -3,7 +3,7 @@
* 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
+ * 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
@@ -16,15 +16,14 @@
*/
package grails_akka
-import static org.junit.Assert.*
import grails.test.mixin.TestMixin
import grails.test.mixin.support.GrailsUnitTestMixin
-import grails_akka.actor.GreetingActor
-import grails_akka.command.ActorCommand
-import grails_akka.message.GenericMessage
-import grails_akka.message.Greeting
-import grails_akka.message.Stop
-import grails_akka.message.Wait
+import grails_akka_test.actor.GreetingActor
+import grails_akka_test.command.ActorCommand
+import grails_akka_test.message.GenericMessage
+import grails_akka_test.message.Greeting
+import grails_akka_test.message.Stop
+import grails_akka_test.message.Wait
import org.junit.Before
import org.junit.Test

0 comments on commit 2f13c23

Please sign in to comment.