Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 07:25:44 +01:00
Code Issues Packages Projects Releases Activity

fix wrong development resource names

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-02-03 20:41:07 +01:00
parent c62987bfcb
commit 5edb1b1af3
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResource.java
View File

@@ -31,6 +31,10 @@
package sonia.scm.resources; package sonia.scm.resources;
//~--- non-JDK imports --------------------------------------------------------
import sonia.scm.util.HttpUtil;
//~--- JDK imports ------------------------------------------------------------ //~--- JDK imports ------------------------------------------------------------
import java.io.IOException; import java.io.IOException;
@@ -64,8 +68,21 @@ public class DevelopmentResource extends AbstractResource
String name, ResourceType type) String name, ResourceType type)
{ {
super(servletContext, resources, resourceHandlers); super(servletContext, resources, resourceHandlers);
this.name = name;
this.type = type; 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 -------------------------------------------------------------- //~--- methods --------------------------------------------------------------

10
scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResourceManager.java
View File

@@ -92,10 +92,12 @@ public class DevelopmentResourceManager extends AbstractResourceManager
for (String script : scripts) for (String script : scripts)
{ {
resourceMap.put(new ResourceKey(script, ResourceType.SCRIPT), Resource resource = new DevelopmentResource(servletContext,
new DevelopmentResource(servletContext, Arrays.asList(script), Collections.EMPTY_LIST,
Arrays.asList(script), Collections.EMPTY_LIST, script, script, ResourceType.SCRIPT);
ResourceType.SCRIPT));
resourceMap.put(new ResourceKey(resource.getName(), ResourceType.SCRIPT),
resource);
} }
for (ResourceHandler handler : resourceHandlers) for (ResourceHandler handler : resourceHandlers)