You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/06/11 18:17:57 UTC
svn commit: r1348931 -
/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
Author: rmannibucau
Date: Mon Jun 11 16:17:57 2012
New Revision: 1348931
URL: http://svn.apache.org/viewvc?rev=1348931&view=rev
Log:
allowing folder in src/main/tomee/*
Modified:
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
Modified: openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java?rev=1348931&r1=1348930&r2=1348931&view=diff
==============================================================================
--- openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java (original)
+++ openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java Mon Jun 11 16:17:57 2012
@@ -47,7 +47,7 @@ import org.apache.maven.plugin.MojoExecu
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.settings.Settings;
import org.apache.openejb.config.RemoteServer;
-import org.apache.openejb.loader.FileUtils;
+import org.apache.openejb.loader.Files;
import org.apache.openejb.loader.IO;
import org.apache.openejb.loader.Zips;
@@ -459,25 +459,34 @@ public abstract class AbstractTomEEMojo
final File[] files = dir.listFiles();
if (files != null) {
for (final File f : files) {
- if (f.isDirectory() || f.isHidden()) {
+ if (f.isHidden()) {
continue;
}
final String file = dir.getName() + "/" + f.getName();
-
- InputStream in = null;
- OutputStream out = null;
- try {
- in = new FileInputStream(f);
- out = new FileOutputStream(new File(catalinaBase, file));
- copy(in, out);
-
- getLog().info("Override '" + file + "'");
- } catch (Exception e) {
- throw new TomEEException(e.getMessage(), e);
- } finally {
- close(in);
- close(out);
+ final File destination = new File(catalinaBase, file);
+ if (f.isDirectory()) {
+ Files.mkdirs(destination);
+ try {
+ IO.copyDirectory(f, destination);
+ } catch (IOException e) {
+ throw new TomEEException(e.getMessage(), e);
+ }
+ } else {
+ InputStream in = null;
+ OutputStream out = null;
+ try {
+ in = new FileInputStream(f);
+ out = new FileOutputStream(destination);
+ copy(in, out);
+
+ getLog().info("Override '" + file + "'");
+ } catch (Exception e) {
+ throw new TomEEException(e.getMessage(), e);
+ } finally {
+ close(in);
+ close(out);
+ }
}
}
}