Author: dblevins
Date: Sat Aug 20 02:16:40 2011
New Revision: 1159833
URL: http://svn.apache.org/viewvc?rev=1159833&view=rev
Log:
fixed undeploy but other issues still exist
Removed:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/velocity.log
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/velocity.log.1
Modified:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/resources/arquillian.xml
Modified:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java?rev=1159833&r1=1159832&r2=1159833&view=diff
==============================================================================
---
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java
(original)
+++
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java
Sat Aug 20 02:16:40 2011
@@ -26,18 +26,13 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-
import org.apache.catalina.startup.Bootstrap;
import org.apache.openejb.AppContext;
-import org.apache.openejb.BeanContext;
import org.apache.openejb.assembler.Deployer;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.tomcat.catalina.TomcatLoader;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
@@ -59,7 +54,7 @@ public class TomEEContainer implements D
private Bootstrap bootstrap;
private TomEEConfiguration configuration;
private File catalinaDirectory;
- private Map<String, AppContext> moduleIds = new HashMap<String,
AppContext>();
+ private Map<String, String> moduleIds = new HashMap<String, String>();
private Deployer deployer;
private ConfigurationFactory configurationFactory;
private Assembler assembler;
@@ -174,15 +169,15 @@ public class TomEEContainer implements D
public ProtocolMetaData deploy(Archive<?> archive) throws
DeploymentException {
try {
- String tmpDir = System.getProperty("java.io.tmpdir");
- File file = new File(tmpDir + File.separator +
archive.getName());
+ final File file = File.createTempFile("deploy", "-" +
archive.getName());
+ file.deleteOnExit();
archive.as(ZipExporter.class).exportTo(file, true);
AppInfo appInfo = configurationFactory.configureApplication(file);
- AppContext application = assembler.createApplication(appInfo);
- moduleIds.put(archive.getName(), application);
-
+ assembler.createApplication(appInfo);
+ moduleIds.put(archive.getName(), appInfo.path);
+
HTTPContext httpContext = new HTTPContext("0.0.0.0",
configuration.getHttpPort());
return new ProtocolMetaData().addContext(httpContext);
} catch (Exception e) {
@@ -193,8 +188,8 @@ public class TomEEContainer implements D
public void undeploy(Archive<?> archive) throws DeploymentException {
try {
- AppContext appContext = moduleIds.get(archive.getName());
- assembler.destroyApplication(appContext);
+ String moduleId = moduleIds.get(archive.getName());
+ assembler.destroyApplication(moduleId);
} catch (Exception e) {
e.printStackTrace();
throw new DeploymentException("Unable to undeploy", e);
Modified:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/resources/arquillian.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/resources/arquillian.xml?rev=1159833&r1=1159832&r2=1159833&view=diff
==============================================================================
---
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/resources/arquillian.xml
(original)
+++
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/resources/arquillian.xml
Sat Aug 20 02:16:40 2011
@@ -22,7 +22,6 @@
<container qualifier="tomee" default="true">
<configuration>
- <property name="dir">/tmp/arquillian-apache-tomee</property>
<property name="httpPort">9080</property>
<property name="stopPort">9005</property>
</configuration>
