Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This topic branch fixes the problem where bare .class plugins were no longer picked up by a legacy environment when noPluginClassLoader() was called (which is now the default for ImageJ2/Fiji). The problem was reported by lots of people and fixed during the opening game of the world cup 2014. Brazil won. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
- Loading branch information
Showing
7 changed files
with
156 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| /* | ||
| * #%L | ||
| * ImageJ software for multidimensional image processing and analysis. | ||
| * %% | ||
| * Copyright (C) 2009 - 2014 Board of Regents of the University of | ||
| * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck | ||
| * Institute of Molecular Cell Biology and Genetics. | ||
| * %% | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are met: | ||
| * | ||
| * 1. Redistributions of source code must retain the above copyright notice, | ||
| * this list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright notice, | ||
| * this list of conditions and the following disclaimer in the documentation | ||
| * and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE | ||
| * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
| * POSSIBILITY OF SUCH DAMAGE. | ||
| * #L% | ||
| */ | ||
|
|
||
| package net.imagej.patcher; | ||
|
|
||
| import static net.imagej.patcher.TestUtils.invokeStatic; | ||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertTrue; | ||
| import static org.scijava.test.TestUtils.createTemporaryDirectory; | ||
|
|
||
| import java.io.File; | ||
|
|
||
| import javassist.ClassClassPath; | ||
| import javassist.ClassPool; | ||
| import javassist.CtClass; | ||
| import javassist.CtField; | ||
| import javassist.CtMethod; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| /** | ||
| * This unit test verifies that bare {@code .class} plugins are picked up correctly. | ||
| * | ||
| * @author Johannes Schindelin | ||
| */ | ||
| public class BarePluginsTest { | ||
|
|
||
| static { | ||
| try { | ||
| LegacyInjector.preinit(); | ||
| } | ||
| catch (NoClassDefFoundError e) { | ||
| // ignore: LegacyInjector not in *this* classpath | ||
| } | ||
| catch (Throwable t) { | ||
| t.printStackTrace(); | ||
| throw new RuntimeException("Got exception (see error log)"); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testBarePlugin() throws Exception { | ||
| // generate simple plugin | ||
| final File tmp = createTemporaryDirectory("bare-plugins-"); | ||
| final File plugins = new File(tmp, "plugins"); | ||
| assertTrue(plugins.mkdir()); | ||
|
|
||
| final ClassPool pool = new ClassPool(); | ||
| pool.appendClassPath(new ClassClassPath(getClass())); | ||
| final CtClass clazz = pool.makeClass("Bare_Test_Plugin"); | ||
| clazz.addField(CtField.make("public static java.lang.String value;", clazz)); | ||
| clazz.addInterface(pool.get("ij.plugin.PlugIn")); | ||
| clazz.addMethod(CtMethod.make("public void run(java.lang.String arg) {" + | ||
| " value = \"bare \" + ij.Macro.getOptions().trim();" + | ||
| "}", | ||
| clazz)); | ||
| clazz.addMethod(CtMethod.make("public static java.lang.String get() {" + | ||
| " return value;" + | ||
| "}", | ||
| clazz)); | ||
| clazz.writeFile(plugins.getPath()); | ||
|
|
||
| final String pluginsDir = System.getProperty("plugins.dir"); | ||
| try { | ||
| System.setProperty("plugins.dir", plugins.getPath()); | ||
| final LegacyEnvironment ij1 = new LegacyEnvironment(null, true); | ||
| ij1.noPluginClassLoader(); | ||
| final String message = "Yep, that's the bare plugin alright!"; | ||
| ij1.run("Bare Test Plugin", message); | ||
| final ClassLoader loader = invokeStatic(ij1.getClassLoader(), "ij.IJ", "getClassLoader"); | ||
| assertEquals("bare " + message, invokeStatic(loader, "Bare_Test_Plugin", "get")); | ||
| } finally { | ||
| if (pluginsDir == null) { | ||
| System.clearProperty("plugins.dir"); | ||
| } else { | ||
| System.setProperty("plugins.dir", pluginsDir); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters