retrotranslated remoting.jar doesn't work nicely with jnlp-agent.jar, so I'm...

retrotranslated remoting.jar doesn't work nicely with jnlp-agent.jar, so I'm going to require JDK 1.5 for JNLP slave agents.


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@2171 71c3de6d-444a-0410-be80-ed276b4c234a

core/src/main/resources/hudson/model/Slave/ComputerImpl/slave-agent.jnlp.jelly

@@ -24,7 +24,7 @@
       <resources>
         <j2se version="1.5"/>
         <jar href="jnlpJars/jnlp-agent.jar"/>
-        <jar href="jnlpJars/slave.jar"/><!-- remoting jar -->
+        <jar href="jnlpJars/remoting.jar"/>
       </resources>
 
       <application-desc main-class="hudson.jnlp.Main">

war/pom.xml

@@ -81,6 +81,28 @@
               <outputDirectory>${basedir}/target/generated-resources/WEB-INF</outputDirectory>
             </configuration>
           </execution>
+          <!--
+            for copying remoting jar to $WAR/WEB-INF/remoting.jar
+            this is always JDK 1.5 jar, to make it easy to deploy JNLP agent.
+          -->
+          <execution>
+            <id>copy-remoting.jar</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.jvnet.hudson.main</groupId>
+                  <artifactId>remoting</artifactId>
+                  <version>${version}</version>
+                  <destFileName>remoting.jar</destFileName>
+                </artifactItem>
+              </artifactItems>
+              <outputDirectory>${basedir}/target/generated-resources/WEB-INF</outputDirectory>
+            </configuration>
+          </execution>
           <!-- for copying remoting jar to $WAR/WEB-INF/jnlp-agent.jar -->
           <execution>
             <id>copy-jnlp-agent.jar</id>