Author: jgallimore
Date: Mon Apr 4 19:32:52 2011
New Revision: 1088751
URL: http://svn.apache.org/viewvc?rev=1088751&view=rev
Log:
Remove tomcat libs from openejb.war, correct the lib directory for TomEE, and
implement our own jar scanner to avoid running out of PermGen space in TomEE.
Added:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomEEJarScanner.java
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatHelper.java
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
openejb/trunk/openejb3/pom.xml
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy?rev=1088751&r1=1088750&r2=1088751&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy
Mon Apr 4 19:32:52 2011
@@ -83,6 +83,7 @@ class SetupCommand {
def execute() {
def tomcatVersion = require('tomcat.version')
+ System.setProperty('tomcat.version', tomcatVersion)
def localRepo = require('localRepository')
def openejbHome =
"${project.build.directory}/apache-tomcat-${tomcatVersion}"
def examplesVersion = require('examples.version')
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml?rev=1088751&r1=1088750&r2=1088751&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml
Mon Apr 4 19:32:52 2011
@@ -89,6 +89,7 @@
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
<version>${tomcatVersion}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml?rev=1088751&r1=1088750&r2=1088751&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml
Mon Apr 4 19:32:52 2011
@@ -66,6 +66,7 @@
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
<version>${tomcatVersion}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml?rev=1088751&r1=1088750&r2=1088751&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml
Mon Apr 4 19:32:52 2011
@@ -40,6 +40,7 @@
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
<version>${tomcatVersion}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
Added:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomEEJarScanner.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomEEJarScanner.java?rev=1088751&view=auto
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomEEJarScanner.java
(added)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomEEJarScanner.java
Mon Apr 4 19:32:52 2011
@@ -0,0 +1,47 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.openejb.tomcat.loader;
+import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
+import javax.servlet.ServletContext;
+import org.apache.tomcat.JarScannerCallback;
+import org.apache.tomcat.util.scan.StandardJarScanner;
+
+public class TomEEJarScanner extends StandardJarScanner {
+
+ public void scan(ServletContext context, ClassLoader classLoader,
JarScannerCallback callback, Set<String> jarsToIgnore) {
+ Set<String> newIgnores = new HashSet<String>();
+ if (jarsToIgnore != null) {
+ newIgnores.addAll(jarsToIgnore);
+ }
+ if
("FragmentJarScannerCallback".equals(callback.getClass().getSimpleName())) {
+ File openejbApp = new
File(System.getProperty("openejb.war"));
+ File libFolder = new File(openejbApp, "lib");
+ for (File f : libFolder.listFiles()) {
+ if (f.getName().toLowerCase().endsWith(".jar"))
{
+ newIgnores.add(f.getName());
+ }
+ }
+ }
+
+ super.scan(context, classLoader, callback, newIgnores);
+ }
+}
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatHelper.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatHelper.java?rev=1088751&r1=1088750&r2=1088751&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatHelper.java
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatHelper.java
Mon Apr 4 19:32:52 2011
@@ -17,6 +17,7 @@
*/
package org.apache.openejb.tomcat.loader;
+import java.io.File;
import java.lang.management.ManagementFactory;
import java.lang.reflect.Method;
import java.security.Principal;
@@ -133,11 +134,44 @@ public class TomcatHelper {
public static void configureJarScanner(StandardContext standardContext)
{
try {
- Object jarScanner =
StandardContext.class.getMethod("getJarScanner").invoke(standardContext);
- jarScanner.getClass().getMethod("setScanClassPath",
Boolean.TYPE).invoke(jarScanner, false);
+ Class<?> cls =
Class.forName("org.apache.openejb.tomcat.loader.TomEEJarScanner");
+ Class<?> jarScannerCls =
Class.forName("org.apache.tomcat.JarScanner");
+ Object instance = cls.newInstance();
+ StandardContext.class.getMethod("setJarScanner",
jarScannerCls).invoke(standardContext, instance);
} catch (Exception e) {
// ignore
e.printStackTrace();
}
}
+
+ /**
+ * Get a comma separated list of all jars under
$CATALINA_BASE/webapps/openejb/lib
+ * The idea is that all of these jars should be excluded from Tomcat's
scanning for web fragments
+ * because these jar don't have any fragments in, and the scanning
process is expensive in terms
+ * of PermGen space.
+ *
+ * @return list of jars as string, comma separated
+ */
+ private static String getJarsToSkip() {
+ File openejbApp = new File(System.getProperty("openejb.war"));
+ File libFolder = new File(openejbApp, "lib");
+ StringBuilder builder = new StringBuilder();
+
+ for (File f : libFolder.listFiles()) {
+ if (f.getName().startsWith("javaee-api")) continue;
+ if (f.getName().startsWith("myfaces")) continue;
+
+
+
+ if (f.getName().toLowerCase().endsWith(".jar")) {
+ if (builder.length() > 0) {
+ builder.append(",");
+ }
+
+ builder.append(f.getName());
+ }
+ }
+
+ return builder.toString();
+ }
}
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml?rev=1088751&r1=1088750&r2=1088751&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
Mon Apr 4 19:32:52 2011
@@ -218,6 +218,7 @@
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
<version>${tomcatVersion}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
Modified: openejb/trunk/openejb3/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/pom.xml?rev=1088751&r1=1088750&r2=1088751&view=diff
==============================================================================
--- openejb/trunk/openejb3/pom.xml (original)
+++ openejb/trunk/openejb3/pom.xml Mon Apr 4 19:32:52 2011
@@ -109,7 +109,7 @@
<openejb.osgi.symbolic.name>${project.groupId}.${project.artifactId}</openejb.osgi.symbolic.name>
<!-- Used in assembly/openejb-tomcat* projects -->
- <tomcatVersion>7.0.8</tomcatVersion>
+ <tomcatVersion>7.0.11</tomcatVersion>
<!--
-
http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding
@@ -954,6 +954,7 @@
<artifactId>tomcat-catalina</artifactId>
<version>${tomcatVersion}</version>
<optional>true</optional>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
