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 09:57:39 UTC
svn commit: r1239492 - in /openejb/branches/generated-descriptors:
container/openejb-core/src/main/java/org/apache/openejb/config/
container/openejb-core/src/main/resources/META-INF/
tomee/tomee-common/src/main/java/org/apache/tomee/installer/
Author: rmannibucau
Date: Thu Feb 2 08:57:38 2012
New Revision: 1239492
URL: http://svn.apache.org/viewvc?rev=1239492&view=rev
Log:
don't try to filter if you are using default include/exclude values, you'll simply loose time + adding an application-client.xml for openejb-core forcing Bootstrap.main to not be scanned (as a clientmodule)
Added:
openejb/branches/generated-descriptors/container/openejb-core/src/main/resources/META-INF/application-client.xml
Modified:
openejb/branches/generated-descriptors/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
openejb/branches/generated-descriptors/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.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=1239492&r1=1239491&r2=1239492&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 08:57:38 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);
Added: openejb/branches/generated-descriptors/container/openejb-core/src/main/resources/META-INF/application-client.xml
URL: http://svn.apache.org/viewvc/openejb/branches/generated-descriptors/container/openejb-core/src/main/resources/META-INF/application-client.xml?rev=1239492&view=auto
==============================================================================
--- openejb/branches/generated-descriptors/container/openejb-core/src/main/resources/META-INF/application-client.xml (added)
+++ openejb/branches/generated-descriptors/container/openejb-core/src/main/resources/META-INF/application-client.xml Thu Feb 2 08:57:38 2012
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+-->
+<application-client metadata-complete="true" />
Modified: openejb/branches/generated-descriptors/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
URL: http://svn.apache.org/viewvc/openejb/branches/generated-descriptors/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java?rev=1239492&r1=1239491&r2=1239492&view=diff
==============================================================================
--- openejb/branches/generated-descriptors/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java (original)
+++ openejb/branches/generated-descriptors/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java Thu Feb 2 08:57:38 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");