You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2012/01/15 02:43:02 UTC
svn commit: r1231610 - in /openejb/branches/openejb-4.0.0-beta-2: ./
arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/
arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/openejb/arquillian/remot...
Author: dblevins
Date: Sun Jan 15 01:43:01 2012
New Revision: 1231610
URL: http://svn.apache.org/viewvc?rev=1231610&view=rev
Log:
svn merge -r 1230342:1230343 https://svn.apache.org/repos/asf/openejb/trunk/openejb
http://svn.apache.org/viewvc?view=revision&revision=1230343
------------------------------------------------------------------------
r1230343 | rmannibucau | 2012-01-11 17:02:29 -0800 (Wed, 11 Jan 2012) | 1 line
adding a sleep while we are not able to be sure the webapp is started - todo
------------------------------------------------------------------------
Modified:
openejb/branches/openejb-4.0.0-beta-2/ (props changed)
openejb/branches/openejb-4.0.0-beta-2/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
openejb/branches/openejb-4.0.0-beta-2/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java
openejb/branches/openejb-4.0.0-beta-2/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java
openejb/branches/openejb-4.0.0-beta-2/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed)
openejb/branches/openejb-4.0.0-beta-2/container/openejb-jee/src/test/resources/jsf/ (props changed)
openejb/branches/openejb-4.0.0-beta-2/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed)
openejb/branches/openejb-4.0.0-beta-2/examples/application-composer/ (props changed)
openejb/branches/openejb-4.0.0-beta-2/src/ (props changed)
Propchange: openejb/branches/openejb-4.0.0-beta-2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 15 01:43:01 2012
@@ -1,4 +1,4 @@
/openejb/branches/openejb-3.1.1:779593
/openejb/branches/openejb-3.1.x:945409,945448,1004381,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527,1027696,1027724,1027739,1027754,1032856,1032866,1034030,1040222,1040250
/openejb/branches/openejb-jcdi:984659-985270
-/openejb/trunk/openejb:1230327
+/openejb/trunk/openejb:1230327,1230343
Modified: openejb/branches/openejb-4.0.0-beta-2/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0-beta-2/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java?rev=1231610&r1=1231609&r2=1231610&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.0-beta-2/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java (original)
+++ openejb/branches/openejb-4.0.0-beta-2/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java Sun Jan 15 01:43:01 2012
@@ -31,6 +31,8 @@ import org.jboss.shrinkwrap.descriptor.a
import javax.naming.Context;
import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
import java.io.File;
import java.io.OutputStream;
import java.net.Socket;
@@ -106,13 +108,7 @@ public abstract class TomEEContainer imp
archive.as(ZipExporter.class).exportTo(file, true);
- Properties properties = new Properties();
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
- properties.setProperty(Context.PROVIDER_URL, "http://" + LOCALHOST + ":" + configuration.getHttpPort() + "/openejb/ejb");
- InitialContext context = new InitialContext(properties);
-
- Deployer deployer = (Deployer) context.lookup("openejb/DeployerBusinessRemote");
- deployer.deploy(file.getAbsolutePath());
+ deployer().deploy(file.getAbsolutePath());
moduleIds.put(archive.getName(), file);
@@ -139,7 +135,18 @@ public abstract class TomEEContainer imp
}
}
- protected String getArchiveNameWithoutExtension(final Archive<?> archive) {
+ protected Deployer deployer() throws NamingException {
+ Properties properties = new Properties();
+ properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
+ properties.setProperty(Context.PROVIDER_URL, "http://" + LOCALHOST + ":" + configuration.getHttpPort() + "/openejb/ejb");
+ InitialContext context = new InitialContext(properties);
+
+ Deployer deployer = (Deployer) context.lookup("openejb/DeployerBusinessRemote");
+
+ return deployer;
+ }
+
+ protected String getArchiveNameWithoutExtension(final Archive<?> archive) {
final String archiveName = archive.getName();
final int extensionOffset = archiveName.lastIndexOf('.');
if (extensionOffset >= 0) {
Modified: openejb/branches/openejb-4.0.0-beta-2/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0-beta-2/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java?rev=1231610&r1=1231609&r2=1231610&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.0-beta-2/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java (original)
+++ openejb/branches/openejb-4.0.0-beta-2/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java Sun Jan 15 01:43:01 2012
@@ -19,10 +19,14 @@ package org.apache.openejb.arquillian.re
import org.apache.openejb.arquillian.common.FileUtils;
import org.apache.openejb.arquillian.common.MavenCache;
import org.apache.openejb.arquillian.common.TomEEContainer;
+import org.apache.openejb.assembler.Deployer;
import org.apache.openejb.config.RemoteServer;
import org.apache.tomee.installer.Installer;
import org.apache.tomee.installer.Paths;
+import org.jboss.arquillian.container.spi.client.container.DeploymentException;
import org.jboss.arquillian.container.spi.client.container.LifecycleException;
+import org.jboss.arquillian.container.spi.client.protocol.metadata.ProtocolMetaData;
+import org.jboss.shrinkwrap.api.Archive;
import org.sonatype.aether.artifact.Artifact;
import java.io.BufferedReader;
@@ -41,6 +45,8 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import javax.naming.NamingException;
+
/*
* TODO: delete old embedded adapter, move the tests and set those up
*/
@@ -50,6 +56,16 @@ 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")));
Modified: openejb/branches/openejb-4.0.0-beta-2/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0-beta-2/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java?rev=1231610&r1=1231609&r2=1231610&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.0-beta-2/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java (original)
+++ openejb/branches/openejb-4.0.0-beta-2/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java Sun Jan 15 01:43:01 2012
@@ -40,7 +40,7 @@ public class TomEEContainerTest {
@Deployment
public static WebArchive createDeployment() {
return ShrinkWrap.create(WebArchive.class, "test.war").addClass(TestServlet.class).addClass(TestEjb.class).addClass(TomEEContainerTest.class)
- .setWebXML(new StringAsset(Descriptors.create(WebAppDescriptor.class).version("3.0").servlet(TestServlet.class, "/Test").exportAsString()));
+ .setWebXML(new StringAsset(Descriptors.create(WebAppDescriptor.class).version("3.0").servlet(TestServlet.class, "/ejb").exportAsString()));
}
@EJB
@@ -53,7 +53,7 @@ public class TomEEContainerTest {
@Test
public void testShouldBeAbleToAccessServletAndEjb() throws Exception {
- InputStream is = new URL("http://localhost:" + System.getProperty("tomee.http.port", "10080") + "/test/Test").openStream();
+ InputStream is = new URL("http://127.0.0.1:" + System.getProperty("tomee.http.port", "10080") + "/test/ejb").openStream();
ByteArrayOutputStream os = new ByteArrayOutputStream();
int bytesRead = -1;
Propchange: openejb/branches/openejb-4.0.0-beta-2/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 15 01:43:01 2012
@@ -1,4 +1,4 @@
/openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593
/openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527,1027696,1027724,1027739,1027754,1032856,1032866,1034030,1040222,1040250
/openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:984659-985270
-/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:1230327
+/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:1230327,1230343
Propchange: openejb/branches/openejb-4.0.0-beta-2/container/openejb-jee/src/test/resources/jsf/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 15 01:43:01 2012
@@ -2,4 +2,4 @@
/geronimo/server/branches/3.0-M1/plugins/myfaces/geronimo-myfaces-builder/src/test/resources:948864,951792
/geronimo/server/trunk/plugins/j2ee/myfaces/geronimo-myfaces-builder/src/test/resources:887507
/openejb/branches/openejb-jcdi/container/openejb-jee/src/test/resources/jsf:984659-985270
-/openejb/trunk/openejb/container/openejb-jee/src/test/resources/jsf:1230327
+/openejb/trunk/openejb/container/openejb-jee/src/test/resources/jsf:1230327,1230343
Propchange: openejb/branches/openejb-4.0.0-beta-2/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 15 01:43:01 2012
@@ -1,4 +1,4 @@
/openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593
/openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527,1027696,1027724,1027739,1027754,1032856,1032866,1034030,1040222,1040250
/openejb/branches/openejb-jcdi/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:984659-985270
-/openejb/trunk/openejb/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:1230327
+/openejb/trunk/openejb/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:1230327,1230343
Propchange: openejb/branches/openejb-4.0.0-beta-2/examples/application-composer/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 15 01:43:01 2012
@@ -1,3 +1,3 @@
/openejb/branches/openejb-3.1.1/examples/application-composer:779593
-/openejb/trunk/openejb/examples/application-composer:1230327
+/openejb/trunk/openejb/examples/application-composer:1230327,1230343
/openejb/trunk/openejb3/examples/application-composer:943472,943862,943965,944757,945989,946399,946485,946489,946705,946792,946805,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548,949014,949233,950391,950801,951611,953191,953196,953556,955104,955496,957463,962382,962750,987030,1004172,1029528
Propchange: openejb/branches/openejb-4.0.0-beta-2/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 15 01:43:01 2012
@@ -1,3 +1,3 @@
/openejb/branches/openejb-3.1.1/src:779593
-/openejb/trunk/openejb/src:1230327
+/openejb/trunk/openejb/src:1230327,1230343
/openejb/trunk/openejb3/src:943472,943862,943965,944757,945989,946399,946485,946489,946705,946792,946805,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548,949014,949233,950391,950801,951611,953191,953196,953556,955104,955496,957463,962382,962750,987030,1004172,1029528