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/03/20 11:12:52 UTC
svn commit: r1302815 - in /openejb/trunk/openejb/arquillian-tomee:
arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/
arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/
arquillian-tomee-webapp-remote/src/...
Author: rmannibucau
Date: Tue Mar 20 09:47:49 2012
New Revision: 1302815
URL: http://svn.apache.org/viewvc?rev=1302815&view=rev
Log:
removing by default tomcat webapps since we only need tomee
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java?rev=1302815&r1=1302814&r2=1302815&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java Tue Mar 20 09:47:49 2012
@@ -18,6 +18,7 @@ package org.apache.openejb.arquillian.co
import org.apache.openejb.loader.ProvisioningUtil;
import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.util.JarExtractor;
import org.jboss.arquillian.container.spi.client.container.LifecycleException;
import java.io.BufferedReader;
@@ -178,4 +179,16 @@ public class Setup {
return tmpFile;
}
+
+ public static void removeUselessWebapps(final File openejbHome) {
+ final File webapps = new File(openejbHome, "webapps");
+ if (webapps.isDirectory()) {
+ for (File webapp : webapps.listFiles()) {
+ final String name = webapp.getName();
+ if (webapp.isDirectory() && !name.equals("openejb") && !name.equals("tomee")) {
+ JarExtractor.delete(webapp);
+ }
+ }
+ }
+ }
}
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java?rev=1302815&r1=1302814&r2=1302815&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java Tue Mar 20 09:47:49 2012
@@ -30,6 +30,7 @@ public class RemoteTomEEConfiguration ex
private String version = "1.0.0-beta-3-SNAPSHOT";
private String classifier = "webprofile";
private String type = "zip";
+ private boolean removeUnusedWebapps = true;
public String getGroupId() {
return groupId;
@@ -78,4 +79,12 @@ public class RemoteTomEEConfiguration ex
return String.format(format, getGroupId(), getArtifactId(), getVersion(), getType(), getClassifier());
}
+
+ public boolean isRemoveUnusedWebapps() {
+ return removeUnusedWebapps;
+ }
+
+ public void setRemoveUnusedWebapps(boolean removeUnusedWebapps) {
+ this.removeUnusedWebapps = removeUnusedWebapps;
+ }
}
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java?rev=1302815&r1=1302814&r2=1302815&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java Tue Mar 20 09:47:49 2012
@@ -112,6 +112,10 @@ public class RemoteTomEEContainer extend
Setup.exportProperties(openejbHome, configuration);
+ if (configuration.isRemoveUnusedWebapps()) {
+ Setup.removeUselessWebapps(openejbHome);
+ }
+
if (false) {
Map<Object, Object> map = new TreeMap(System.getProperties());
for (Map.Entry<Object, Object> entry : map.entrySet()) {
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java?rev=1302815&r1=1302814&r2=1302815&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java Tue Mar 20 09:47:49 2012
@@ -30,6 +30,7 @@ public class TomEEWebappConfiguration ex
private String artifactId = "tomee-webapp";
private String version = "1.0.0-beta-3-SNAPSHOT";
private String type = "war";
+ private boolean removeUnusedWebapps = true;
public String getGroupId() {
return groupId;
@@ -77,4 +78,11 @@ public class TomEEWebappConfiguration ex
this.tomcatVersion = tomcatVersion;
}
+ public boolean isRemoveUnusedWebapps() {
+ return removeUnusedWebapps;
+ }
+
+ public void setRemoveUnusedWebapps(boolean removeUnusedWebapps) {
+ this.removeUnusedWebapps = removeUnusedWebapps;
+ }
}
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java?rev=1302815&r1=1302814&r2=1302815&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java Tue Mar 20 09:47:49 2012
@@ -116,6 +116,10 @@ public class TomEEWebappContainer extend
write(logging, new File(openejbHome, "conf" + s + "logging.properties"));
}
+ if (configuration.isRemoveUnusedWebapps()) {
+ Setup.removeUselessWebapps(openejbHome);
+ }
+
if (false) {
Map<Object, Object> map = new TreeMap(System.getProperties());
for (Map.Entry<Object, Object> entry : map.entrySet()) {