From 225dc9cc474829970cc4db2102aa3b8937b838d3 Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Sun, 15 Feb 2009 15:32:17 +0000
Subject: [PATCH] Tweaking the convention a bit to move all help files in the
 same folder.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@15364 71c3de6d-444a-0410-be80-ed276b4c234a
---
 .../main/java/hudson/model/Descriptor.java    | 22 +++++++++----------
 .../launcher.jelly => help-launcher.jelly}    |  0
 ...properties => help-launcher_de.properties} |  0
 ...properties => help-launcher_fr.properties} |  0
 ...properties => help-launcher_ja.properties} |  0
 ...properties => help-launcher_tr.properties} |  0
 6 files changed, 11 insertions(+), 11 deletions(-)
 rename core/src/main/resources/hudson/model/Slave/{help/launcher.jelly => help-launcher.jelly} (100%)
 rename core/src/main/resources/hudson/model/Slave/{help/launcher_de.properties => help-launcher_de.properties} (100%)
 rename core/src/main/resources/hudson/model/Slave/{help/launcher_fr.properties => help-launcher_fr.properties} (100%)
 rename core/src/main/resources/hudson/model/Slave/{help/launcher_ja.properties => help-launcher_ja.properties} (100%)
 rename core/src/main/resources/hudson/model/Slave/{help/launcher_tr.properties => help-launcher_tr.properties} (100%)

diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java
index 8ff6a03ced..1467761cd6 100644
--- a/core/src/main/java/hudson/model/Descriptor.java
+++ b/core/src/main/java/hudson/model/Descriptor.java
@@ -33,14 +33,9 @@ import net.sf.json.JSONObject;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerResponse;
-import org.kohsuke.stapler.MetaClass;
-import org.kohsuke.stapler.WebApp;
-import org.kohsuke.stapler.jelly.JellyClassTearOff;
 import org.springframework.util.StringUtils;
 import org.jvnet.tiger_types.Types;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.JellyException;
 
 import javax.servlet.http.HttpServletRequest;
 import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
@@ -372,13 +367,16 @@ public abstract class Descriptor<T extends Describable<T>> implements Saveable {
      * locale variations.
      */
     public String getHelpFile(String fieldName) {
-        if(fieldName==null) fieldName="";
-        else                fieldName='/'+fieldName;
-
-        String page = "/descriptor/" + clazz.getName() + "/help"+fieldName;
+        String page = "/descriptor/" + clazz.getName() + "/help";
+        if(fieldName==null) {
+            fieldName="";
+        } else {
+            page += '/'+fieldName;
+            fieldName='-'+fieldName;
+        }
 
         try {
-            if(Stapler.getCurrentRequest().getView(clazz,"help"+fieldName+".jelly")!=null)
+            if(Stapler.getCurrentRequest().getView(clazz,"help"+fieldName)!=null)
                 return page;
         } catch (IOException e) {
             throw new Error(e);
@@ -508,7 +506,9 @@ public abstract class Descriptor<T extends Describable<T>> implements Saveable {
         String path = req.getRestOfPath();
         if(path.contains("..")) throw new ServletException("Illegal path: "+path);
 
-        RequestDispatcher rd = Stapler.getCurrentRequest().getView(clazz, "help"+path+".jelly");
+        path = path.replace('/','-');
+
+        RequestDispatcher rd = Stapler.getCurrentRequest().getView(clazz, "help"+path);
         if(rd!=null) {// Jelly-generated help page
             rd.forward(req,rsp);
             return;
diff --git a/core/src/main/resources/hudson/model/Slave/help/launcher.jelly b/core/src/main/resources/hudson/model/Slave/help-launcher.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/Slave/help/launcher.jelly
rename to core/src/main/resources/hudson/model/Slave/help-launcher.jelly
diff --git a/core/src/main/resources/hudson/model/Slave/help/launcher_de.properties b/core/src/main/resources/hudson/model/Slave/help-launcher_de.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Slave/help/launcher_de.properties
rename to core/src/main/resources/hudson/model/Slave/help-launcher_de.properties
diff --git a/core/src/main/resources/hudson/model/Slave/help/launcher_fr.properties b/core/src/main/resources/hudson/model/Slave/help-launcher_fr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Slave/help/launcher_fr.properties
rename to core/src/main/resources/hudson/model/Slave/help-launcher_fr.properties
diff --git a/core/src/main/resources/hudson/model/Slave/help/launcher_ja.properties b/core/src/main/resources/hudson/model/Slave/help-launcher_ja.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Slave/help/launcher_ja.properties
rename to core/src/main/resources/hudson/model/Slave/help-launcher_ja.properties
diff --git a/core/src/main/resources/hudson/model/Slave/help/launcher_tr.properties b/core/src/main/resources/hudson/model/Slave/help-launcher_tr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/Slave/help/launcher_tr.properties
rename to core/src/main/resources/hudson/model/Slave/help-launcher_tr.properties
-- 
GitLab