From 5edb1b1af3d2993d0355619c22815f8a7e6a3ab9 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Fri, 3 Feb 2012 20:41:07 +0100
Subject: [PATCH] fix wrong development resource names

---
 .../scm/resources/DevelopmentResource.java    | 19 ++++++++++++++++++-
 .../resources/DevelopmentResourceManager.java | 10 ++++++----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResource.java b/scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResource.java
index 3dda675d9e..01bef45238 100644
--- a/scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResource.java
@@ -31,6 +31,10 @@
 
 package sonia.scm.resources;
 
+//~--- non-JDK imports --------------------------------------------------------
+
+import sonia.scm.util.HttpUtil;
+
 //~--- JDK imports ------------------------------------------------------------
 
 import java.io.IOException;
@@ -64,8 +68,21 @@ public class DevelopmentResource extends AbstractResource
                              String name, ResourceType type)
   {
     super(servletContext, resources, resourceHandlers);
-    this.name = name;
     this.type = type;
+
+    if (name.startsWith(HttpUtil.SEPARATOR_PATH))
+    {
+      name = name.substring(1);
+    }
+
+    String ext = ".".concat(type.getExtension());
+
+    if (!name.endsWith(ext))
+    {
+      name = name.concat(ext);
+    }
+
+    this.name = name;
   }
 
   //~--- methods --------------------------------------------------------------
diff --git a/scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResourceManager.java b/scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResourceManager.java
index 4e1364c61d..a783e39bb7 100644
--- a/scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResourceManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResourceManager.java
@@ -92,10 +92,12 @@ public class DevelopmentResourceManager extends AbstractResourceManager
 
     for (String script : scripts)
     {
-      resourceMap.put(new ResourceKey(script, ResourceType.SCRIPT),
-                      new DevelopmentResource(servletContext,
-                        Arrays.asList(script), Collections.EMPTY_LIST, script,
-                        ResourceType.SCRIPT));
+      Resource resource = new DevelopmentResource(servletContext,
+                            Arrays.asList(script), Collections.EMPTY_LIST,
+                            script, ResourceType.SCRIPT);
+
+      resourceMap.put(new ResourceKey(resource.getName(), ResourceType.SCRIPT),
+                      resource);
     }
 
     for (ResourceHandler handler : resourceHandlers)