Merge lp:~nicolas-lunatech/play/contribution into lp:~play-developers/play/stable3-hacks

[Nicolas Leroux]

[Guillaume Bort (guillaume-bort)]

review: Approve

[lp:~nicolas-lunatech/play/contribution]

592. By guillaume <email address hidden> on 2009-09-29

play new,run

593. By guillaume <email address hidden> on 2009-09-29

Merge nicolas fix about servlet container

=== modified file 'framework/src/play/Play.java'
--- framework/src/play/Play.java	2009-09-06 18:05:44 +0000
+++ framework/src/play/Play.java	2009-09-28 17:00:31 +0000
@@ -135,6 +135,8 @@
     // pv
     static boolean firstStart = true;
 
+    private final static String NO_PREFIX = "";
+
     /**
      * Init the framework
      * @param root The application path
@@ -165,11 +167,12 @@
         }
         System.setProperty("play.path", Play.frameworkPath.getAbsolutePath());
         System.setProperty("application.path", Play.applicationPath.getAbsolutePath());
-        Logger.info("");
+
         Logger.info("Starting %s", root.getAbsolutePath());
 
         // Read the configuration file
         readConfiguration();
+
         if (configuration.getProperty("play.tmp", "tmp").equals("none")) {
             tmpDir = null;
             Logger.debug("No tmp folder will be used (play.tmp is set to none)");
@@ -348,7 +351,7 @@
             Play.classloader.getAllClasses();
 
             // Routes
-            Router.detectChanges();
+            Router.detectChanges(NO_PREFIX);
 
             // Plugins
             for (PlayPlugin plugin : plugins) {
@@ -429,7 +432,7 @@
         }
         try {
             classloader.detectChanges();
-            Router.detectChanges();
+            Router.detectChanges(NO_PREFIX);
             if (conf.lastModified() > startedAt) {
                 start();
                 return;

=== modified file 'framework/src/play/mvc/Router.java'
--- framework/src/play/mvc/Router.java	2009-05-27 06:35:18 +0000
+++ framework/src/play/mvc/Router.java	2009-09-28 17:00:31 +0000
@@ -31,9 +31,9 @@
     static Pattern methodOverride = new Pattern("^.*x-http-method-override=({method}GET|PUT|POST|DELETE).*$");
     public static long lastLoading = -1;
 
-    public static void load() {
+    public static void load(String prefix) {
         routes.clear();
-        parse(Play.routes, "");
+        parse(Play.routes, prefix);
         lastLoading = System.currentTimeMillis();
         // Plugins
         for (PlayPlugin plugin : Play.plugins) {
@@ -41,18 +41,20 @@
         }
     }
 
-    public static void addRoute(String method, String path, String action) {
+     public static void addRoute(String method, String path, String action) {
+        addRoute(method, path, action, null);
+    }
+
+
+    public static void addRoute(String method, String path, String action, String params) {
         Route route = new Route();
         route.method = method;
         route.path = path;
         route.path = route.path.replace("//", "/");
         route.action = action;
+        route.addParams(params);
         route.compute();
-        if(routes.size() == 0) {
-            routes.add(route);
-        }else {
-            routes.add(0, route);
-        }
+        routes.add(0, route);
     }
 
     /**
@@ -90,35 +92,27 @@
                         Logger.error("Cannot include routes for module %s (not found)", moduleName);
                     }
                 } else {
-                    Route route = new Route();
-                    route.method = matcher.group("method");
-                    if(matcher.group("path").equals("/") && !prefix.equals("")) {
-                        route.path = prefix;
-                    } else {
-                        route.path = prefix + matcher.group("path");
-                    }
-                    route.path = route.path.replace("//", "/");
-                    route.action = action;
-                    route.addParams(matcher.group("params"));
-                    route.compute();
-                    routes.add(route);
-                }
+                    String method = matcher.group("method");
+                    String path = prefix + matcher.group("path");
+                    String params = matcher.group("params");
+                    addRoute(method, path, action, params);
+                }                
             } else {
                 Logger.error("Invalid route definition : %s", line);
             }
         }
     }
 
-    public static void detectChanges() {
+    public static void detectChanges(String prefix) {
         if (Play.mode == Mode.PROD && lastLoading > 0) {
             return;
         }
         if (Play.routes.lastModified() > lastLoading) {
-            load();
+            load(prefix);
         } else {
             for (VirtualFile file : Play.modulesRoutes.values()) {
                 if (file.lastModified() > lastLoading) {
-                    load();
+                    load(prefix);
                     return;
                 }
             }

=== modified file 'framework/src/play/server/ServletWrapper.java'
--- framework/src/play/server/ServletWrapper.java	2009-08-20 09:17:47 +0000
+++ framework/src/play/server/ServletWrapper.java	2009-09-28 17:00:31 +0000
@@ -50,6 +50,8 @@
         String appDir = e.getServletContext().getRealPath("/WEB-INF/application");
         File root = new File(appDir);
         Play.init(root, System.getProperty("play.id", ""));
+        // Reload the rules, but this time with the context. Not really efficient through...
+        Router.load(e.getServletContext().getContextPath());
     }
 
     public void contextDestroyed(ServletContextEvent e) {
@@ -98,11 +100,12 @@
     }
 
     public void serveStatic(HttpServletResponse servletResponse, HttpServletRequest servletRequest, RenderStatic renderStatic) throws IOException {
+
         VirtualFile file = Play.getVirtualFile(renderStatic.file);
-        servletResponse.setContentType(MimeTypes.getContentType(file.getName()));
         if (file == null || file.isDirectory() || !file.exists()) {
             //serve404(session, minaResponse, minaRequest, new NotFound("The file " + renderStatic.file + " does not exist"));
         } else {
+            servletResponse.setContentType(MimeTypes.getContentType(file.getName()));
             boolean raw = false;
             for (PlayPlugin plugin : Play.plugins) {
                 if (plugin.serveStatic(file, Request.current(), Response.current())) {