Repository: tomee Updated Branches: refs/heads/develop 11cc1d5c2 -> 3d86bb4d3
Finals Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/3d86bb4d Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/3d86bb4d Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/3d86bb4d Branch: refs/heads/develop Commit: 3d86bb4d3f4e1829f80e7c3811737baf66cce752 Parents: 11cc1d5 Author: AndyGee <[email protected]> Authored: Tue Oct 28 11:50:08 2014 +0100 Committer: AndyGee <[email protected]> Committed: Tue Oct 28 11:50:08 2014 +0100 ---------------------------------------------------------------------- .../openejb/maven/jarstxt/JarsTxtMojo.java | 4 ++-- .../maven/util/MavenLogStreamFactory.java | 24 ++++++++++---------- .../plugin/embedded/OpenEJBEmbeddedMojo.java | 10 ++++---- .../maven/plugins/TomEEEmbeddedMojo.java | 2 +- .../maven/plugin/AbstractCommandMojo.java | 4 ++-- .../maven/plugin/AbstractSynchronizable.java | 8 +++---- .../openejb/maven/plugin/BuildTomEEMojo.java | 2 +- .../apache/openejb/maven/plugin/DeployMojo.java | 6 ++--- .../openejb/maven/plugin/ListEjbMojo.java | 12 +++++----- .../openejb/maven/plugin/StopTomEEMojo.java | 2 +- .../org/apache/openejb/maven/plugin/Synch.java | 4 ++-- .../openejb/maven/plugin/Synchronization.java | 8 +++---- .../openejb/maven/plugin/TomEEException.java | 4 ++-- .../maven/plugin/UpdatableTomEEMojo.java | 12 +++++----- .../apache/openejb/maven/plugin/util/Zips.java | 6 ++--- .../maven/plugin/test/PersistJavaagentTest.java | 2 +- 16 files changed, 55 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/3d86bb4d/maven/jarstxt-maven-plugin/src/main/java/org/apache/openejb/maven/jarstxt/JarsTxtMojo.java ---------------------------------------------------------------------- diff --git a/maven/jarstxt-maven-plugin/src/main/java/org/apache/openejb/maven/jarstxt/JarsTxtMojo.java b/maven/jarstxt-maven-plugin/src/main/java/org/apache/openejb/maven/jarstxt/JarsTxtMojo.java index 0a26e7e..3603b00 100644 --- a/maven/jarstxt-maven-plugin/src/main/java/org/apache/openejb/maven/jarstxt/JarsTxtMojo.java +++ b/maven/jarstxt-maven-plugin/src/main/java/org/apache/openejb/maven/jarstxt/JarsTxtMojo.java @@ -160,13 +160,13 @@ public class JarsTxtMojo extends AbstractMojo { } writer.flush(); - } catch (IOException e) { + } catch (final IOException e) { getLog().error(e.getMessage(), e); } finally { if (writer != null) { try { writer.close(); - } catch (IOException e) { + } catch (final IOException e) { // no-op } } http://git-wip-us.apache.org/repos/asf/tomee/blob/3d86bb4d/maven/maven-util/src/main/java/org/apache/openejb/maven/util/MavenLogStreamFactory.java ---------------------------------------------------------------------- diff --git a/maven/maven-util/src/main/java/org/apache/openejb/maven/util/MavenLogStreamFactory.java b/maven/maven-util/src/main/java/org/apache/openejb/maven/util/MavenLogStreamFactory.java index 1af2419..c690f84 100644 --- a/maven/maven-util/src/main/java/org/apache/openejb/maven/util/MavenLogStreamFactory.java +++ b/maven/maven-util/src/main/java/org/apache/openejb/maven/util/MavenLogStreamFactory.java @@ -49,7 +49,7 @@ public class MavenLogStreamFactory implements LogStreamFactory { return new MavenLogStream(logger); } - public static void setLogger(Log logger) { + public static void setLogger(final Log logger) { MavenLogStreamFactory.logger = logger; } @@ -138,7 +138,7 @@ public class MavenLogStreamFactory implements LogStreamFactory { private static class MavenLogStream implements LogStream { private final Log log; - public MavenLogStream(Log logger) { + public MavenLogStream(final Log logger) { log = logger; } @@ -148,12 +148,12 @@ public class MavenLogStreamFactory implements LogStreamFactory { } @Override - public void fatal(String message) { + public void fatal(final String message) { log.error(message); } @Override - public void fatal(String message, Throwable t) { + public void fatal(final String message, final Throwable t) { log.error(message, t); } @@ -163,12 +163,12 @@ public class MavenLogStreamFactory implements LogStreamFactory { } @Override - public void error(String message) { + public void error(final String message) { log.error(message); } @Override - public void error(String message, Throwable t) { + public void error(final String message, final Throwable t) { log.error(message, t); } @@ -178,12 +178,12 @@ public class MavenLogStreamFactory implements LogStreamFactory { } @Override - public void warn(String message) { + public void warn(final String message) { log.warn(message); } @Override - public void warn(String message, Throwable t) { + public void warn(final String message, final Throwable t) { log.warn(message, t); } @@ -193,12 +193,12 @@ public class MavenLogStreamFactory implements LogStreamFactory { } @Override - public void info(String message) { + public void info(final String message) { log.info(message); } @Override - public void info(String message, Throwable t) { + public void info(final String message, final Throwable t) { log.info(message, t); } @@ -208,12 +208,12 @@ public class MavenLogStreamFactory implements LogStreamFactory { } @Override - public void debug(String message) { + public void debug(final String message) { log.debug(message); } @Override - public void debug(String message, Throwable t) { + public void debug(final String message, final Throwable t) { log.debug(message, t); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/3d86bb4d/maven/openejb-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/embedded/OpenEJBEmbeddedMojo.java ---------------------------------------------------------------------- diff --git a/maven/openejb-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/embedded/OpenEJBEmbeddedMojo.java b/maven/openejb-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/embedded/OpenEJBEmbeddedMojo.java index 4d3ceaf..5cfe245 100644 --- a/maven/openejb-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/embedded/OpenEJBEmbeddedMojo.java +++ b/maven/openejb-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/embedded/OpenEJBEmbeddedMojo.java @@ -80,7 +80,7 @@ public class OpenEJBEmbeddedMojo extends AbstractMojo { })); try { latch.await(); - } catch (InterruptedException e) { + } catch (final InterruptedException e) { // ignored } } @@ -94,19 +94,19 @@ public class OpenEJBEmbeddedMojo extends AbstractMojo { private ClassLoader createClassLoader(final ClassLoader parent) { final List<URL> urls = new ArrayList<URL>(); - for (Artifact artifact : (Set<Artifact>) project.getArtifacts()) { + for (final Artifact artifact : (Set<Artifact>) project.getArtifacts()) { try { urls.add(artifact.getFile().toURI().toURL()); - } catch (MalformedURLException e) { + } catch (final MalformedURLException e) { getLog().warn("can't use artifact " + artifact.toString()); } } - for (String str : modules.split(",")) { + for (final String str : modules.split(",")) { final File file = new File(str); if (file.exists()) { try { urls.add(file.toURI().toURL()); - } catch (MalformedURLException e) { + } catch (final MalformedURLException e) { getLog().warn("can't use path " + str); } } else { http://git-wip-us.apache.org/repos/asf/tomee/blob/3d86bb4d/maven/tomee-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.java ---------------------------------------------------------------------- diff --git a/maven/tomee-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.java b/maven/tomee-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.java index cd7b57e..6950ce7 100644 --- a/maven/tomee-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.java +++ b/maven/tomee-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.java @@ -200,7 +200,7 @@ public class TomEEEmbeddedMojo extends AbstractMojo { } getLog().info("TomEE embedded started on " + config.getHost() + ":" + config.getHttpPort()); - } catch (Exception e) { + } catch (final Exception e) { getLog().error("can't start TomEE", e); } http://git-wip-us.apache.org/repos/asf/tomee/blob/3d86bb4d/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractCommandMojo.java ---------------------------------------------------------------------- diff --git a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractCommandMojo.java b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractCommandMojo.java index c837912..49fca85 100644 --- a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractCommandMojo.java +++ b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractCommandMojo.java @@ -22,7 +22,7 @@ import javax.naming.InitialContext; import java.util.Properties; public abstract class AbstractCommandMojo extends AbstractAddressMojo { - protected Object lookup(String name) { + protected Object lookup(final String name) { final Properties props = new Properties(); props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory"); props.put(Context.PROVIDER_URL, "http://"; + tomeeHost + ":" + tomeeHttpPort + "/tomee/ejb"); @@ -38,7 +38,7 @@ public abstract class AbstractCommandMojo extends AbstractAddressMojo { try { return new InitialContext(props).lookup(name); - } catch (Exception e) { + } catch (final Exception e) { throw new TomEEException(e.getMessage(), e); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/3d86bb4d/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractSynchronizable.java ---------------------------------------------------------------------- diff --git a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractSynchronizable.java b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractSynchronizable.java index 32c3787..488e372 100644 --- a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractSynchronizable.java +++ b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractSynchronizable.java @@ -35,7 +35,7 @@ public abstract class AbstractSynchronizable { return updateInterval; } - public void setUpdateInterval(int updateInterval) { + public void setUpdateInterval(final int updateInterval) { this.updateInterval = updateInterval; } @@ -46,7 +46,7 @@ public abstract class AbstractSynchronizable { return extensions; } - public void setExtensions(List<String> extensions) { + public void setExtensions(final List<String> extensions) { this.extensions = extensions; } @@ -54,7 +54,7 @@ public abstract class AbstractSynchronizable { return regex; } - public void setRegex(String regex) { + public void setRegex(final String regex) { this.regex = regex; } @@ -65,7 +65,7 @@ public abstract class AbstractSynchronizable { return updateOnlyExtensions; } - public void setUpdateOnlyExtensions(List<String> updateOnlyExtensions) { + public void setUpdateOnlyExtensions(final List<String> updateOnlyExtensions) { this.updateOnlyExtensions = updateOnlyExtensions; } } http://git-wip-us.apache.org/repos/asf/tomee/blob/3d86bb4d/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/BuildTomEEMojo.java ---------------------------------------------------------------------- diff --git a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/BuildTomEEMojo.java b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/BuildTomEEMojo.java index c2a21aa..32d865f 100644 --- a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/BuildTomEEMojo.java +++ b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/BuildTomEEMojo.java @@ -61,7 +61,7 @@ public class BuildTomEEMojo extends AbstractTomEEMojo { getLog().info("Zipping Custom TomEE Distribution"); try { zip(catalinaBase, zipFile); - } catch (IOException e) { + } catch (final IOException e) { throw new MojoExecutionException(e.getMessage(), e); } http://git-wip-us.apache.org/repos/asf/tomee/blob/3d86bb4d/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/DeployMojo.java ---------------------------------------------------------------------- diff --git a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/DeployMojo.java b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/DeployMojo.java index dfa6087..b3668e5 100644 --- a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/DeployMojo.java +++ b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/DeployMojo.java @@ -56,7 +56,7 @@ public class DeployMojo extends AbstractDeployMojo { fis = new FileInputStream(path); IO.copy(fis, baos); archive = baos.toByteArray(); - } catch (Exception e) { + } catch (final Exception e) { throw new TomEEException(e.getMessage(), e); } finally { IO.close(fis); @@ -70,7 +70,7 @@ public class DeployMojo extends AbstractDeployMojo { prop.put(DeployerEjb.OPENEJB_PATH_BINARIES, new File(path).getName()); prop.put(DeployerEjb.OPENEJB_VALUE_BINARIES, archive); deployer.deploy(path, prop); - } catch (OpenEJBException e) { + } catch (final OpenEJBException e) { throw new TomEEException(e.getMessage(), e); } } else { @@ -82,7 +82,7 @@ public class DeployMojo extends AbstractDeployMojo { prop.putAll(systemVariables); deployer.deploy(path, prop); } - } catch (OpenEJBException e) { + } catch (final OpenEJBException e) { throw new TomEEException(e.getMessage(), e); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/3d86bb4d/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ListEjbMojo.java ---------------------------------------------------------------------- diff --git a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ListEjbMojo.java b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ListEjbMojo.java index 95c1c5b..d0bedef 100644 --- a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ListEjbMojo.java +++ b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ListEjbMojo.java @@ -46,9 +46,9 @@ public class ListEjbMojo extends AbstractCommandMojo { final Collection<AppInfo> infos = deployer.getDeployedApps(); final Lines lines = new Lines(); lines.add(new Line("Name", "Class", "Interface Type", "Bean Type")); - for (AppInfo info : infos) { - for (EjbJarInfo ejbJar : info.ejbJars) { - for (EnterpriseBeanInfo bean : ejbJar.enterpriseBeans) { + for (final AppInfo info : infos) { + for (final EjbJarInfo ejbJar : info.ejbJars) { + for (final EnterpriseBeanInfo bean : ejbJar.enterpriseBeans) { lines.add(new Line(bean.ejbDeploymentId, bean.ejbClass, getType(bean), componentType(bean))); } } @@ -86,19 +86,19 @@ public class ListEjbMojo extends AbstractCommandMojo { private static class LogPrinterStream extends PrintStream { private Log logger; - public LogPrinterStream(Log log) { + public LogPrinterStream(final Log log) { super(new NullOuputStream()); logger = log; } @Override - public void print(String s) { + public void print(final String s) { logger.info(s.replace(System.getProperty("line.separator"), "")); } private static class NullOuputStream extends OutputStream { @Override - public void write(int b) throws IOException { + public void write(final int b) throws IOException { // no-op } } http://git-wip-us.apache.org/repos/asf/tomee/blob/3d86bb4d/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StopTomEEMojo.java ---------------------------------------------------------------------- diff --git a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StopTomEEMojo.java b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StopTomEEMojo.java index 4a5a282..96ab467 100644 --- a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StopTomEEMojo.java +++ b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StopTomEEMojo.java @@ -45,7 +45,7 @@ public class StopTomEEMojo extends AbstractTomEEMojo { protected void serverCmd(final RemoteServer server, final List<String> strings) { try { server.forceStop(); - } catch (Exception e) { + } catch (final Exception e) { getLog().error(e.getMessage(), e); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/3d86bb4d/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/Synch.java ---------------------------------------------------------------------- diff --git a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/Synch.java b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/Synch.java index 28cc667..2b27da0 100644 --- a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/Synch.java +++ b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/Synch.java @@ -28,7 +28,7 @@ public class Synch extends AbstractSynchronizable { return source; } - public void setSource(File source) { + public void setSource(final File source) { this.source = source; } @@ -36,7 +36,7 @@ public class Synch extends AbstractSynchronizable { return target; } - public void setTarget(File target) { + public void setTarget(final File target) { this.target = target; } http://git-wip-us.apache.org/repos/asf/tomee/blob/3d86bb4d/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/Synchronization.java ---------------------------------------------------------------------- diff --git a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/Synchronization.java b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/Synchronization.java index 5f50d6a..66d6b2e 100644 --- a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/Synchronization.java +++ b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/Synchronization.java @@ -32,7 +32,7 @@ public class Synchronization extends AbstractSynchronizable { return resourcesDir; } - public void setResourcesDir(File resourcesDir) { + public void setResourcesDir(final File resourcesDir) { this.resourcesDir = resourcesDir; } @@ -40,7 +40,7 @@ public class Synchronization extends AbstractSynchronizable { return binariesDir; } - public void setBinariesDir(File binariesDir) { + public void setBinariesDir(final File binariesDir) { this.binariesDir = binariesDir; } @@ -48,7 +48,7 @@ public class Synchronization extends AbstractSynchronizable { return targetBinariesDir; } - public void setTargetBinariesDir(File targetBinariesDir) { + public void setTargetBinariesDir(final File targetBinariesDir) { this.targetBinariesDir = targetBinariesDir; } @@ -56,7 +56,7 @@ public class Synchronization extends AbstractSynchronizable { return targetResourcesDir; } - public void setTargetResourcesDir(File targetResourcesDir) { + public void setTargetResourcesDir(final File targetResourcesDir) { this.targetResourcesDir = targetResourcesDir; } http://git-wip-us.apache.org/repos/asf/tomee/blob/3d86bb4d/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/TomEEException.java ---------------------------------------------------------------------- diff --git a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/TomEEException.java b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/TomEEException.java index aff1fe4..679b120 100644 --- a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/TomEEException.java +++ b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/TomEEException.java @@ -18,11 +18,11 @@ package org.apache.openejb.maven.plugin; public class TomEEException extends RuntimeException { - public TomEEException(String s) { + public TomEEException(final String s) { super(s); } - public TomEEException(String message, Exception e) { + public TomEEException(final String message, final Exception e) { super(message, e); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/3d86bb4d/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java ---------------------------------------------------------------------- diff --git a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java index 6d751d5..7b6e28f 100644 --- a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java +++ b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java @@ -237,10 +237,10 @@ public abstract class UpdatableTomEEMojo extends AbstractTomEEMojo { @Override public void run() { int updated = 0; - for (Synchronizer s : delegates) { + for (final Synchronizer s : delegates) { try { updated += s.call(); - } catch (Exception e) { + } catch (final Exception e) { getLog().error(e.getMessage(), e); } } @@ -301,7 +301,7 @@ public abstract class UpdatableTomEEMojo extends AbstractTomEEMojo { final Collection<File> files = Files.collect(source, fileFilter); int updated = 0; - for (File file : files) { + for (final File file : files) { if (file.isDirectory() || file.lastModified() < lastUpdate) { continue; @@ -338,7 +338,7 @@ public abstract class UpdatableTomEEMojo extends AbstractTomEEMojo { if (!output.setLastModified(ts)) { getLog().debug("Can't update last modified date of " + file); } - } catch (IOException e) { + } catch (final IOException e) { getLog().error(e); } @@ -360,7 +360,7 @@ public abstract class UpdatableTomEEMojo extends AbstractTomEEMojo { try { final Context context = new InitialContext(properties); return (Deployer) context.lookup("openejb/DeployerBusinessRemote"); - } catch (NamingException e) { + } catch (final NamingException e) { throw new OpenEJBRuntimeException("Can't lookup Deployer", e); } } @@ -382,7 +382,7 @@ public abstract class UpdatableTomEEMojo extends AbstractTomEEMojo { return true; } - for (String suffix : suffixes) { + for (final String suffix : suffixes) { if (file.getName().endsWith(suffix)) { return true; } http://git-wip-us.apache.org/repos/asf/tomee/blob/3d86bb4d/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/util/Zips.java ---------------------------------------------------------------------- diff --git a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/util/Zips.java b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/util/Zips.java index 37f8e35..69d102f 100644 --- a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/util/Zips.java +++ b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/util/Zips.java @@ -42,8 +42,8 @@ public final class Zips { prefix += File.separator; } - for (String entry : entries) { - File f = new File(dir, entry); + for (final String entry : entries) { + final File f = new File(dir, entry); zip(out, f, prefix); } IO.close(out); @@ -53,7 +53,7 @@ public final class Zips { if (f.isDirectory()) { final File[] files = f.listFiles(); if (files != null) { - for (File child : files) { + for (final File child : files) { zip(out, child, prefix); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/3d86bb4d/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/test/PersistJavaagentTest.java ---------------------------------------------------------------------- diff --git a/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/test/PersistJavaagentTest.java b/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/test/PersistJavaagentTest.java index 7bc36df..cfc9b58 100644 --- a/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/test/PersistJavaagentTest.java +++ b/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/test/PersistJavaagentTest.java @@ -50,7 +50,7 @@ public class PersistJavaagentTest { // artifact was copied assertEquals(1, new File(catalinaBase, "javaagent").listFiles(new FilenameFilter() { @Override - public boolean accept(File dir, String name) { + public boolean accept(final File dir, final String name) { return name.startsWith("sirona-") && name.endsWith("-shaded.jar"); } }).length);
