Merged revisions 23666-23667,23670,23711,23782-23785,23788,23809-23810,23817,23859,23870,23879,23899-23904,23906-23907,23909,23913 via svnmerge from

https://www.dev.java.net/svn/hudson/branches/managed-startup ........ r23666 | kohsuke | 2009-11-11 15:56:46 -0800 (Wed, 11 Nov 2009) | 1 line Reworked the initialization logic ........ r23667 | kohsuke | 2009-11-11 16:01:56 -0800 (Wed, 11 Nov 2009) | 1 line fixed a failing test ........ r23670 | kohsuke | 2009-11-11 16:42:32 -0800 (Wed, 11 Nov 2009) | 1 line use a non-snapshot ........ r23711 | kohsuke | 2009-11-13 14:27:28 -0800 (Fri, 13 Nov 2009) | 1 line Session -> Reactor ........ r23782 | kohsuke | 2009-11-17 10:35:14 -0800 (Tue, 17 Nov 2009) | 1 line Poorman's clone of JDK6 ServiceLoader. ........ r23783 | kohsuke | 2009-11-17 10:56:25 -0800 (Tue, 17 Nov 2009) | 1 line Integrated the fatal support so that all errors are sent to the listener. ........ r23784 | kohsuke | 2009-11-17 10:58:07 -0800 (Tue, 17 Nov 2009) | 1 line with the new reactor initialization, things are getting too verbose ........ r23785 | kohsuke | 2009-11-17 11:18:45 -0800 (Tue, 17 Nov 2009) | 1 line failing to load jobs are non-fatal, too ........ r23788 | kohsuke | 2009-11-17 13:18:59 -0800 (Tue, 17 Nov 2009) | 1 line logging the exception properly ........ r23809 | kohsuke | 2009-11-17 18:45:47 -0800 (Tue, 17 Nov 2009) | 1 line releasing 1.1 as milestone ........ r23810 | kohsuke | 2009-11-17 18:47:37 -0800 (Tue, 17 Nov 2009) | 2 lines - use a better idiom for building a sequence - use null display name to signify internal book-keeping tasks that's not worth displaying ........ r23817 | kohsuke | 2009-11-18 07:54:17 -0800 (Wed, 18 Nov 2009) | 1 line removed accidental JDK6 dependency. ........ r23859 | kohsuke | 2009-11-19 11:03:28 -0800 (Thu, 19 Nov 2009) | 1 line introducing the strategy pattern to hook into key decision making points during the start up ........ r23870 | kohsuke | 2009-11-19 14:33:07 -0800 (Thu, 19 Nov 2009) | 1 line bug fix. These steps add additional tasks to the reactor, so they need to also prevent future milestones from getting attained. ........ r23879 | kohsuke | 2009-11-19 16:54:59 -0800 (Thu, 19 Nov 2009) | 1 line moved the logic to the strategy. ........ r23899 | kohsuke | 2009-11-20 09:32:13 -0800 (Fri, 20 Nov 2009) | 1 line handle duplicate plugins better ........ r23900 | kohsuke | 2009-11-20 10:06:42 -0800 (Fri, 20 Nov 2009) | 1 line support pre-exploded plugin ........ r23901 | kohsuke | 2009-11-20 10:49:04 -0800 (Fri, 20 Nov 2009) | 1 line making it a subtype ........ r23902 | kohsuke | 2009-11-20 10:54:42 -0800 (Fri, 20 Nov 2009) | 1 line allow InitStrategy to skip some tasks ........ r23903 | kohsuke | 2009-11-20 11:03:38 -0800 (Fri, 20 Nov 2009) | 1 line doc improvement. ........ r23904 | kohsuke | 2009-11-20 11:03:49 -0800 (Fri, 20 Nov 2009) | 1 line no need to throw exceptions ........ r23906 | kohsuke | 2009-11-20 11:17:34 -0800 (Fri, 20 Nov 2009) | 1 line debug switch to disable the automatic launch of slaves ........ r23907 | kohsuke | 2009-11-20 11:25:15 -0800 (Fri, 20 Nov 2009) | 1 line added a magic object for cancelling all saves ........ r23909 | kohsuke | 2009-11-20 11:29:53 -0800 (Fri, 20 Nov 2009) | 1 line moving initialization up ........ r23913 | kohsuke | 2009-11-20 13:32:08 -0800 (Fri, 20 Nov 2009) | 1 line seeing heap space problem during tests ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@23992 71c3de6d-444a-0410-be80-ed276b4c234a
2026-11-05 16:15:54 +00:00 · 2009-11-23 19:33:33 +00:00
1 parent ef7768a0a9
commit fd13eee6d5
@@ -72,16 +72,16 @@ public class ClassicPluginStrategy implements PluginStrategy {
 	}

 	public PluginWrapper createPluginWrapper(File archive) throws IOException {
-		LOGGER.info("Loading plugin: " + archive);
+		LOGGER.info("Preparing plugin: " + archive);

 		final Manifest manifest;
 		URL baseResourceURL;

-		boolean isLinked = archive.getName().endsWith(".hpl");

 		File expandDir = null; 
 		// if .hpi, this is the directory where war is expanded

+        boolean isLinked = archive.getName().endsWith(".hpl");
 		if (isLinked) {
 			// resolve the .hpl file to the location of the manifest file
 			String firstLine = new BufferedReader(new FileReader(archive))
@@ -102,21 +102,25 @@ public class ClassicPluginStrategy implements PluginStrategy {
 				in.close();
 			}
 		} else {
-			expandDir = new File(archive.getParentFile(), PluginWrapper.getBaseName(archive));
-			explode(archive, expandDir);
+            if (archive.isDirectory()) {// already expanded
+                expandDir = archive;
+            } else {
+                expandDir = new File(archive.getParentFile(), PluginWrapper.getBaseName(archive));
+                explode(archive, expandDir);
+            }

-			File manifestFile = new File(expandDir, "META-INF/MANIFEST.MF");
-			if (!manifestFile.exists()) {
-				throw new IOException(
-						"Plugin installation failed. No manifest at "
-								+ manifestFile);
-			}
-			FileInputStream fin = new FileInputStream(manifestFile);
-			try {
-				manifest = new Manifest(fin);
-			} finally {
-				fin.close();
-			}
+            File manifestFile = new File(expandDir, "META-INF/MANIFEST.MF");
+            if (!manifestFile.exists()) {
+                throw new IOException(
+                        "Plugin installation failed. No manifest at "
+                                + manifestFile);
+            }
+            FileInputStream fin = new FileInputStream(manifestFile);
+            try {
+                manifest = new Manifest(fin);
+            } finally {
+                fin.close();
+            }
 		}

        final Attributes atts = manifest.getMainAttributes();
@@ -327,8 +331,6 @@ public class ClassicPluginStrategy implements PluginStrategy {
        if(explodeTime.exists() && explodeTime.lastModified()==archive.lastModified())
            return; // no need to expand

-        LOGGER.info("Extracting "+archive);
-
        // delete the contents so that old files won't interfere with new files
        Util.deleteContentsRecursive(destDir);