Merge branch 'master' of https://github.com/mathieuleclaire/scalaWUI

README.md

@@ -2,31 +2,25 @@
 
 The project aims at building a small but complete client / server application using very powerfull scala tools to construct fully typed and reactive Web applications. Among them:
 
-- [scalatra](http://scalatra.org/)
 - [scalajs](https://github.com/scala-js/scala-js)
+- [scalatra](http://scalatra.org/)
 - [scalatags](https://github.com/lihaoyi/scalatags)
 - [scala.rx](https://github.com/lihaoyi/scala.rx)
 - [autowire](https://github.com/lihaoyi/autowire)
 
 as well as [scaladget](https://github.com/mathieuleclaire/scaladget) to take adavantage of the mapping of the [http://d3js.org/](D3.js) library.
 
-This prototype exposes a Graph editor inspired from [http://bl.ocks.org/cjrd/6863459](http://bl.ocks.org/cjrd/6863459) javascript example.
+It is an empty ready-to-work application, dealing with all the starting wiring. This prototype also exposes as example a small Graph editor inspired from [http://bl.ocks.org/cjrd/6863459](http://bl.ocks.org/cjrd/6863459) javascript example, but written witten in a reactive way thanks to the [scala.rx](https://github.com/lihaoyi/scala.rx) library.
 
 ## Build & Run##
 First, build the javascript:
 ```sh
 $ cd scalaWUI
 $ sbt
-> fullOptJS // Build the client JS files
-```
-
-Then move the generated js to the scalatra webapp directory (this operation should be done automatically and in a cleaner way to avoid to move some files in the server sources ...). Nevertheless, it gives the idea in the scope of this demo project.
-
-```sh
-$ cp client/target/scala-2.11/client-opt.js server/src/main/webapp/js/
+> go // Build the client JS files and move them to the right place
 ```
 
-Finally, start the server (in your previous sbt session):
+Then, start the server:
 ```sh
 > container:restart // Start the server
 ```