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/31 15:05:46 UTC
svn commit: r1238556 - in /openejb/trunk/openejb/arquillian-tomee:
arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/
arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/
arquillian-tomee-remote/src/test/java/or...
Author: rmannibucau
Date: Tue Jan 31 14:05:46 2012
New Revision: 1238556
URL: http://svn.apache.org/viewvc?rev=1238556&view=rev
Log:
making test passing under window$ (at least for me ;))
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java?rev=1238556&r1=1238555&r2=1238556&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java Tue Jan 31 14:05:46 2012
@@ -38,8 +38,10 @@ import javax.naming.InitialContext;
import javax.naming.NamingException;
import java.io.File;
+import java.io.IOException;
import java.io.OutputStream;
import java.net.Socket;
+import java.net.URL;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -134,12 +136,14 @@ public abstract class TomEEContainer imp
}
HTTPContext httpContext = new HTTPContext(LOCALHOST, configuration.getHttpPort());
+ String arquillianServlet;
if (archive instanceof WebArchive) {
- httpContext.add(new Servlet("ArquillianServletRunner", "/" + getArchiveNameWithoutExtension(archive)));
+ arquillianServlet = "/" + getArchiveNameWithoutExtension(archive);
} else {
- httpContext.add(new Servlet("ArquillianServletRunner", "/arquillian-protocol"));
+ arquillianServlet = "/arquillian-protocol";
}
-
+ httpContext.add(new Servlet("ArquillianServletRunner", arquillianServlet));
+
// we should probably get all servlets and add them to the context
return new ProtocolMetaData().addContext(httpContext);
} catch (Exception e) {
@@ -149,14 +153,10 @@ public abstract class TomEEContainer imp
}
protected Deployer deployer() throws NamingException {
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
properties.setProperty(Context.PROVIDER_URL, "http://" + LOCALHOST + ":" + configuration.getHttpPort() + "/tomee/ejb");
- InitialContext context = new InitialContext(properties);
-
- Deployer deployer = (Deployer) context.lookup("openejb/DeployerBusinessRemote");
-
- return deployer;
+ return (Deployer) new InitialContext(properties).lookup("openejb/DeployerBusinessRemote");
}
protected String getArchiveNameWithoutExtension(final Archive<?> archive) {
@@ -170,14 +170,8 @@ public abstract class TomEEContainer imp
public void undeploy(Archive<?> archive) throws DeploymentException {
try {
- Properties properties = new Properties();
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
- properties.setProperty(Context.PROVIDER_URL, "http://" + LOCALHOST + ":" + configuration.getHttpPort() + "/tomee/ejb");
- InitialContext context = new InitialContext(properties);
- File file = moduleIds.get(archive.getName());
- Deployer deployer = (Deployer) context.lookup("openejb/DeployerBusinessRemote");
- deployer.undeploy(file.getAbsolutePath());
-
+ final File file = moduleIds.get(archive.getName());
+ deployer().undeploy(file.getAbsolutePath());
FileUtils.delete(file.getParentFile()); // "i" folder
} catch (Exception e) {
e.printStackTrace();
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java?rev=1238556&r1=1238555&r2=1238556&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java Tue Jan 31 14:05:46 2012
@@ -56,7 +56,7 @@ public class TomEEContainerTest {
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;
+ int bytesRead;
byte[] buffer = new byte[8192];
while ((bytesRead = is.read(buffer)) > -1) {
os.write(buffer, 0, bytesRead);
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java?rev=1238556&r1=1238555&r2=1238556&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java Tue Jan 31 14:05:46 2012
@@ -44,11 +44,11 @@ import static org.junit.Assert.assertNot
@RunWith(Arquillian.class)
public class SessionScopeTest {
- public static final String TEST_SESSION_URL = "http://127.0.0.1:" + System.getProperty("tomee.http.port", "10080") + "/test/session";
+ public static final String TEST_SESSION_URL = "http://127.0.0.1:" + System.getProperty("tomee.http.port", "10080") + "/SessionScopeTest/session";
@Deployment
public static WebArchive createDeployment() {
- return ShrinkWrap.create(WebArchive.class, "test.war")
+ return ShrinkWrap.create(WebArchive.class, "SessionScopeTest.war")
.addClass(PojoSessionScoped.class).addClass(PojoSessionScopedServletWrapper.class)
.addAsLibraries(new File("target/test-libs/commons-httpclient.jar"))
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))