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/15 20:18:26 UTC
svn commit: r1231733 -
/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java
Author: rmannibucau
Date: Sun Jan 15 19:18:26 2012
New Revision: 1231733
URL: http://svn.apache.org/viewvc?rev=1231733&view=rev
Log:
removing sleep hack and fixing webapp names
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.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=1231733&r1=1231732&r2=1231733&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 Sun Jan 15 19:18:26 2012
@@ -57,16 +57,6 @@ public class RemoteTomEEContainer extend
private RemoteServer container;
private boolean needsStart = false;
- public ProtocolMetaData deploy(Archive<?> archive) throws DeploymentException {
- ProtocolMetaData pmd = super.deploy(archive);
- try { // TODO: maybe querying tomee to know if a webapp is completely deployed (for tomcat)
- Thread.sleep(100); // maybe tomcat is still not started
- } catch (InterruptedException e) {
- // no-op
- }
- return pmd;
- }
-
public void start() throws LifecycleException {
if (System.getProperty("tomee.http.port") != null) {
configuration.setHttpPort(Integer.parseInt(System.getProperty("tomee.http.port")));
@@ -206,9 +196,9 @@ public class RemoteTomEEContainer extend
protected void downloadOpenEJBWebapp(File targetDirectory) throws LifecycleException {
String artifactName;
if (configuration.isPlusContainer()) {
- artifactName = "org.apache.openejb:openejb-tomcat-plus-webapp:war:" + configuration.getOpenejbVersion();
+ artifactName = "org.apache.openejb:tomee-plus-webapp:war:" + configuration.getOpenejbVersion();
} else {
- artifactName = "org.apache.openejb:openejb-tomcat-webapp:war:" + configuration.getOpenejbVersion();
+ artifactName = "org.apache.openejb:tomee-webapp:war:" + configuration.getOpenejbVersion();
}
File zipFile = downloadFile(artifactName, null);