Modified to produce a jar file instead of WEB-INF/classes

Because of the prefetching change in remoting (see JENKINS-15120), it is desirable now to produce class files in a jar file, not in a classes directory, so that slaves can prefetch them and cache them efficiently.
jenkinsci · Jun 9, 2013 · 6035351 · 6035351 · slide · Feb 2, 2014
1 parent 603d259
commit 6035351
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 24 deletions.
diff --git a/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractHpiMojo.java b/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractHpiMojo.java
@@ -340,7 +340,7 @@ protected String[] getDependentWarIncludes() {
         return StringUtils.split(StringUtils.defaultString(dependentWarIncludes), ",");
     }
 
-    public void buildExplodedWebapp(File webappDirectory)
+    public void buildExplodedWebapp(File webappDirectory, File jarFile)
         throws MojoExecutionException {
         getLog().info("Exploding webapp...");
 
@@ -370,6 +370,8 @@ public void buildExplodedWebapp(File webappDirectory)
             }
 
             buildWebapp(project, webappDirectory);
+
+            copyFileIfModified(jarFile, new File(getWebappDirectory(),"WEB-INF/lib/"+jarFile.getName()));
         }
         catch (IOException e) {
             throw new MojoExecutionException("Could not explode webapp...", e);
@@ -500,12 +502,6 @@ public void buildWebapp(MavenProject project, File webappDirectory)
 
         File tldDirectory = new File(webappDirectory, WEB_INF + "/tld");
 
-        File webappClassesDirectory = new File(webappDirectory, WEB_INF + "/classes");
-
-        if (classesDirectory.exists() && !classesDirectory.equals(webappClassesDirectory)) {
-            copyDirectoryStructureIfModified(classesDirectory, webappClassesDirectory);
-        }
-
         Set<MavenArtifact> artifacts = getProjectArtfacts();
 
         List<String> duplicates = findDuplicates(artifacts);

diff --git a/src/main/java/org/jenkinsci/maven/plugins/hpi/HpiMojo.java b/src/main/java/org/jenkinsci/maven/plugins/hpi/HpiMojo.java
@@ -122,37 +122,39 @@ public void execute() throws MojoExecutionException {
     private void performPackaging()
         throws IOException, ArchiverException, ManifestException, DependencyResolutionRequiredException, MojoExecutionException {
 
-        File hpiFile = getOutputFile(".hpi");
-        buildExplodedWebapp(getWebappDirectory());
+        // generate a manifest
+        File manifestFile = new File(getWebappDirectory(), "META-INF/MANIFEST.MF");
+        generateManifest(manifestFile);
+        Manifest manifest = loadManifest(manifestFile);
 
-        //generate war file
+        // create a jar file to be used when other plugins depend on this plugin.
+        File jarFile = getOutputFile(".jar");
+        MavenArchiver archiver = new MavenArchiver();
+        archiver.setArchiver(jarArchiver);
+        archiver.setOutputFile(jarFile);
+        jarArchiver.addConfiguredManifest(manifest);
+        jarArchiver.addDirectory(getClassesDirectory());
+        archiver.createArchive(project,archive);
+        projectHelper.attachArtifact(project, "jar", null, jarFile);
+
+        // generate war file
+        buildExplodedWebapp(getWebappDirectory(),jarFile);
+
+        File hpiFile = getOutputFile(".hpi");
         getLog().info("Generating hpi " + hpiFile.getAbsolutePath());
 
-        MavenArchiver archiver = new MavenArchiver();
+        archiver = new MavenArchiver();
 
         archiver.setArchiver(hpiArchiver);
         archiver.setOutputFile(hpiFile);
 
-        File manifestFile = new File(getWebappDirectory(), "META-INF/MANIFEST.MF");
-        generateManifest(manifestFile);
-        Manifest manifest = loadManifest(manifestFile);
-
         hpiArchiver.addConfiguredManifest(manifest);
         hpiArchiver.addDirectory(getWebappDirectory(), getIncludes(), getExcludes());
 
         // create archive
         archiver.createArchive(project, archive);
         project.getArtifact().setFile(hpiFile);
 
-        // also creates a jar file to be used when other plugins depend on this plugin.
-        File jarFile = getOutputFile(".jar");
-        archiver = new MavenArchiver();
-        archiver.setArchiver(jarArchiver);
-        archiver.setOutputFile(jarFile);
-        jarArchiver.addConfiguredManifest(manifest);
-        jarArchiver.addDirectory(getClassesDirectory());
-        archiver.createArchive(project,archive);
-        projectHelper.attachArtifact(project, "jar", null, jarFile);
     }
 
     private Manifest loadManifest(File f) throws IOException, ManifestException {