diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..e963602c --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +The MIT License + +Copyright (c) 2010-2014 Abraham Menacherry + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/README.md b/README.md index cb72a74a..3b9711e8 100644 --- a/README.md +++ b/README.md @@ -1,31 +1,32 @@ +**Note** New version of Jetserver is called **Nadron** and is in a new [ netty 4 branch](https://github.com/menacher/java-game-server/tree/netty4) of this same repo. JetServer is a java nio based server specifically designed for mutliplayer games. It supports UDP and TCP transports. It uses [Netty](http://netty.io/) for high speed network transmission and [Jetlang](http://code.google.com/p/jetlang/ "jetlang") for extremely fast in-vm message passing between player sessions and game rooms. The project also uses spring for its dependency injection. This way, it is highly configurable and you can swap out any part of the server with your own implementations. -Wiki -==== -The [wiki](https://github.com/menacher/java-game-server/wiki) provides implementation level details and answers to general questions that a developer starting to use jetserver might have about it. The following [blog](http://nerdronix.blogspot.com/2013/06/creating-multiplayer-game-using-html-5.html) has post on game creation. -Support Group -============= +## Wiki +The [wiki](https://github.com/menacher/java-game-server/wiki) provides implementation level details and answers to general questions that a developer starting to use jetserver might have about it. The following [blog](http://nerdronix.blogspot.com/2013/06/creating-multiplayer-game-using-html-5.html) has post on game creation. + +## Support Group For general discussion please use the [jetserver google group](https://groups.google.com/forum/#!forum/jetserver). Issues and bugs can be raised directly in github. -Installation -============ + +## Installation + Maven ----- ```xml com.github.menacher nadron - 0.2 + 0.5 ``` From Source ----------- Using pre-built jar files ------------------------- -The pre-built jar files of this project are located in the jetserver/binaries directory. All dependant jars are located in the jetserver/lib directory. You can just add them to your classpath in your favorite IDE and start coding. If you want to compile from source, then follow steps below. +The pre-built jar files of this project are located in the jetserver/binaries directory. All dependent jars are located in the jetserver/lib directory. You can add them to your favorite IDE’s classpath for coding. If you want to compile from source, then follow steps below. With Maven and using Eclipse ---------------------------- -**Pre-requisites**: Please have maven 3+ and [Spring source tool suite](http://www.springsource.com/developer/sts "STS") or eclipse installed. If you are using plain vanilla eclipse, then M2Eclipse and EGit plugins though not required will be helpful. If you are using another IDE then the maven-eclipse plugin part in the pom.xml needs to be modified. +**Pre-requisites**: Please have maven 3+ and [Spring source tool suite](http://www.springsource.com/developer/sts "STS") or eclipse installed. If you are using plain vanilla eclipse, then M2Eclipse and EGit plugins though not required will be helpful. The maven-eclipse plugin part of pom.xml should be modified when using another IDE. Steps ----- diff --git a/example-games/src/main/java/org/menacheri/zombie/game/Messages.java b/example-games/src/main/java/org/menacheri/zombie/game/Messages.java index 023e491e..c6910232 100644 --- a/example-games/src/main/java/org/menacheri/zombie/game/Messages.java +++ b/example-games/src/main/java/org/menacheri/zombie/game/Messages.java @@ -6,10 +6,10 @@ /** - * This class acts like a message factory for creating game specific messages. - * @author Abraham Menacherry - * - */ + This class acts like a message factory for creating game specific messages. + @author Abraham Menacherry + + **/ public class Messages { public static ChannelBuffer apocalypse() diff --git a/jetclient-as3/README.md b/jetclient-as3/README.md index cce9ed98..9b5eb14b 100644 --- a/jetclient-as3/README.md +++ b/jetclient-as3/README.md @@ -12,6 +12,6 @@ The general usage steps could be as outlined below. 2. Create a session factory using this login helper instance. 3. Create as many sessions as required using this factory. Generally only one is required for a client. 4. Check the code in Main.as for more information on how to add an event listener to session to receive events. -5. Main.as also has code on how to write back to JetServer. Mostly it is done using session.sendToServer(JetEvent). +5. Main.as has code on how to write back to JetServer. Mostly it is done using session.sendToServer(JetEvent). - \ No newline at end of file + diff --git a/jetclient-js/test/jetclient.html b/jetclient-js/test/jetclient.html index 0dd4827c..2da5839b 100644 --- a/jetclient-js/test/jetclient.html +++ b/jetclient-js/test/jetclient.html @@ -92,7 +92,7 @@ -

Jet Websocket

+

Jet Zombie Websocket

Human

Zombie

@@ -101,4 +101,4 @@

Jet Websocket

- \ No newline at end of file + diff --git a/jetserver/src/main/java/org/menacheri/jetserver/server/Server.java b/jetserver/src/main/java/org/menacheri/jetserver/server/Server.java index 128bc511..92d849ea 100644 --- a/jetserver/src/main/java/org/menacheri/jetserver/server/Server.java +++ b/jetserver/src/main/java/org/menacheri/jetserver/server/Server.java @@ -18,7 +18,7 @@ public enum TRANSMISSION_PROTOCOL implements TransmissionProtocol { void startServer() throws Exception; - void startServer(int port) throws Exception;; + void startServer(int port) throws Exception; void startServer(InetSocketAddress socketAddress) throws Exception; diff --git a/jetserver/src/test/java/org/menacheri/jetserver/SpringNettyServer.java b/jetserver/src/test/java/org/menacheri/jetserver/SpringNettyServer.java index ac308361..d51d4118 100644 --- a/jetserver/src/test/java/org/menacheri/jetserver/SpringNettyServer.java +++ b/jetserver/src/test/java/org/menacheri/jetserver/SpringNettyServer.java @@ -23,6 +23,7 @@ public static void main(String[] args) PropertyConfigurator.configure(System .getProperty("log4j.configuration")); AbstractApplicationContext context = new AnnotationConfigApplicationContext(JetServerSpringConfig.class); + // For the destroy method to work. context.registerShutdownHook();