svn commit: r1232851 - in /openejb/trunk/maven-plugins/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin: AbstractTomEEMojo.java ListEjbMojo.java table/

[rm...@apache.org]

Author: rmannibucau
Date: Wed Jan 18 12:06:19 2012
New Revision: 1232851

URL: http://svn.apache.org/viewvc?rev=1232851&view=rev
Log:
usage of openejb-core lines

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

Modified: openejb/trunk/maven-plugins/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/maven-plugins/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java?rev=1232851&r1=1232850&r2=1232851&view=diff
==============================================================================
--- openejb/trunk/maven-plugins/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java (original)
+++ openejb/trunk/maven-plugins/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java Wed Jan 18 12:06:19 2012
@@ -144,18 +144,24 @@ public abstract class AbstractTomEEMojo 
     protected String webappDir;
 
     /**
-     * @parameter expression="${tomee-plugin.conf}" default-value="${basedir}/src/main/tomee/conf"
+     * @parameter expression="${tomee-plugin.conf}" default-value="${project.basedir}/src/main/tomee/conf"
      * @optional
      */
     protected File config;
 
     /**
-     * @parameter expression="${tomee-plugin.bin}" default-value="${basedir}/src/main/tomee/bin"
+     * @parameter expression="${tomee-plugin.bin}" default-value="${project.basedir}/src/main/tomee/bin"
      * @optional
      */
     protected File bin;
 
     /**
+     * @parameter expression="${tomee-plugin.lib}" default-value="${project.basedir}/src/main/tomee/lib"
+     * @optional
+     */
+    protected File lib;
+
+    /**
      * @parameter
      */
     protected Map<String, String> systemVariables;
@@ -177,6 +183,7 @@ public abstract class AbstractTomEEMojo 
         copyLibs();
         overrideConf(config);
         overrideConf(bin);
+        overrideConf(lib);
         overrideAddresses();
         copyWar();
         run();

Modified: openejb/trunk/maven-plugins/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ListEjbMojo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/maven-plugins/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ListEjbMojo.java?rev=1232851&r1=1232850&r2=1232851&view=diff
==============================================================================
--- openejb/trunk/maven-plugins/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ListEjbMojo.java (original)
+++ openejb/trunk/maven-plugins/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ListEjbMojo.java Wed Jan 18 12:06:19 2012
@@ -19,13 +19,17 @@ package org.apache.openejb.maven.plugin;
 
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.logging.Log;
 import org.apache.openejb.assembler.Deployer;
 import org.apache.openejb.assembler.classic.AppInfo;
 import org.apache.openejb.assembler.classic.EjbJarInfo;
 import org.apache.openejb.assembler.classic.EnterpriseBeanInfo;
-import org.apache.openejb.maven.plugin.table.Line;
-import org.apache.openejb.maven.plugin.table.Lines;
+import org.apache.openejb.table.Line;
+import org.apache.openejb.table.Lines;
 
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
 import java.util.Arrays;
 import java.util.Collection;
 
@@ -48,7 +52,7 @@ public class ListEjbMojo extends Abstrac
                 }
             }
         }
-        lines.print(getLog());
+        lines.print(new LogPrinterStream(getLog()));
     }
 
     private static String componentType(final EnterpriseBeanInfo bean) {
@@ -77,4 +81,25 @@ public class ListEjbMojo extends Abstrac
         }
         return sb.toString();
     }
+
+    private static class LogPrinterStream extends PrintStream {
+        private Log logger;
+
+        public LogPrinterStream(Log log) {
+            super(new NullOuputStream());
+            logger = log;
+        }
+
+        @Override
+        public void println(String x) {
+            logger.info(x);
+        }
+
+        private static class NullOuputStream extends OutputStream {
+            @Override
+            public void write(int b) throws IOException {
+                // no-op
+            }
+        }
+    }
 }