svn commit: r1384581 - in /openejb/trunk/openejb: container/openejb-core/src/main/java/org/apache/openejb/core/timer/ maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ tomee/tomee-util/src/main/java/org/apache/tomee/util/

[rm...@apache.org]

Author: rmannibucau
Date: Thu Sep 13 22:37:45 2012
New Revision: 1384581

URL: http://svn.apache.org/viewvc?rev=1384581&view=rev
Log:
bad key in quick server.xml parsing

Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/timer/DefaultTimerThreadPoolAdapter.java
    openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
    openejb/trunk/openejb/tomee/tomee-util/src/main/java/org/apache/tomee/util/QuickServerXmlParser.java

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/timer/DefaultTimerThreadPoolAdapter.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/timer/DefaultTimerThreadPoolAdapter.java?rev=1384581&r1=1384580&r2=1384581&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/timer/DefaultTimerThreadPoolAdapter.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/timer/DefaultTimerThreadPoolAdapter.java Thu Sep 13 22:37:45 2012
@@ -17,21 +17,17 @@
 
 package org.apache.openejb.core.timer;
 
-import org.apache.openejb.loader.Options;
 import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.util.DaemonThreadFactory;
 import org.apache.openejb.util.ExecutorBuilder;
 import org.apache.openejb.util.LogCategory;
 import org.apache.openejb.util.Logger;
-import org.apache.openejb.util.executor.OfferRejectedExecutionHandler;
 import org.quartz.SchedulerConfigException;
 import org.quartz.spi.ThreadPool;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.RejectedExecutionHandler;
-import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @version $Rev$ $Date$
@@ -161,7 +157,17 @@ public class DefaultTimerThreadPoolAdapt
 
     @Override
     public void shutdown(final boolean arg0) {
-        //TODO Seems we should never try to shutdown the thread pool, as it is shared in global scope
+        if (threadPoolExecutorUsed) {
+            final ThreadPoolExecutor tpe = (ThreadPoolExecutor) executor;
+            tpe.shutdown();
+            if (arg0) {
+                try {
+                    tpe.awaitTermination(1, TimeUnit.HOURS);
+                } catch (InterruptedException e) {
+                    logger.error(e.getMessage(), e);
+                }
+            }
+        }
     }
 
     public int getThreadCount() {

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=1384581&r1=1384580&r2=1384581&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 Thu Sep 13 22:37:45 2012
@@ -271,7 +271,7 @@ public abstract class AbstractTomEEMojo 
     }
 
     private void removeDefaultWebapps() {
-        final File webapps = new File(catalinaBase, "webapps");
+        final File webapps = new File(catalinaBase, webappDir);
         if (webapps.isDirectory()) {
             for (File webapp : webapps.listFiles()) {
                 final String name = webapp.getName();

Modified: openejb/trunk/openejb/tomee/tomee-util/src/main/java/org/apache/tomee/util/QuickServerXmlParser.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-util/src/main/java/org/apache/tomee/util/QuickServerXmlParser.java?rev=1384581&r1=1384580&r2=1384581&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-util/src/main/java/org/apache/tomee/util/QuickServerXmlParser.java (original)
+++ openejb/trunk/openejb/tomee/tomee-util/src/main/java/org/apache/tomee/util/QuickServerXmlParser.java Thu Sep 13 22:37:45 2012
@@ -37,7 +37,7 @@ public class QuickServerXmlParser extend
     private static final String HTTP_KEY = "HTTP";
     private static final String AJP_KEY = "AJP";
     private static final String HOST_KEY = "host";
-    private static final String APP_BASE_KEY = "host";
+    private static final String APP_BASE_KEY = "app-base";
     private static final String DEFAULT_CONNECTOR_KEY = HTTP_KEY;
 
     public static final String DEFAULT_HTTP_PORT = "8080";