[play-router-module~source-code-repository:0ec31a06] Updated annotation

[nicolas_leroux@kenai.com]

Project:    play-router-module
Repository: source-code-repository
Revision:   0ec31a06e695699e5ff4b070513a496207c62f77
Author:     nicolas_leroux
Date:       2010-01-13 20:14:47 UTC
Link:       

Log Message:
------------
Updated annotation


Revisions:
----------
0ec31a06e695699e5ff4b070513a496207c62f77


Modified Paths:
---------------
.gitignore
router.iml
src/play/modules/router/Delete.java
src/play/modules/router/Get.java
src/play/modules/router/Head.java
src/play/modules/router/Post.java
src/play/modules/router/Put.java
src/play/modules/router/RouterPlugin.java


Diffs:
------
diff --git a/.gitignore b/.gitignore
index d21f3bc..4afc125 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
+*.iml
+tmp/
 dist/
 lib/
diff --git a/router.iml b/router.iml
index fbede73..33d1a64 100644
--- a/router.iml
+++ b/router.iml
@@ -10,7 +10,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../framework/play.jar!/" />
+          <root url="jar://$MODULE_DIR$/../play_1.1/framework/play.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/src/play/modules/router/Delete.java 
b/src/play/modules/router/Delete.java
index af27da8..3439ff2 100644
--- a/src/play/modules/router/Delete.java
+++ b/src/play/modules/router/Delete.java
@@ -12,16 +12,11 @@ public @interface Delete {
 
     String value();
 
-    String params() default "";
-
     int priority() default -1;
 
-    String consume() default "html'";
-
-    String produce() default "*'";
+    String format() default "*'";
 
     String accept() default "html'";
-
 }
 
 
