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/02/02 15:06:42 UTC
svn commit: r1239626 - in /openejb/trunk/openejb:
container/openejb-core/src/main/java/org/apache/openejb/config/
tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/
tomee/tomee-embedded/src/main/resources/org/apache/tomee/configs/
tomee/tome...
Author: rmannibucau
Date: Thu Feb 2 14:06:41 2012
New Revision: 1239626
URL: http://svn.apache.org/viewvc?rev=1239626&view=rev
Log:
Merged from generated-descriptors
fixing commons-lang for osgi and openjpa and more aggressive scanning (mainly a typo in tomee jar scanner) [from revision 1239610]
ability to set offline mode from a system property [from revision 1239615]
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
openejb/trunk/openejb/tomee/tomee-embedded/src/main/resources/org/apache/tomee/configs/catalina.properties
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=1239626&r1=1239625&r2=1239626&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java Thu Feb 2 14:06:41 2012
@@ -115,9 +115,10 @@ public class ConfigurationFactory implem
private final boolean offline;
private static final String CLASSPATH_AS_EAR = "openejb.deployments.classpath.ear";
static final String WEBSERVICES_ENABLED = "openejb.webservices.enabled";
+ static final String OFFLINE_PROPERTY = "openejb.offline";
public ConfigurationFactory() {
- this(false);
+ this(Boolean.getBoolean(ConfigurationFactory.OFFLINE_PROPERTY));
}
public ConfigurationFactory(final boolean offline) {
Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java?rev=1239626&r1=1239625&r2=1239626&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java Thu Feb 2 14:06:41 2012
@@ -40,9 +40,11 @@ import org.apache.openejb.server.Service
import org.apache.openejb.server.ServiceManager;
import org.apache.openejb.server.ejbd.EjbServer;
import org.apache.openejb.spi.Service;
+import org.apache.openejb.util.Join;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
import org.apache.openejb.util.OptionsLog;
+import org.apache.tomcat.util.scan.Constants;
import org.apache.tomee.installer.Installer;
import org.apache.tomee.installer.Paths;
import org.apache.tomee.loader.TomcatHelper;
@@ -210,6 +212,7 @@ public class TomcatLoader implements Loa
}
}
NewLoaderLogic.setExclusions(exclusions.toArray(new String[exclusions.size()]));
+ System.setProperty(Constants.SKIP_JARS_PROPERTY, Join.join(",", exclusions));
// Install tomcat war builder
TomcatWebAppBuilder tomcatWebAppBuilder = (TomcatWebAppBuilder) SystemInstance.get().getComponent(WebAppBuilder.class);
Modified: openejb/trunk/openejb/tomee/tomee-embedded/src/main/resources/org/apache/tomee/configs/catalina.properties
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-embedded/src/main/resources/org/apache/tomee/configs/catalina.properties?rev=1239626&r1=1239625&r2=1239626&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-embedded/src/main/resources/org/apache/tomee/configs/catalina.properties (original)
+++ openejb/trunk/openejb/tomee/tomee-embedded/src/main/resources/org/apache/tomee/configs/catalina.properties Thu Feb 2 14:06:41 2012
@@ -100,7 +100,14 @@ xercesImpl.jar,xmlParserAPIs.jar,xml-api
dnsns.jar,ldapsec.jar,localedata.jar,sunjce_provider.jar,sunpkcs11.jar,tools.jar,\
apple_provider.jar,AppleScriptEngine.jar,CoreAudio.jar,dns_sd.jar,\
j3daudio.jar,j3dcore.jar,j3dutils.jar,jai_core.jar,jai_codec.jar,\
-mlibwrapper_jai.jar,MRJToolkit.jar,vecmath.jar
+mlibwrapper_jai.jar,MRJToolkit.jar,vecmath.jar,\
+hsqldb-*,openejb-core-*,xbean-*,derby*,mbean-annotation-*,\
+javassit*,commons-*,swizzle-stream-*,serp-*,geronimo-javamail-*,geronimo-mail-*,\
+openejb-jee-*,openejb-core-*,openejb-loader-*,openejb-api-*,openejb-derby*,\
+openwebbeans-ejb-*,openwebbeans-impl-*,\
+bval-*,\
+tomee-loader-*,openejb-javaagent-*,openejb-ejbd-*,scannotation-*,openejb-server-*,\
+openjpa-*,quartz-*,openejb-http-*,kahadb-*
#
# String cache configuration.
Modified: openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java?rev=1239626&r1=1239625&r2=1239626&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java (original)
+++ openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java Thu Feb 2 14:06:41 2012
@@ -26,8 +26,8 @@ import javax.servlet.ServletContext;
import java.util.Set;
public class TomEEJarScanner extends StandardJarScanner {
-
- public void sNcan(ServletContext context, ClassLoader classLoader, JarScannerCallback callback, Set<String> jarsToIgnore) {
+ @Override
+ public void scan(ServletContext context, ClassLoader classLoader, JarScannerCallback callback, Set<String> jarsToIgnore) {
if ("FragmentJarScannerCallback".equals(callback.getClass().getSimpleName())) {
EmbeddedJarScanner embeddedJarScanner = new EmbeddedJarScanner();
embeddedJarScanner.scan(context, classLoader, callback, jarsToIgnore);
Modified: openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java?rev=1239626&r1=1239625&r2=1239626&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java (original)
+++ openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java Thu Feb 2 14:06:41 2012
@@ -17,19 +17,18 @@
*/
package org.apache.tomee.loader;
-import java.io.File;
-import java.lang.management.ManagementFactory;
-import java.lang.reflect.Method;
-import java.security.Principal;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-
import org.apache.catalina.Realm;
import org.apache.catalina.Wrapper;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.core.StandardServer;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import java.io.File;
+import java.lang.management.ManagementFactory;
+import java.lang.reflect.Method;
+import java.security.Principal;
+
public class TomcatHelper {
private static boolean stopping = false;
@@ -148,13 +147,9 @@ public class TomcatHelper {
public static void configureJarScanner(StandardContext standardContext) {
try {
- Class<?> cls = Class.forName("org.apache.tomee.loader.TomEEJarScanner");
- Class<?> jarScannerCls = Class.forName("org.apache.tomcat.JarScanner");
- Object instance = cls.newInstance();
- StandardContext.class.getMethod("setJarScanner", jarScannerCls).invoke(standardContext, instance);
+ standardContext.setJarScanner(new TomEEJarScanner());
} catch (Exception e) {
// ignore
- e.printStackTrace();
}
}