Mercurial > hg > Members > nobuyasu > Consensus
changeset 63:1319e3f78c00
implemented reset method in Claim.java
line wrap: on
line diff
--- a/app/controllers/Claim.java Tue Nov 13 04:47:10 2012 +0900 +++ b/app/controllers/Claim.java Tue Nov 13 04:54:29 2012 +0900 @@ -1,5 +1,7 @@ package controllers; +import init.InitialData; + import org.codehaus.jackson.JsonNode; import org.codehaus.jackson.node.ObjectNode; @@ -214,7 +216,10 @@ } public static Result reset() { - + TPGraph tpGraph = TPGraph.getInstance(); + tpGraph.shutdownGraph(); + TPGraph.resetInstance(); + InitialData.init(); return ok(); }
--- a/conf/routes Tue Nov 13 04:47:10 2012 +0900 +++ b/conf/routes Tue Nov 13 04:54:29 2012 +0900 @@ -19,6 +19,7 @@ POST /claims/:mentionType/:id/create controllers.Claim.createMention(mentionType: String ,id: String) POST /claims/edit/:id controllers.Claim.editClaim(id: String) +GET /reset controllers.Claim.reset() # test action POST /hello controllers.Application.hello()
--- a/logs/application.log Tue Nov 13 04:47:10 2012 +0900 +++ b/logs/application.log Tue Nov 13 04:54:29 2012 +0900 @@ -1,168 +1,9 @@ -2012-11-13 04:43:32,447 - [INFO] - from play in main +2012-11-13 04:53:03,286 - [INFO] - from play in main Listening for HTTP on port 9000... -2012-11-13 04:43:35,866 - [INFO] - from play in play-akka.actor.default-dispatcher-3 -Application started (Dev) - -2012-11-13 04:44:17,147 - [INFO] - from application in play-akka.actor.default-dispatcher-3 -Application shutdown... - -2012-11-13 04:44:17,168 - [INFO] - from play in play-akka.actor.default-dispatcher-3 -Application started (Dev) - -2012-11-13 04:44:37,790 - [INFO] - from application in play-akka.actor.default-dispatcher-3 -Application shutdown... - -2012-11-13 04:44:37,812 - [INFO] - from play in play-akka.actor.default-dispatcher-3 -Application started (Dev) - -2012-11-13 04:44:53,368 - [INFO] - from application in play-akka.actor.default-dispatcher-1 -Application shutdown... - -2012-11-13 04:44:53,389 - [INFO] - from play in play-akka.actor.default-dispatcher-1 -Application started (Dev) - -2012-11-13 04:45:03,669 - [INFO] - from application in play-akka.actor.default-dispatcher-3 -Application shutdown... - -2012-11-13 04:45:03,688 - [INFO] - from play in play-akka.actor.default-dispatcher-3 -Application started (Dev) - -2012-11-13 04:45:07,292 - [INFO] - from application in play-akka.actor.default-dispatcher-3 -Application shutdown... - -2012-11-13 04:45:07,319 - [INFO] - from play in play-akka.actor.default-dispatcher-3 -Application started (Dev) - -2012-11-13 04:45:11,080 - [INFO] - from application in play-akka.actor.default-dispatcher-3 -Application shutdown... - -2012-11-13 04:45:11,098 - [INFO] - from play in play-akka.actor.default-dispatcher-3 +2012-11-13 04:53:06,805 - [INFO] - from play in play-akka.actor.default-dispatcher-1 Application started (Dev) -2012-11-13 04:45:51,428 - [ERROR] - from application in New I/O worker #7 - - -! Internal server error, for request [GET /users/all?_=1352749551221] -> - -sbt.PlayExceptions$CompilationException: Compilation error [cannot find symbol [symbol: class Resutl] [location: class controllers.Claim]] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3$$anonfun$4$$anonfun$apply$12$$anonfun$apply$13.apply(PlayReloader.scala:229) ~[na:na] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3$$anonfun$4$$anonfun$apply$12$$anonfun$apply$13.apply(PlayReloader.scala:229) ~[na:na] - at scala.Option.map(Option.scala:133) ~[scala-library.jar:0.11.3] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3$$anonfun$4$$anonfun$apply$12.apply(PlayReloader.scala:229) ~[na:na] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3$$anonfun$4$$anonfun$apply$12.apply(PlayReloader.scala:226) ~[na:na] - at scala.Option.map(Option.scala:133) ~[scala-library.jar:0.11.3] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3$$anonfun$4.apply(PlayReloader.scala:226) ~[na:na] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3$$anonfun$4.apply(PlayReloader.scala:224) ~[na:na] - at scala.Either$LeftProjection.map(Either.scala:183) ~[scala-library.jar:0.11.3] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3.apply(PlayReloader.scala:224) ~[na:na] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3.apply(PlayReloader.scala:219) ~[na:na] - at scala.Option.getOrElse(Option.scala:108) ~[scala-library.jar:0.11.3] - at sbt.PlayReloader$$anon$2.reload(PlayReloader.scala:219) ~[na:na] - at play.core.ReloadableApplication$$anonfun$get$1.apply(ApplicationProvider.scala:110) ~[play_2.9.1.jar:2.0.3] - at play.core.ReloadableApplication$$anonfun$get$1.apply(ApplicationProvider.scala:110) ~[play_2.9.1.jar:2.0.3] - at akka.dispatch.Future$$anon$3.liftedTree1$1(Future.scala:195) ~[akka-actor.jar:2.0.2] - at akka.dispatch.Future$$anon$3.run(Future.scala:194) ~[akka-actor.jar:2.0.2] - at akka.dispatch.TaskInvocation.run(AbstractDispatcher.scala:94) ~[akka-actor.jar:2.0.2] - at akka.jsr166y.ForkJoinTask$AdaptedRunnableAction.exec(ForkJoinTask.java:1381) ~[akka-actor.jar:2.0.2] - at akka.jsr166y.ForkJoinTask.doExec(ForkJoinTask.java:259) ~[akka-actor.jar:2.0.2] - at akka.jsr166y.ForkJoinPool$WorkQueue.runTask(ForkJoinPool.java:975) ~[akka-actor.jar:2.0.2] - at akka.jsr166y.ForkJoinPool.runWorker(ForkJoinPool.java:1479) ~[akka-actor.jar:2.0.2] - at akka.jsr166y.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:104) ~[akka-actor.jar:2.0.2] - -2012-11-13 04:45:51,563 - [ERROR] - from application in New I/O worker #8 - - -! Internal server error, for request [GET /consensus/browse/5?_=1352749551222] -> - -sbt.PlayExceptions$CompilationException: Compilation error [cannot find symbol [symbol: class Resutl] [location: class controllers.Claim]] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3$$anonfun$4$$anonfun$apply$12$$anonfun$apply$13.apply(PlayReloader.scala:229) ~[na:na] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3$$anonfun$4$$anonfun$apply$12$$anonfun$apply$13.apply(PlayReloader.scala:229) ~[na:na] - at scala.Option.map(Option.scala:133) ~[scala-library.jar:0.11.3] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3$$anonfun$4$$anonfun$apply$12.apply(PlayReloader.scala:229) ~[na:na] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3$$anonfun$4$$anonfun$apply$12.apply(PlayReloader.scala:226) ~[na:na] - at scala.Option.map(Option.scala:133) ~[scala-library.jar:0.11.3] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3$$anonfun$4.apply(PlayReloader.scala:226) ~[na:na] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3$$anonfun$4.apply(PlayReloader.scala:224) ~[na:na] - at scala.Either$LeftProjection.map(Either.scala:183) ~[scala-library.jar:0.11.3] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3.apply(PlayReloader.scala:224) ~[na:na] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3.apply(PlayReloader.scala:219) ~[na:na] - at scala.Option.getOrElse(Option.scala:108) ~[scala-library.jar:0.11.3] - at sbt.PlayReloader$$anon$2.reload(PlayReloader.scala:219) ~[na:na] - at play.core.ReloadableApplication$$anonfun$get$1.apply(ApplicationProvider.scala:110) ~[play_2.9.1.jar:2.0.3] - at play.core.ReloadableApplication$$anonfun$get$1.apply(ApplicationProvider.scala:110) ~[play_2.9.1.jar:2.0.3] - at akka.dispatch.Future$$anon$3.liftedTree1$1(Future.scala:195) ~[akka-actor.jar:2.0.2] - at akka.dispatch.Future$$anon$3.run(Future.scala:194) ~[akka-actor.jar:2.0.2] - at akka.dispatch.TaskInvocation.run(AbstractDispatcher.scala:94) ~[akka-actor.jar:2.0.2] - at akka.jsr166y.ForkJoinTask$AdaptedRunnableAction.exec(ForkJoinTask.java:1381) ~[akka-actor.jar:2.0.2] - at akka.jsr166y.ForkJoinTask.doExec(ForkJoinTask.java:259) ~[akka-actor.jar:2.0.2] - at akka.jsr166y.ForkJoinPool$WorkQueue.runTask(ForkJoinPool.java:975) ~[akka-actor.jar:2.0.2] - at akka.jsr166y.ForkJoinPool.runWorker(ForkJoinPool.java:1479) ~[akka-actor.jar:2.0.2] - at akka.jsr166y.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:104) ~[akka-actor.jar:2.0.2] - -2012-11-13 04:45:56,344 - [ERROR] - from application in New I/O worker #7 - - -! Internal server error, for request [GET /users/all?_=1352749556224] -> - -sbt.PlayExceptions$CompilationException: Compilation error [missing return statement] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3$$anonfun$4$$anonfun$apply$12$$anonfun$apply$13.apply(PlayReloader.scala:229) ~[na:na] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3$$anonfun$4$$anonfun$apply$12$$anonfun$apply$13.apply(PlayReloader.scala:229) ~[na:na] - at scala.Option.map(Option.scala:133) ~[scala-library.jar:0.11.3] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3$$anonfun$4$$anonfun$apply$12.apply(PlayReloader.scala:229) ~[na:na] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3$$anonfun$4$$anonfun$apply$12.apply(PlayReloader.scala:226) ~[na:na] - at scala.Option.map(Option.scala:133) ~[scala-library.jar:0.11.3] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3$$anonfun$4.apply(PlayReloader.scala:226) ~[na:na] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3$$anonfun$4.apply(PlayReloader.scala:224) ~[na:na] - at scala.Either$LeftProjection.map(Either.scala:183) ~[scala-library.jar:0.11.3] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3.apply(PlayReloader.scala:224) ~[na:na] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3.apply(PlayReloader.scala:219) ~[na:na] - at scala.Option.getOrElse(Option.scala:108) ~[scala-library.jar:0.11.3] - at sbt.PlayReloader$$anon$2.reload(PlayReloader.scala:219) ~[na:na] - at play.core.ReloadableApplication$$anonfun$get$1.apply(ApplicationProvider.scala:110) ~[play_2.9.1.jar:2.0.3] - at play.core.ReloadableApplication$$anonfun$get$1.apply(ApplicationProvider.scala:110) ~[play_2.9.1.jar:2.0.3] - at akka.dispatch.Future$$anon$3.liftedTree1$1(Future.scala:195) ~[akka-actor.jar:2.0.2] - at akka.dispatch.Future$$anon$3.run(Future.scala:194) ~[akka-actor.jar:2.0.2] - at akka.dispatch.TaskInvocation.run(AbstractDispatcher.scala:94) ~[akka-actor.jar:2.0.2] - at akka.jsr166y.ForkJoinTask$AdaptedRunnableAction.exec(ForkJoinTask.java:1381) ~[akka-actor.jar:2.0.2] - at akka.jsr166y.ForkJoinTask.doExec(ForkJoinTask.java:259) ~[akka-actor.jar:2.0.2] - at akka.jsr166y.ForkJoinPool$WorkQueue.runTask(ForkJoinPool.java:975) ~[akka-actor.jar:2.0.2] - at akka.jsr166y.ForkJoinPool.runWorker(ForkJoinPool.java:1479) ~[akka-actor.jar:2.0.2] - at akka.jsr166y.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:104) ~[akka-actor.jar:2.0.2] - -2012-11-13 04:45:56,482 - [ERROR] - from application in New I/O worker #8 - - -! Internal server error, for request [GET /consensus/browse/5?_=1352749556226] -> - -sbt.PlayExceptions$CompilationException: Compilation error [missing return statement] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3$$anonfun$4$$anonfun$apply$12$$anonfun$apply$13.apply(PlayReloader.scala:229) ~[na:na] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3$$anonfun$4$$anonfun$apply$12$$anonfun$apply$13.apply(PlayReloader.scala:229) ~[na:na] - at scala.Option.map(Option.scala:133) ~[scala-library.jar:0.11.3] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3$$anonfun$4$$anonfun$apply$12.apply(PlayReloader.scala:229) ~[na:na] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3$$anonfun$4$$anonfun$apply$12.apply(PlayReloader.scala:226) ~[na:na] - at scala.Option.map(Option.scala:133) ~[scala-library.jar:0.11.3] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3$$anonfun$4.apply(PlayReloader.scala:226) ~[na:na] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3$$anonfun$4.apply(PlayReloader.scala:224) ~[na:na] - at scala.Either$LeftProjection.map(Either.scala:183) ~[scala-library.jar:0.11.3] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3.apply(PlayReloader.scala:224) ~[na:na] - at sbt.PlayReloader$$anon$2$$anonfun$reload$3.apply(PlayReloader.scala:219) ~[na:na] - at scala.Option.getOrElse(Option.scala:108) ~[scala-library.jar:0.11.3] - at sbt.PlayReloader$$anon$2.reload(PlayReloader.scala:219) ~[na:na] - at play.core.ReloadableApplication$$anonfun$get$1.apply(ApplicationProvider.scala:110) ~[play_2.9.1.jar:2.0.3] - at play.core.ReloadableApplication$$anonfun$get$1.apply(ApplicationProvider.scala:110) ~[play_2.9.1.jar:2.0.3] - at akka.dispatch.Future$$anon$3.liftedTree1$1(Future.scala:195) ~[akka-actor.jar:2.0.2] - at akka.dispatch.Future$$anon$3.run(Future.scala:194) ~[akka-actor.jar:2.0.2] - at akka.dispatch.TaskInvocation.run(AbstractDispatcher.scala:94) ~[akka-actor.jar:2.0.2] - at akka.jsr166y.ForkJoinTask$AdaptedRunnableAction.exec(ForkJoinTask.java:1381) ~[akka-actor.jar:2.0.2] - at akka.jsr166y.ForkJoinTask.doExec(ForkJoinTask.java:259) ~[akka-actor.jar:2.0.2] - at akka.jsr166y.ForkJoinPool$WorkQueue.runTask(ForkJoinPool.java:975) ~[akka-actor.jar:2.0.2] - at akka.jsr166y.ForkJoinPool.runWorker(ForkJoinPool.java:1479) ~[akka-actor.jar:2.0.2] - at akka.jsr166y.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:104) ~[akka-actor.jar:2.0.2] - -2012-11-13 04:46:11,685 - [INFO] - from application in play-akka.actor.default-dispatcher-3 +2012-11-13 04:53:22,651 - [INFO] - from application in main Application shutdown... -2012-11-13 04:46:11,705 - [INFO] - from play in play-akka.actor.default-dispatcher-3 -Application started (Dev) -
--- a/public/viewer/index.html Tue Nov 13 04:47:10 2012 +0900 +++ b/public/viewer/index.html Tue Nov 13 04:54:29 2012 +0900 @@ -128,6 +128,18 @@ localStorage.userName = ""; location.href = ""; } +function reset(){ + $.ajax({ + url:BASE_URL+"/reset", + success:function(o){}, + type:"GET",cache:false, + error:function(o){ + console.log("reset Data"); + } + }) + logout(); +} + function claimSave(){ var agreeType=[null,"unanimously","majority"][($('#claimvote_option')[0].className.match("[0-9]+")||"0")[0]]; var title=$('#claimform_title').val(); @@ -227,7 +239,17 @@ color:silver; } span.logoutButton{ - position:absolute;right:400;top:0; + position:absolute;right:500;top:0; + text-align:center; + width:160;height:50; + cursor:pointer; + background:#334; + background:-moz-linear-gradient(top,#224,#334); + background:-webkit-gradient(linear,left top,left bottom,from(#224),to(#334)); + color:silver; +} +span.resetButton{ + position:absolute;right:300;top:0; text-align:center; width:160;height:50; cursor:pointer; @@ -242,6 +264,7 @@ <span id='header_title'>R-Consensus : Login</span> <span onclick="showForm()" class='createButton'>create</span> <span onclick="logout()" class='logoutButton'>logout</span> +<span onclick="reset()" class='resetButton'>reset</span> </div> <div id='popup_base' style='display:none;z-index:100'>
Binary file target/scala-2.9.1/classes/Routes$$anonfun$routes$1$$anonfun$apply$1$$anonfun$apply$2.class has changed
Binary file target/scala-2.9.1/classes/Routes$$anonfun$routes$1$$anonfun$apply$3$$anonfun$apply$4.class has changed
Binary file target/scala-2.9.1/classes/Routes$$anonfun$routes$1$$anonfun$apply$5$$anonfun$apply$6.class has changed
Binary file target/scala-2.9.1/classes/controllers/ref/ReverseApplication$$anonfun$hello$1.class has changed
Binary file target/scala-2.9.1/classes/controllers/ref/ReverseAssets$$anonfun$at$1.class has changed
--- a/target/scala-2.9.1/classes/routes Tue Nov 13 04:47:10 2012 +0900 +++ b/target/scala-2.9.1/classes/routes Tue Nov 13 04:54:29 2012 +0900 @@ -19,6 +19,7 @@ POST /claims/:mentionType/:id/create controllers.Claim.createMention(mentionType: String ,id: String) POST /claims/edit/:id controllers.Claim.editClaim(id: String) +GET /reset controllers.Claim.reset() # test action POST /hello controllers.Application.hello()
Binary file target/scala-2.9.1/classes_managed/Routes$$anonfun$routes$1$$anonfun$apply$1$$anonfun$apply$2.class has changed
Binary file target/scala-2.9.1/classes_managed/Routes$$anonfun$routes$1$$anonfun$apply$1.class has changed
Binary file target/scala-2.9.1/classes_managed/Routes$$anonfun$routes$1$$anonfun$apply$5$$anonfun$apply$6.class has changed
Binary file target/scala-2.9.1/classes_managed/Routes$$anonfun$routes$1$$anonfun$apply$5.class has changed
Binary file target/scala-2.9.1/classes_managed/controllers/javascript/ReverseApplication.class has changed
Binary file target/scala-2.9.1/classes_managed/controllers/javascript/ReverseAssets.class has changed
--- a/target/scala-2.9.1/src_managed/main/controllers/routes.java Tue Nov 13 04:47:10 2012 +0900 +++ b/target/scala-2.9.1/src_managed/main/controllers/routes.java Tue Nov 13 04:54:29 2012 +0900 @@ -1,6 +1,6 @@ // @SOURCE:/Users/aotokage/workspace/Consensus/conf/routes -// @HASH:8a38ca845b808131460d08a093b653057bafb2d7 -// @DATE:Tue Nov 13 03:26:04 JST 2012 +// @HASH:f8a97bc8ba05630c36d0e563f7a835a6fa57153c +// @DATE:Tue Nov 13 04:47:46 JST 2012 package controllers;
--- a/target/scala-2.9.1/src_managed/main/routes_reverseRouting.scala Tue Nov 13 04:47:10 2012 +0900 +++ b/target/scala-2.9.1/src_managed/main/routes_reverseRouting.scala Tue Nov 13 04:54:29 2012 +0900 @@ -1,6 +1,6 @@ // @SOURCE:/Users/aotokage/workspace/Consensus/conf/routes -// @HASH:8a38ca845b808131460d08a093b653057bafb2d7 -// @DATE:Tue Nov 13 03:26:04 JST 2012 +// @HASH:f8a97bc8ba05630c36d0e563f7a835a6fa57153c +// @DATE:Tue Nov 13 04:47:46 JST 2012 import play.core._ import play.core.Router._ @@ -12,10 +12,11 @@ import Router.queryString +// @LINE:32 // @LINE:31 -// @LINE:30 +// @LINE:26 // @LINE:25 -// @LINE:24 +// @LINE:22 // @LINE:20 // @LINE:19 // @LINE:18 @@ -32,6 +33,7 @@ // @LINE:7 package controllers { +// @LINE:22 // @LINE:20 // @LINE:19 // @LINE:18 @@ -75,6 +77,12 @@ } +// @LINE:22 +def reset() = { + Call("GET", "/reset") +} + + // @LINE:13 def getClaimInfo(id:String) = { Call("GET", "/claims/browse/" + implicitly[PathBindable[String]].unbind("id", id)) @@ -100,20 +108,20 @@ } +// @LINE:26 // @LINE:25 -// @LINE:24 class ReverseApplication { -// @LINE:25 +// @LINE:26 def test() = { Call("GET", "/test") } -// @LINE:24 +// @LINE:25 def hello() = { Call("POST", "/hello") } @@ -124,21 +132,21 @@ } +// @LINE:32 // @LINE:31 -// @LINE:30 class ReverseAssets { +// @LINE:32 // @LINE:31 -// @LINE:30 def at(file:String) = { (file) match { -// @LINE:30 +// @LINE:31 case (file) if file == "index.html" => Call("GET", "/") -// @LINE:31 +// @LINE:32 case (file) if true => Call("GET", "/" + implicitly[PathBindable[String]].unbind("file", file)) } @@ -205,10 +213,11 @@ +// @LINE:32 // @LINE:31 -// @LINE:30 +// @LINE:26 // @LINE:25 -// @LINE:24 +// @LINE:22 // @LINE:20 // @LINE:19 // @LINE:18 @@ -225,6 +234,7 @@ // @LINE:7 package controllers.javascript { +// @LINE:22 // @LINE:20 // @LINE:19 // @LINE:18 @@ -293,6 +303,17 @@ ) +// @LINE:22 +def reset = JavascriptReverseRoute( + "controllers.Claim.reset", + """ + function() { + return _wA({method:"GET", url:"/reset"}) + } + """ +) + + // @LINE:13 def getClaimInfo = JavascriptReverseRoute( "controllers.Claim.getClaimInfo", @@ -326,14 +347,14 @@ } +// @LINE:26 // @LINE:25 -// @LINE:24 class ReverseApplication { -// @LINE:25 +// @LINE:26 def test = JavascriptReverseRoute( "controllers.Application.test", """ @@ -344,7 +365,7 @@ ) -// @LINE:24 +// @LINE:25 def hello = JavascriptReverseRoute( "controllers.Application.hello", """ @@ -360,15 +381,15 @@ } +// @LINE:32 // @LINE:31 -// @LINE:30 class ReverseAssets { +// @LINE:32 // @LINE:31 -// @LINE:30 def at = JavascriptReverseRoute( "controllers.Assets.at", """ @@ -474,10 +495,11 @@ +// @LINE:32 // @LINE:31 -// @LINE:30 +// @LINE:26 // @LINE:25 -// @LINE:24 +// @LINE:22 // @LINE:20 // @LINE:19 // @LINE:18 @@ -494,6 +516,7 @@ // @LINE:7 package controllers.ref { +// @LINE:22 // @LINE:20 // @LINE:19 // @LINE:18 @@ -537,6 +560,12 @@ ) +// @LINE:22 +def reset() = new play.api.mvc.HandlerRef( + controllers.Claim.reset(), HandlerDef(this, "controllers.Claim", "reset", Seq()) +) + + // @LINE:13 def getClaimInfo(id:String) = new play.api.mvc.HandlerRef( controllers.Claim.getClaimInfo(id), HandlerDef(this, "controllers.Claim", "getClaimInfo", Seq(classOf[String])) @@ -554,20 +583,20 @@ } +// @LINE:26 // @LINE:25 -// @LINE:24 class ReverseApplication { -// @LINE:25 +// @LINE:26 def test() = new play.api.mvc.HandlerRef( controllers.Application.test(), HandlerDef(this, "controllers.Application", "test", Seq()) ) -// @LINE:24 +// @LINE:25 def hello() = new play.api.mvc.HandlerRef( controllers.Application.hello(), HandlerDef(this, "controllers.Application", "hello", Seq()) ) @@ -578,14 +607,14 @@ } +// @LINE:32 // @LINE:31 -// @LINE:30 class ReverseAssets { -// @LINE:30 +// @LINE:31 def at(path:String, file:String) = new play.api.mvc.HandlerRef( controllers.Assets.at(path, file), HandlerDef(this, "controllers.Assets", "at", Seq(classOf[String], classOf[String])) )
--- a/target/scala-2.9.1/src_managed/main/routes_routing.scala Tue Nov 13 04:47:10 2012 +0900 +++ b/target/scala-2.9.1/src_managed/main/routes_routing.scala Tue Nov 13 04:54:29 2012 +0900 @@ -1,6 +1,6 @@ // @SOURCE:/Users/aotokage/workspace/Consensus/conf/routes -// @HASH:8a38ca845b808131460d08a093b653057bafb2d7 -// @DATE:Tue Nov 13 03:26:04 JST 2012 +// @HASH:f8a97bc8ba05630c36d0e563f7a835a6fa57153c +// @DATE:Tue Nov 13 04:47:46 JST 2012 import play.core._ import play.core.Router._ @@ -70,22 +70,26 @@ val controllers_Claim_editClaim13 = Route("POST", PathPattern(List(StaticPart("/claims/edit/"),DynamicPart("id", """[^/]+""")))) -// @LINE:24 -val controllers_Application_hello14 = Route("POST", PathPattern(List(StaticPart("/hello")))) +// @LINE:22 +val controllers_Claim_reset14 = Route("GET", PathPattern(List(StaticPart("/reset")))) // @LINE:25 -val controllers_Application_test15 = Route("GET", PathPattern(List(StaticPart("/test")))) +val controllers_Application_hello15 = Route("POST", PathPattern(List(StaticPart("/hello")))) -// @LINE:30 -val controllers_Assets_at16 = Route("GET", PathPattern(List(StaticPart("/")))) +// @LINE:26 +val controllers_Application_test16 = Route("GET", PathPattern(List(StaticPart("/test")))) // @LINE:31 -val controllers_Assets_at17 = Route("GET", PathPattern(List(StaticPart("/"),DynamicPart("file", """.+""")))) +val controllers_Assets_at17 = Route("GET", PathPattern(List(StaticPart("/")))) -def documentation = List(("""GET""","""/users/all""","""controllers.User.getAllUsers()"""),("""PUT""","""/users/create/$name<[^/]+>""","""controllers.User.createUser(name:String)"""),("""GET""","""/users/browse/$name<[^/]+>""","""controllers.User.getUser(name:String)"""),("""GET""","""/users/requests/$name<[^/]+>""","""controllers.User.getUserRequests(name:String)"""),("""GET""","""/users/consensus/$name<[^/]+>""","""controllers.User.getUserConsensus(name:String)"""),("""GET""","""/users/claims/$name<[^/]+>""","""controllers.User.getUserClaims(name:String)"""),("""GET""","""/claims/browse/$id<[^/]+>""","""controllers.Claim.getClaimInfo(id:String)"""),("""GET""","""/claims/consensus/$id<[^/]+>""","""controllers.Claim.getClaimTree(id:String)"""),("""GET""","""/consensus/browse/$id<[^/]+>""","""controllers.Claim.getClaimTree(id:String)"""),("""GET""","""/claims/answer/$id<[^/]+>/$name<[^/]+>""","""controllers.Claim.getUserConsensusStatus(id:String, name:String)"""),("""POST""","""/claims/answer/$id<[^/]+>/$name<[^/]+>/$status<[^/]+>""","""controllers.Claim.updateUserConsensusStatus(id:String, name:String, status:String)"""),("""POST""","""/claims/create""","""controllers.Claim.createClaim()"""),("""POST""","""/claims/$mentionType<[^/]+>/$id<[^/]+>/create""","""controllers.Claim.createMention(mentionType:String, id:String)"""),("""POST""","""/claims/edit/$id<[^/]+>""","""controllers.Claim.editClaim(id:String)"""),("""POST""","""/hello""","""controllers.Application.hello()"""),("""GET""","""/test""","""controllers.Application.test()"""),("""GET""","""/""","""controllers.Assets.at(path:String = "/public/viewer", file:String = "index.html")"""),("""GET""","""/$file<.+>""","""controllers.Assets.at(path:String = "/public/viewer", file:String)""")) + +// @LINE:32 +val controllers_Assets_at18 = Route("GET", PathPattern(List(StaticPart("/"),DynamicPart("file", """.+""")))) + +def documentation = List(("""GET""","""/users/all""","""controllers.User.getAllUsers()"""),("""PUT""","""/users/create/$name<[^/]+>""","""controllers.User.createUser(name:String)"""),("""GET""","""/users/browse/$name<[^/]+>""","""controllers.User.getUser(name:String)"""),("""GET""","""/users/requests/$name<[^/]+>""","""controllers.User.getUserRequests(name:String)"""),("""GET""","""/users/consensus/$name<[^/]+>""","""controllers.User.getUserConsensus(name:String)"""),("""GET""","""/users/claims/$name<[^/]+>""","""controllers.User.getUserClaims(name:String)"""),("""GET""","""/claims/browse/$id<[^/]+>""","""controllers.Claim.getClaimInfo(id:String)"""),("""GET""","""/claims/consensus/$id<[^/]+>""","""controllers.Claim.getClaimTree(id:String)"""),("""GET""","""/consensus/browse/$id<[^/]+>""","""controllers.Claim.getClaimTree(id:String)"""),("""GET""","""/claims/answer/$id<[^/]+>/$name<[^/]+>""","""controllers.Claim.getUserConsensusStatus(id:String, name:String)"""),("""POST""","""/claims/answer/$id<[^/]+>/$name<[^/]+>/$status<[^/]+>""","""controllers.Claim.updateUserConsensusStatus(id:String, name:String, status:String)"""),("""POST""","""/claims/create""","""controllers.Claim.createClaim()"""),("""POST""","""/claims/$mentionType<[^/]+>/$id<[^/]+>/create""","""controllers.Claim.createMention(mentionType:String, id:String)"""),("""POST""","""/claims/edit/$id<[^/]+>""","""controllers.Claim.editClaim(id:String)"""),("""GET""","""/reset""","""controllers.Claim.reset()"""),("""POST""","""/hello""","""controllers.Application.hello()"""),("""GET""","""/test""","""controllers.Application.test()"""),("""GET""","""/""","""controllers.Assets.at(path:String = "/public/viewer", file:String = "index.html")"""),("""GET""","""/$file<.+>""","""controllers.Assets.at(path:String = "/public/viewer", file:String)""")) def routes:PartialFunction[RequestHeader,Handler] = { @@ -202,32 +206,40 @@ } -// @LINE:24 -case controllers_Application_hello14(params) => { +// @LINE:22 +case controllers_Claim_reset14(params) => { + call { + invokeHandler(_root_.controllers.Claim.reset(), HandlerDef(this, "controllers.Claim", "reset", Nil)) + } +} + + +// @LINE:25 +case controllers_Application_hello15(params) => { call { invokeHandler(_root_.controllers.Application.hello(), HandlerDef(this, "controllers.Application", "hello", Nil)) } } -// @LINE:25 -case controllers_Application_test15(params) => { +// @LINE:26 +case controllers_Application_test16(params) => { call { invokeHandler(_root_.controllers.Application.test(), HandlerDef(this, "controllers.Application", "test", Nil)) } } -// @LINE:30 -case controllers_Assets_at16(params) => { +// @LINE:31 +case controllers_Assets_at17(params) => { call(Param[String]("path", Right("/public/viewer")), Param[String]("file", Right("index.html"))) { (path, file) => invokeHandler(_root_.controllers.Assets.at(path, file), HandlerDef(this, "controllers.Assets", "at", Seq(classOf[String], classOf[String]))) } } -// @LINE:31 -case controllers_Assets_at17(params) => { +// @LINE:32 +case controllers_Assets_at18(params) => { call(Param[String]("path", Right("/public/viewer")), params.fromPath[String]("file", None)) { (path, file) => invokeHandler(_root_.controllers.Assets.at(path, file), HandlerDef(this, "controllers.Assets", "at", Seq(classOf[String], classOf[String]))) }