diff --git a/src/play/modules/router/Get.java 
b/src/play/modules/router/Get.java
index 0431b30..56d5828 100644
--- a/src/play/modules/router/Get.java
+++ b/src/play/modules/router/Get.java
@@ -12,11 +12,9 @@ public @interface Get {
 
     String value();
 
-    String params() default "";
-
     int priority() default -1;
 
-    String produce() default "*'";
+    String format() default "*'";
 
     String accept() default "html'";
 
diff --git a/src/play/modules/router/Head.java 
b/src/play/modules/router/Head.java
index f7c95d6..e6b2503 100644
--- a/src/play/modules/router/Head.java
+++ b/src/play/modules/router/Head.java
@@ -13,13 +13,9 @@ public @interface Head {
 
     String value();
 
-    String params() default "";
-
     int priority() default -1;
-
-    String consume() default "html'";
-
-    String produce() default "*'";
+   
+    String format() default "*'";
 
     String accept() default "html'";
 
diff --git a/src/play/modules/router/Post.java 
b/src/play/modules/router/Post.java
index 9737ffd..2032bd8 100644
--- a/src/play/modules/router/Post.java
+++ b/src/play/modules/router/Post.java
@@ -12,14 +12,10 @@ import java.lang.annotation.Target;
 public @interface Post {
 
     String value();
-
-    String params() default "";
-
+    
     int priority() default -1;
 
-    String consume() default "html'";
-
-    String produce() default "*'";
+    String format() default "*'";
 
     String accept() default "html'";
-}
+}
\ No newline at end of file
diff --git a/src/play/modules/router/Put.java 
b/src/play/modules/router/Put.java
index 5872845..46c189c 100644
--- a/src/play/modules/router/Put.java
+++ b/src/play/modules/router/Put.java
@@ -13,13 +13,9 @@ public @interface Put {
 
     String value();
 
-    String params() default "";
-
     int priority() default -1;
 
-    String consume() default "html'";
-
-    String produce() default "*'";
+    String format() default "*'";
 
     String accept() default "html'";
 
diff --git a/src/play/modules/router/RouterPlugin.java 
b/src/play/modules/router/RouterPlugin.java
index 39f4b5e..27cb773 100644
--- a/src/play/modules/router/RouterPlugin.java
+++ b/src/play/modules/router/RouterPlugin.java
@@ -41,9 +41,9 @@ public class RouterPlugin extends PlayPlugin {
             Get annotation = get.getAnnotation(Get.class);
             if (annotation != null) {
                 if (annotation.priority() != -1) {
-                    Router.addRoute(annotation.priority(), "GET", 
annotation.value(), get.getDeclaringClass().getSimpleName() + "." + 
get.getName(), annotation.params(), annotation.accept());
+                    Router.addRoute(annotation.priority(), "GET", 
annotation.value(), get.getDeclaringClass().getSimpleName() + "." + 
get.getName(), "format:'" + annotation.format() + "'", annotation.accept());
                 } else {
-                    Router.prependRoute("GET", annotation.value(), 
get.getDeclaringClass().getSimpleName() + "." + get.getName(), 
annotation.params(), annotation.accept());
+                    Router.prependRoute("GET", annotation.value(), 
get.getDeclaringClass().getSimpleName() + "." + get.getName(), "format:'" + 
annotation.format() + "'", annotation.accept());
                 }
             }
         }
@@ -52,9 +52,9 @@ public class RouterPlugin extends PlayPlugin {
             Post annotation = post.getAnnotation(Post.class);
             if (annotation != null) {
                 if (annotation.priority() != -1) {
-                    Router.addRoute(annotation.priority(), "POST", 
annotation.value(), post.getDeclaringClass().getSimpleName() + "." + 
post.getName(), annotation.params(), annotation.accept());
+                    Router.addRoute(annotation.priority(), "POST", 
annotation.value(), post.getDeclaringClass().getSimpleName() + "." + 
post.getName(), "format:'" + annotation.format() + "'", annotation.accept());
                 } else {
-                    Router.prependRoute("POST", annotation.value(), 
post.getDeclaringClass().getSimpleName() + "." + post.getName(), 
annotation.params(), annotation.accept());
+                    Router.prependRoute("POST", annotation.value(), 
post.getDeclaringClass().getSimpleName() + "." + post.getName(), "format:'" + 
annotation.format() + "'", annotation.accept());
                 }
 
             }
@@ -64,9 +64,9 @@ public class RouterPlugin extends PlayPlugin {
             Put annotation = put.getAnnotation(Put.class);
             if (annotation != null) {
                 if (annotation.priority() != -1) {
-                    Router.addRoute(annotation.priority(), "PUT", 
annotation.value(), put.getDeclaringClass().getSimpleName() + "." + 
put.getName(), annotation.params(), annotation.accept());
+                    Router.addRoute(annotation.priority(), "PUT", 
annotation.value(), put.getDeclaringClass().getSimpleName() + "." + 
put.getName(), "format:'" + annotation.format() + "'", annotation.accept());
                 } else {
-                    Router.prependRoute("PUT", annotation.value(), 
put.getDeclaringClass().getSimpleName() + "." + put.getName(), 
annotation.params(), annotation.accept());
+                    Router.prependRoute("PUT", annotation.value(), 
put.getDeclaringClass().getSimpleName() + "." + put.getName(), "format:'" + 
annotation.format() + "'", annotation.accept());
                 }
             }
         }
@@ -76,9 +76,9 @@ public class RouterPlugin extends PlayPlugin {
             Delete annotation = delete.getAnnotation(Delete.class);
             if (annotation != null) {
                 if (annotation.priority() != -1) {
-                    Router.addRoute(annotation.priority(), "DELETE", 
annotation.value(), delete.getDeclaringClass().getSimpleName() + "." + 
delete.getName(), annotation.params(), annotation.accept());
+                    Router.addRoute(annotation.priority(), "DELETE", 
annotation.value(), delete.getDeclaringClass().getSimpleName() + "." + 
delete.getName(), "format:'" + annotation.format() + "'", 
annotation.accept());
                 } else {
-                    Router.prependRoute("DELETE", annotation.value(), 
delete.getDeclaringClass().getSimpleName() + "." + delete.getName(), 
annotation.params(), annotation.accept());
+                    Router.prependRoute("DELETE", annotation.value(), 
delete.getDeclaringClass().getSimpleName() + "." + delete.getName(), 
"format:'" + annotation.format() + "'", annotation.accept());
                 }
             }
         }
@@ -88,9 +88,9 @@ public class RouterPlugin extends PlayPlugin {
             Head annotation = head.getAnnotation(Head.class);
             if (annotation != null) {
                 if (annotation.priority() != -1) {
-                    Router.addRoute(annotation.priority(), "HEAD", 
annotation.value(), head.getDeclaringClass().getSimpleName() + "." + 
head.getName(), annotation.params(), annotation.accept());
+                    Router.addRoute(annotation.priority(), "HEAD", 
annotation.value(), head.getDeclaringClass().getSimpleName() + "." + 
head.getName(), "format:'" + annotation.format() + "'", annotation.accept());
                 } else {
-                    Router.prependRoute("HEAD", annotation.value(), 
head.getDeclaringClass().getSimpleName() + "." + head.getName(), 
annotation.params(), annotation.accept());
+                    Router.prependRoute("HEAD", annotation.value(), 
head.getDeclaringClass().getSimpleName() + "." + head.getName(), 
annotation.format() + "'", annotation.accept());
                 }
             }
         }
@@ -100,10 +100,10 @@ public class RouterPlugin extends PlayPlugin {
             Any annotation = any.getAnnotation(Any.class);
             if (annotation != null) {
                 if (annotation.priority() != -1) {
-                    Router.addRoute(annotation.priority(), "*", 
annotation.value(), any.getDeclaringClass().getSimpleName() + "." + 
any.getName(), annotation.params(), annotation.accept());
+                    Router.addRoute(annotation.priority(), "*", 
annotation.value(), any.getDeclaringClass().getSimpleName() + "." + 
any.getName(), "format:'" + annotation.format() + "'", annotation.accept());
                 } else {
                     // Always the last one
-                    Router.prependRoute("*", annotation.value(), 
any.getDeclaringClass().getSimpleName() + "." + any.getName(), 
annotation.params(), annotation.accept());
+                    Router.prependRoute("*", annotation.value(), 
any.getDeclaringClass().getSimpleName() + "." + any.getName(), "format:'" + 
annotation.format() + "'", annotation.accept());
                 }
             }
         }
@@ -115,9 +115,9 @@ public class RouterPlugin extends PlayPlugin {
                 if (serveStatics != null) {
                     for (ServeStatic serveStatic : serveStatics) {
                         if (serveStatic.priority() != -1) {
-                            Router.addRoute(serveStatic.priority(), "GET", 
serveStatic.value(), "staticDir:" + serveStatic.directory(), 
serveStatic.accept());
+                            Router.addRoute(serveStatic.priority(), "GET", 
serveStatic.value(), "staticDir:" + serveStatic.directory() + "'", 
serveStatic.accept());
                         } else {
-                            Router.prependRoute("GET", serveStatic.value(), 
"staticDir:" + serveStatic.directory(), serveStatic.accept());
+                            Router.prependRoute("GET", serveStatic.value(), 
"staticDir:" + serveStatic.directory() + "'", serveStatic.accept());
                         }
                     }
                 }
@@ -128,9 +128,9 @@ public class RouterPlugin extends PlayPlugin {
             ServeStatic annotation = 
(ServeStatic)clazz.getAnnotation(ServeStatic.class);
             if (annotation != null) {
                 if (annotation.priority() != -1) {
-                    Router.addRoute(annotation.priority(), "GET", 
annotation.value(), "staticDir:" + annotation.directory(), 
annotation.accept());
+                    Router.addRoute(annotation.priority(), "GET", 
annotation.value(), "staticDir:" + annotation.directory() + "'", 
annotation.accept());
                 } else {
-                    Router.prependRoute("GET", annotation.value(), 
"staticDir:" + annotation.directory(), annotation.accept());
+                    Router.prependRoute("GET", annotation.value(), 
"staticDir:" + annotation.directory() + "'", annotation.accept());
                 }
             }
         }