tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1239628 - in /openejb/trunk/openejb: ./ container/openejb-core/src/main/java/org/apache/openejb/config/ container/openejb-core/src/main/resources/META-INF/ container/openejb-core/src/test/java/org/apache/openejb/config/ container/openejb-j...
Date Thu, 02 Feb 2012 14:09:36 GMT
Author: rmannibucau
Date: Thu Feb  2 14:09:36 2012
New Revision: 1239628

URL: http://svn.apache.org/viewvc?rev=1239628&view=rev
Log:
merging from generated descriptors changes impacting performances

Added:
    openejb/trunk/openejb/container/openejb-core/src/main/resources/META-INF/application-client.xml
      - copied unchanged from r1239492, openejb/branches/generated-descriptors/container/openejb-core/src/main/resources/META-INF/application-client.xml
Modified:
    openejb/trunk/openejb/   (props changed)
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
    openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
  (props changed)
    openejb/trunk/openejb/container/openejb-jee/src/test/resources/jsf/   (props changed)
    openejb/trunk/openejb/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml
  (props changed)
    openejb/trunk/openejb/examples/application-composer/   (props changed)
    openejb/trunk/openejb/src/   (props changed)
    openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java

Propchange: openejb/trunk/openejb/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  2 14:09:36 2012
@@ -1,3 +1,4 @@
+/openejb/branches/generated-descriptors:1239492,1239514,1239610,1239615
 /openejb/branches/openejb-3.1.1:779593
 /openejb/branches/openejb-3.1.x:945409,945448,1004381,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527,1027696,1027724,1027739,1027754,1032856,1032866,1034030,1040222,1040250
 /openejb/branches/openejb-4.0.0-beta-2:1227467

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1239628&r1=1239627&r2=1239628&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
(original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Thu Feb  2 14:09:36 2012
@@ -1461,10 +1461,6 @@ public class DeploymentLoader implements
             return AppModule.class;
         }
 
-        if (descriptors.containsKey("application-client.xml")) {
-            return ClientModule.class;
-        }
-
         if (descriptors.containsKey("ra.xml") || path.endsWith(".rar")) {
             return ConnectorModule.class;
         }
@@ -1481,6 +1477,10 @@ public class DeploymentLoader implements
             return EjbModule.class;
         }
 
