Author: dblevins
Date: Sun Sep 16 00:14:42 2007
New Revision: 576056
URL: http://svn.apache.org/viewvc?rev=576056&view=rev
Log:
Added flag to cut out system apps while embedded testing
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/SomeoneBrokeSurefireAndThisIsADirtyHackForItTest.java
openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/SomeoneBrokeSurefireAndThisIsADirtyHackForItTest.java
openejb/trunk/openejb3/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/SomeoneBrokeSurefireAndThisIsADirtyHackForItTest.java
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java?rev=576056&r1=576055&r2=576056&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
Sun Sep 16 00:14:42 2007
@@ -40,6 +40,7 @@
private static final String CLASSPATH_EXCLUDE =
"openejb.deployments.classpath.exclude";
private static final String CLASSPATH_REQUIRE_DESCRIPTOR =
"openejb.deployments.classpath.require.descriptor";
private static final String CLASSPATH_FILTER_DESCRIPTORS =
"openejb.deployments.classpath.filter.descriptors";
+ private static final String CLASSPATH_FILTER_SYSTEMAPPS =
"openejb.deployments.classpath.filter.systemapps";
private static final Logger logger = DeploymentLoader.logger;
private static void loadFrom(Deployments dep, FileUtils path, List<String>
jarList) {
@@ -175,9 +176,11 @@
exclude = SystemInstance.get().getProperty(CLASSPATH_EXCLUDE, ".*");
boolean requireDescriptors =
SystemInstance.get().getProperty(CLASSPATH_REQUIRE_DESCRIPTOR,
"false").equalsIgnoreCase("true");
boolean filterDescriptors =
SystemInstance.get().getProperty(CLASSPATH_FILTER_DESCRIPTORS,
"false").equalsIgnoreCase("true");
+ boolean filterSystemApps =
SystemInstance.get().getProperty(CLASSPATH_FILTER_SYSTEMAPPS,
"true").equalsIgnoreCase("true");
logger.debug("Using "+CLASSPATH_INCLUDE+" '"+include+"'");
logger.debug("Using "+CLASSPATH_EXCLUDE+" '"+exclude+"'");
+ logger.debug("Using "+CLASSPATH_FILTER_SYSTEMAPPS+"
'"+filterSystemApps+"'");
logger.debug("Using "+CLASSPATH_FILTER_DESCRIPTORS+"
'"+filterDescriptors+"'");
logger.debug("Using "+CLASSPATH_REQUIRE_DESCRIPTOR+"
'"+requireDescriptors+"'");
@@ -194,6 +197,10 @@
urlSet = urlSet.exclude(exclude);
urlSet = urlSet.include(includes);
+ if (filterSystemApps){
+ urlSet = urlSet.exclude(".*/openejb-.*");
+ }
+
List<URL> urls = urlSet.getUrls();
int size = urls.size();
if (size == 0 && include.length() > 0) {
@@ -217,6 +224,9 @@
if (!filterDescriptors){
UrlSet unchecked = prefiltered.exclude(urlSet);
+ if (filterSystemApps){
+ unchecked = unchecked.exclude(".*/openejb-.*");
+ }
processUrls(unchecked.getUrls(), classLoader, false, base,
jarList);
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/SomeoneBrokeSurefireAndThisIsADirtyHackForItTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/SomeoneBrokeSurefireAndThisIsADirtyHackForItTest.java?rev=576056&r1=576055&r2=576056&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/SomeoneBrokeSurefireAndThisIsADirtyHackForItTest.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/SomeoneBrokeSurefireAndThisIsADirtyHackForItTest.java
Sun Sep 16 00:14:42 2007
@@ -39,6 +39,7 @@
System.setProperty("openejb.assembler",
org.apache.openejb.assembler.classic.Assembler.class.getName());
System.setProperty("openejb.deployments.classpath.include",
".*openejb-itests-*.*");
System.setProperty("openejb.deployments.classpath.filter.descriptors",
"true");
+ System.setProperty("openejb.deployments.classpath.filter.systemapps",
"false");
return iTest.suite();
}
}
Modified:
openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/SomeoneBrokeSurefireAndThisIsADirtyHackForItTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/SomeoneBrokeSurefireAndThisIsADirtyHackForItTest.java?rev=576056&r1=576055&r2=576056&view=diff
==============================================================================
---
openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/SomeoneBrokeSurefireAndThisIsADirtyHackForItTest.java
(original)
+++
openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/SomeoneBrokeSurefireAndThisIsADirtyHackForItTest.java
Sun Sep 16 00:14:42 2007
@@ -38,6 +38,8 @@
public static Test suite() {
System.setProperty("openejb.assembler",
org.apache.openejb.assembler.classic.Assembler.class.getName());
System.setProperty("openejb.deployments.classpath.include",
".*openejb-itests-beans.*");
+ System.setProperty("openejb.deployments.classpath.filter.systemapps",
"false");
+
return RemoteiTest.suite();
}
}
Modified:
openejb/trunk/openejb3/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/SomeoneBrokeSurefireAndThisIsADirtyHackForItTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/SomeoneBrokeSurefireAndThisIsADirtyHackForItTest.java?rev=576056&r1=576055&r2=576056&view=diff
==============================================================================
---
openejb/trunk/openejb3/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/SomeoneBrokeSurefireAndThisIsADirtyHackForItTest.java
(original)
+++
openejb/trunk/openejb3/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/SomeoneBrokeSurefireAndThisIsADirtyHackForItTest.java
Sun Sep 16 00:14:42 2007
@@ -38,6 +38,7 @@
public static Test suite() {
System.setProperty("openejb.assembler",
org.apache.openejb.assembler.classic.Assembler.class.getName());
System.setProperty("openejb.deployments.classpath.include",
".*openejb-itests-beans.*");
+ System.setProperty("openejb.deployments.classpath.filter.systemapps",
"false");
return HttpEjbServerTest.suite();
}
}
Modified:
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java?rev=576056&r1=576055&r2=576056&view=diff
==============================================================================
---
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java
(original)
+++
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java
Sun Sep 16 00:14:42 2007
@@ -58,6 +58,7 @@
File home = system.getHome().getDirectory();
system.setProperty("openejb.deployments.classpath.include",
".*/"+home.getName()+"/lib/.*");
system.setProperty("openejb.deployments.classpath.require.descriptor",
"true");
+ system.setProperty("openejb.deployments.classpath.filter.systemapps",
"false");
OpenEJB.init(props, new ServerFederation());
