From 765dea3cc179935f2156eacbcff8dd88a51e1e75 Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Sat, 10 Feb 2007 22:29:37 +0000
Subject: [PATCH] jar files without .jar extension seems to confuse Java Web
 Start.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@2143 71c3de6d-444a-0410-be80-ed276b4c234a
---
 core/src/main/java/hudson/model/Slave.java                 | 4 ++--
 .../hudson/model/Slave/ComputerImpl/slave-agent.jnlp.jelly | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/hudson/model/Slave.java b/core/src/main/java/hudson/model/Slave.java
index 2e6ce11b9d..ee7b6be873 100644
--- a/core/src/main/java/hudson/model/Slave.java
+++ b/core/src/main/java/hudson/model/Slave.java
@@ -316,8 +316,8 @@ public final class Slave implements Node, Serializable {
         /**
          * Serves jar files for JNLP slave agents.
          */
-        public JnlpJar getJnlpJars(String fileName) {
-            return new JnlpJar(fileName);
+        public JnlpJar getJnlpJars(String fileNamePlusJar) {
+            return new JnlpJar(fileNamePlusJar.substring(0,fileNamePlusJar.length()-4)); // remove .jar
         }
 
         @Override
diff --git a/core/src/main/resources/hudson/model/Slave/ComputerImpl/slave-agent.jnlp.jelly b/core/src/main/resources/hudson/model/Slave/ComputerImpl/slave-agent.jnlp.jelly
index 0cf5232204..1bf13bc0fb 100644
--- a/core/src/main/resources/hudson/model/Slave/ComputerImpl/slave-agent.jnlp.jelly
+++ b/core/src/main/resources/hudson/model/Slave/ComputerImpl/slave-agent.jnlp.jelly
@@ -3,6 +3,9 @@
   <j:set var="rootURL"
          value="${request.scheme}://${request.serverName}:${request.serverPort}${request.contextPath}" />
 
+  <!--
+    See http://www.dallaway.com/acad/webstart/ for obtaining the certificate.
+  -->
   <l:isAdmin>
     <!-- See http://java.sun.com/j2se/1.5.0/docs/guide/javaws/developersguide/syntax.html for the syntax -->
     <jnlp spec="1.0+"
@@ -20,8 +23,8 @@
 
       <resources>
         <j2se version="1.5"/>
-        <jar href="jnlpJars/hudson.jnlp.Main"/><!-- JNLP agent jar -->
-        <jar href="jnlpJars/hudson.remoting.Channel"/><!-- remoting jar -->
+        <jar href="jnlpJars/hudson.jnlp.Main.jar"/><!-- JNLP agent jar -->
+        <jar href="jnlpJars/hudson.remoting.Channel.jar"/><!-- remoting jar -->
       </resources>
 
       <application-desc main-class="hudson.jnlp.Main">
-- 
GitLab