+        if (descriptors.containsKey("application-client.xml")) {
+            return ClientModule.class;
+        }
+
         final URL manifestUrl = descriptors.get("MANIFEST.MF");
         if (scanPotentialClientModules && manifestUrl != null) {
             // In this case scanPotentialClientModules really means "require application-client.xml"

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java?rev=1239628&r1=1239627&r2=1239628&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
(original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
Thu Feb  2 14:09:36 2012
@@ -192,7 +192,6 @@ public class DeploymentsResolver impleme
             UrlSet urlSet = new UrlSet(classLoader);
 
             //final UrlSet includes = urlSet.matching(include);
-
             urlSet = urlSet.exclude(ClassLoader.getSystemClassLoader().getParent());
             urlSet = urlSet.excludeJavaExtDirs();
             urlSet = urlSet.excludeJavaEndorsedDirs();
@@ -205,10 +204,11 @@ public class DeploymentsResolver impleme
             final UrlSet prefiltered = urlSet;
 
             // we should exclude system apps before and apply user properties after
-
-            final IncludeExcludeFilter filter = new IncludeExcludeFilter(Filters.patterns(include),
Filters.patterns(exclude));
-            // filter using user parameters
-            urlSet = urlSet.filter(filter);
+            if (!".*".equals(include) && !"".equals(exclude)) { // if we are using
default this will not do anything
+                final IncludeExcludeFilter filter = new IncludeExcludeFilter(Filters.patterns(include),
Filters.patterns(exclude));
+                // filter using user parameters
+                urlSet = urlSet.filter(filter);
+            }
 
             if (prefiltered.size() == urlSet.size()) {
                 urlSet = NewLoaderLogic.applyBuiltinExcludes(urlSet);
@@ -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/?)");
                 }

Propchange: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  2 14:09:36 2012
@@ -1,3 +1,4 @@
+/openejb/branches/generated-descriptors/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:1239492,1239514,1239610,1239615
 /openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593
 /openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527,1027696,1027724,1027739,1027754,1032856,1032866,1034030,1040222,1040250
 /openejb/branches/openejb-4.0.0-beta-2/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:1227467

Propchange: openejb/trunk/openejb/container/openejb-jee/src/test/resources/jsf/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  2 14:09:36 2012
@@ -1,5 +1,6 @@
 /geronimo/server/branches/2.2/plugins/myfaces/geronimo-myfaces-builder/src/test/resources:832538,885058
 /geronimo/server/branches/3.0-M1/plugins/myfaces/geronimo-myfaces-builder/src/test/resources:948864,951792
 /geronimo/server/trunk/plugins/j2ee/myfaces/geronimo-myfaces-builder/src/test/resources:887507
+/openejb/branches/generated-descriptors/container/openejb-jee/src/test/resources/jsf:1239492,1239514,1239610,1239615
 /openejb/branches/openejb-4.0.0-beta-2/container/openejb-jee/src/test/resources/jsf:1227467
 /openejb/branches/openejb-jcdi/container/openejb-jee/src/test/resources/jsf:984659-985270

Propchange: openejb/trunk/openejb/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  2 14:09:36 2012
@@ -1,3 +1,4 @@
+/openejb/branches/generated-descriptors/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:1239492,1239514,1239610,1239615
 /openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593
 /openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527,1027696,1027724,1027739,1027754,1032856,1032866,1034030,1040222,1040250
 /openejb/branches/openejb-4.0.0-beta-2/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:1227467

Propchange: openejb/trunk/openejb/examples/application-composer/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  2 14:09:36 2012
@@ -1,3 +1,4 @@
+/openejb/branches/generated-descriptors/examples/application-composer:1239492,1239514,1239610,1239615
 /openejb/branches/openejb-3.1.1/examples/application-composer:779593
 /openejb/branches/openejb-4.0.0-beta-2/examples/application-composer:1227467
 /openejb/trunk/openejb3/examples/application-composer:943472,943862,943965,944757,945989,946399,946485,946489,946705,946792,946805,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548,949014,949233,950391,950801,951611,953191,953196,953556,955104,955496,957463,962382,962750,987030,1004172,1029528

Propchange: openejb/trunk/openejb/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  2 14:09:36 2012
@@ -1,3 +1,4 @@
+/openejb/branches/generated-descriptors/src:1239492,1239514,1239610,1239615
 /openejb/branches/openejb-3.1.1/src:779593
 /openejb/branches/openejb-4.0.0-beta-2/src:1227467
 /openejb/trunk/openejb3/src:943472,943862,943965,944757,945989,946399,946485,946489,946705,946792,946805,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548,949014,949233,950391,950801,951611,953191,953196,953556,955104,955496,957463,962382,962750,987030,1004172,1029528

Modified: openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java?rev=1239628&r1=1239627&r2=1239628&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
(original)
+++ openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
Thu Feb  2 14:09:36 2012
@@ -490,7 +490,7 @@ public class Installer {
                 systemPropertiesWriter.write("# openejb.jmx.active = true\n");
                 systemPropertiesWriter.write("# openejb.nobanner = true\n");
                 systemPropertiesWriter.write("# openejb.crosscontext = false\n");
-                systemPropertiesWriter.write("# openejb.version.check.skip = false\n");
+                systemPropertiesWriter.write("# openejb.version.check = false\n");
                 systemPropertiesWriter.write("# openejb.version.check.repo.url = http://repo1.maven.org/maven2/org/apache/openejb/\n");
                 systemPropertiesWriter.write("# openejb.version.check.url = http://repo1.maven.org/maven2/org/apache/openejb/openejb/maven-metadata.xml\n");
                 systemPropertiesWriter.write("# openejb.jsessionid-support = \n");



Mime
View raw message