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/01/26 17:34:51 UTC
svn commit: r1236277 - in /openejb/trunk/openejb:
arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java
container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Author: rmannibucau
Date: Thu Jan 26 16:34:51 2012
New Revision: 1236277
URL: http://svn.apache.org/viewvc?rev=1236277&view=rev
Log:
in embedded mode we shouldnt get the system classloader as parent classloader when getting web resources
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java?rev=1236277&r1=1236276&r2=1236277&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java Thu Jan 26 16:34:51 2012
@@ -20,7 +20,7 @@ import org.apache.openejb.arquillian.com
import org.apache.openejb.arquillian.common.MavenCache;
import org.apache.openejb.arquillian.common.TomEEContainer;
import org.apache.openejb.config.RemoteServer;
-import org.apache.openejb.resolver.Resolver;
+import org.apache.openejb.loader.ProvisioningUtil;
import org.apache.tomee.installer.Installer;
import org.apache.tomee.installer.Paths;
import org.jboss.arquillian.container.spi.client.container.LifecycleException;
@@ -185,17 +185,17 @@ public class RemoteTomEEContainer extend
}
protected File downloadFile(String artifactName, String altUrl) {
- final String cache = System.getProperty(Resolver.OPENEJB_DEPLOYER_CACHE_FOLDER);
- System.setProperty(Resolver.OPENEJB_DEPLOYER_CACHE_FOLDER, "target");
+ final String cache = System.getProperty(ProvisioningUtil.OPENEJB_DEPLOYER_CACHE_FOLDER);
+ System.setProperty(ProvisioningUtil.OPENEJB_DEPLOYER_CACHE_FOLDER, "target");
try {
final File artifact = new MavenCache().getArtifact(artifactName, altUrl);
if (artifact == null) throw new NullPointerException(String.format("No such artifact: %s", artifactName));
return artifact;
} finally {
if (cache == null) {
- System.getProperties().remove(Resolver.OPENEJB_DEPLOYER_CACHE_FOLDER);
+ System.getProperties().remove(ProvisioningUtil.OPENEJB_DEPLOYER_CACHE_FOLDER);
} else {
- System.setProperty(Resolver.OPENEJB_DEPLOYER_CACHE_FOLDER, cache);
+ System.setProperty(ProvisioningUtil.OPENEJB_DEPLOYER_CACHE_FOLDER, cache);
}
}
}
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=1236277&r1=1236276&r2=1236277&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 Jan 26 16:34:51 2012
@@ -21,6 +21,7 @@ import org.apache.openejb.OpenEJB;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.api.LocalClient;
import org.apache.openejb.api.RemoteClient;
+import org.apache.openejb.core.EmptyResourcesClassLoader;
import org.apache.openejb.jee.Application;
import org.apache.openejb.jee.ApplicationClient;
import org.apache.openejb.jee.Beans;
@@ -31,7 +32,6 @@ import org.apache.openejb.jee.JavaWsdlMa
import org.apache.openejb.jee.JaxbJavaee;
import org.apache.openejb.jee.JspConfig;
import org.apache.openejb.jee.Module;
-import org.apache.openejb.jee.ParamValue;
import org.apache.openejb.jee.Taglib;
import org.apache.openejb.jee.TldTaglib;
import org.apache.openejb.jee.WebApp;
@@ -661,14 +661,6 @@ public class DeploymentLoader implements
addWebservices(webEjbModule);
}
- private Properties getContextParams(List<ParamValue> contextParam) {
- Properties properties = new Properties();
- for (ParamValue paramValue : contextParam) {
- properties.put(paramValue.getParamName(), paramValue.getParamValue());
- }
- return properties;
- }
-
protected WebModule createWebModule(String appId, String warPath, ClassLoader parentClassLoader, String contextRoot, String moduleName) throws OpenEJBException {
File warFile = new File(warPath);
warFile = unpack(warFile);
@@ -686,7 +678,7 @@ public class DeploymentLoader implements
if (webXmlUrl != null) {
webApp = ReadDescriptors.readWebApp(webXmlUrl);
} else {
- // no-web.xml webapp - possible since Servlet 3.0
+ // no web.xml webapp - possible since Servlet 3.0
webApp = new WebApp();
}
@@ -731,7 +723,8 @@ public class DeploymentLoader implements
private void addBeansXmls(WebModule webModule) {
final List<URL> urls = webModule.getScannableUrls();
- final URLClassLoader loader = new URLClassLoader(urls.toArray(new URL[urls.size()]));
+ // parent returns nothing when calling getresources because we don't want here to be fooled by maven classloader
+ final URLClassLoader loader = new URLClassLoader(urls.toArray(new URL[urls.size()]), new EmptyResourcesClassLoader());
final ArrayList<URL> xmls;
try {
@@ -793,7 +786,6 @@ public class DeploymentLoader implements
complete.getDecorators().addAll(beans.getDecorators());
complete.getInterceptors().addAll(beans.getInterceptors());
}
- File file = URLs.toFile(url);
jars.add(new JarArchive(appModule.getClassLoader(), url));
// } catch (MalformedURLException e) {
// logger.error("Unable to resolve jar path of beans.xml:"+ url.toExternalForm(), e);