tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1239610 - in /openejb/branches/generated-descriptors: container/openejb-core/src/main/java/org/apache/openejb/config/ osgi/openejb-feature/src/main/feature/ tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ tomee/tomee-embedded...
Date Thu, 02 Feb 2012 13:30:16 GMT
Author: rmannibucau
Date: Thu Feb  2 13:30:16 2012
New Revision: 1239610

URL: http://svn.apache.org/viewvc?rev=1239610&view=rev
Log:
fixing commons-lang for osgi and openjpa and more aggressive scanning (mainly a typo in tomee
jar scanner)

Modified:
    openejb/branches/generated-descriptors/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
    openejb/branches/generated-descriptors/osgi/openejb-feature/src/main/feature/feature.xml
    openejb/branches/generated-descriptors/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
    openejb/branches/generated-descriptors/tomee/tomee-embedded/src/main/resources/org/apache/tomee/configs/catalina.properties
    openejb/branches/generated-descriptors/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
    openejb/branches/generated-descriptors/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java

Modified: openejb/branches/generated-descriptors/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
URL: http://svn.apache.org/viewvc/openejb/branches/generated-descriptors/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java?rev=1239610&r1=1239609&r2=1239610&view=diff
==============================================================================
--- openejb/branches/generated-descriptors/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
(original)
+++ openejb/branches/generated-descriptors/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
Thu Feb  2 13:30:16 2012
@@ -256,7 +256,7 @@ public class DeploymentsResolver impleme
 
             UrlSet unchecked = new UrlSet();
             if (!filterDescriptors) {
-                unchecked = prefiltered.exclude(urlSet);
+                unchecked = NewLoaderLogic.applyBuiltinExcludes(prefiltered.exclude(urlSet));
                 if (filterSystemApps) {
                     unchecked = unchecked.exclude(".*/openejb-[^/]+(.(jar|ear|war)(./)?|/target/classes/?)");
                 }

Modified: openejb/branches/generated-descriptors/osgi/openejb-feature/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/openejb/branches/generated-descriptors/osgi/openejb-feature/src/main/feature/feature.xml?rev=1239610&r1=1239609&r2=1239610&view=diff
==============================================================================
--- openejb/branches/generated-descriptors/osgi/openejb-feature/src/main/feature/feature.xml
(original)
+++ openejb/branches/generated-descriptors/osgi/openejb-feature/src/main/feature/feature.xml
Thu Feb  2 13:30:16 2012
@@ -17,7 +17,7 @@
     limitations under the License.
 -->
 
-<features>
+<features name="openejb-features">
   <repository>mvn:org.apache.openejb/javaee-api/${javaee-api.version}/xml/features</repository>
   <repository>mvn:org.apache.activemq/activemq-karaf/${org.apache.activemq.version}/xml/features</repository>
 

Modified: openejb/branches/generated-descriptors/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
URL: http://svn.apache.org/viewvc/openejb/branches/generated-descriptors/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java?rev=1239610&r1=1239609&r2=1239610&view=diff
==============================================================================
--- openejb/branches/generated-descriptors/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
(original)
+++ openejb/branches/generated-descriptors/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
Thu Feb  2 13:30:16 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/branches/generated-descriptors/tomee/tomee-embedded/src/main/resources/org/apache/tomee/configs/catalina.properties
URL: http://svn.apache.org/viewvc/openejb/branches/generated-descriptors/tomee/tomee-embedded/src/main/resources/org/apache/tomee/configs/catalina.properties?rev=1239610&r1=1239609&r2=1239610&view=diff
==============================================================================
--- openejb/branches/generated-descriptors/tomee/tomee-embedded/src/main/resources/org/apache/tomee/configs/catalina.properties
(original)
+++ openejb/branches/generated-descriptors/tomee/tomee-embedded/src/main/resources/org/apache/tomee/configs/catalina.properties
Thu Feb  2 13:30:16 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/branches/generated-descriptors/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
URL: http://svn.apache.org/viewvc/openejb/branches/generated-descriptors/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java?rev=1239610&r1=1239609&r2=1239610&view=diff
==============================================================================
--- openejb/branches/generated-descriptors/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
(original)
+++ openejb/branches/generated-descriptors/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
Thu Feb  2 13:30:16 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/branches/generated-descriptors/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java
URL: http://svn.apache.org/viewvc/openejb/branches/generated-descriptors/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java?rev=1239610&r1=1239609&r2=1239610&view=diff
==============================================================================
--- openejb/branches/generated-descriptors/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java
(original)
+++ openejb/branches/generated-descriptors/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java
Thu Feb  2 13:30:16 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();
 		}
 	}
 



Mime
View raw message