svn commit: r1504383 - /tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java

[rmannibucau]

Author: rmannibucau
Date: Thu Jul 18 08:01:22 2013
New Revision: 1504383

URL: http://svn.apache.org/r1504383
Log:
TOMEE-1005 ensuring to use conf/lib/bin dir when copying resources

Modified:
    
tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java

Modified: 
tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java?rev=1504383&r1=1504382&r2=1504383&view=diff
==============================================================================
--- 
tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
 (original)
+++ 
tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
 Thu Jul 18 08:01:22 2013
@@ -254,11 +254,11 @@ public abstract class AbstractTomEEMojo 
         copyLibs(libs, new File(catalinaBase, libDir), "jar");
         copyLibs(webapps, new File(catalinaBase, webappDir), "war");
         copyLibs(apps, new File(catalinaBase, appDir), "jar");
-        overrideConf(config);
-        overrideConf(lib);
-        final Collection<File> copied = overrideConf(bin);
+        overrideConf(config, "conf");
+        overrideConf(lib, "lib");
+        final Collection<File> copied = overrideConf(bin, "bin");
 
-        for (File copy : copied) {
+        for (final File copy : copied) {
             if (copy.getName().endsWith(".bat") || 
copy.getName().endsWith(".sh")) {
                 if (!copy.setExecutable(true)) {
                     getLog().warn("can't make " + copy.getPath() + " 
executable");
@@ -562,7 +562,7 @@ public abstract class AbstractTomEEMojo 
         }
     }
 
-    private Collection<File> overrideConf(final File dir) {
+    private Collection<File> overrideConf(final File dir, final String 
baseDir) {
         if (!dir.exists()) {
             return Collections.emptyList();
         }
@@ -575,7 +575,7 @@ public abstract class AbstractTomEEMojo 
                     continue;
                 }
 
-                final String file = dir.getName() + "/" + f.getName();
+                final String file = baseDir + "/" + f.getName();
                 final File destination = new File(catalinaBase, file);
                 if (f.isDirectory()) {
                     Files.mkdirs(destination);