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 2011/10/29 22:52:54 UTC
svn commit: r1195030 - in /openejb/trunk/openejb/arquillian-tomee: ./
arquillian-tomee-common/
arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/
arquillian-tomee-embedded-with-war/ arquillian-tomee-embedded/
arquillian-tomee-m...
Author: rmannibucau
Date: Sat Oct 29 20:52:54 2011
New Revision: 1195030
URL: http://svn.apache.org/viewvc?rev=1195030&view=rev
Log:
fixing name in arquillian poms and using localhost everywhere instead of 0.0.0.0
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/pom.xml
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-embedded-with-war/pom.xml
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/pom.xml
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml
openejb/trunk/openejb/arquillian-tomee/pom.xml
openejb/trunk/openejb/arquillian-tomee/ziplock/pom.xml
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/pom.xml?rev=1195030&r1=1195029&r2=1195030&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/pom.xml (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/pom.xml Sat Oct 29 20:52:54 2011
@@ -29,7 +29,7 @@
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>TomEE Arquillian Adaptor :: Common</name>
+ <name>OpenEJB :: TomEE Arquillian Adaptor :: Common</name>
<dependencies>
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=1195030&r1=1195029&r2=1195030&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 Sat Oct 29 20:52:54 2011
@@ -40,6 +40,8 @@ import org.jboss.shrinkwrap.api.spec.Web
import org.jboss.shrinkwrap.descriptor.api.Descriptor;
public abstract class TomEEContainer implements DeployableContainer<TomEEConfiguration> {
+ protected static final String LOCALHOST = "localhost";
+ protected static final String SHUTDOWN_COMMAND = "SHUTDOWN" + Character.toString((char) -1);
protected TomEEConfiguration configuration;
protected Map<String, String> moduleIds = new HashMap<String, String>();
@@ -55,11 +57,9 @@ public abstract class TomEEContainer imp
public void stop() throws LifecycleException {
try {
- String command = "SHUTDOWN";
-
- Socket socket = new Socket("localhost", configuration.getStopPort());
+ Socket socket = new Socket(LOCALHOST, configuration.getStopPort());
OutputStream out = socket.getOutputStream();
- out.write(command.getBytes());
+ out.write(SHUTDOWN_COMMAND.getBytes());
waitForShutdown(10);
} catch (Exception e) {
@@ -70,7 +70,7 @@ public abstract class TomEEContainer imp
protected void waitForShutdown(int tries) {
try {
- Socket socket = new Socket("localhost", configuration.getStopPort());
+ Socket socket = new Socket(LOCALHOST, configuration.getStopPort());
OutputStream out = socket.getOutputStream();
out.close();
} catch (Exception e) {
@@ -99,7 +99,7 @@ public abstract class TomEEContainer imp
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");
+ properties.setProperty(Context.PROVIDER_URL, "http://" + LOCALHOST + ":" + configuration.getHttpPort() + "/openejb/ejb");
InitialContext context = new InitialContext(properties);
Deployer deployer = (Deployer) context.lookup("openejb/DeployerBusinessRemote");
@@ -107,7 +107,7 @@ public abstract class TomEEContainer imp
moduleIds.put(archive.getName(), file.getAbsolutePath());
- HTTPContext httpContext = new HTTPContext("0.0.0.0", configuration.getHttpPort());
+ HTTPContext httpContext = new HTTPContext(LOCALHOST, configuration.getHttpPort());
if (archive instanceof WebArchive) {
httpContext.add(new Servlet("ArquillianServletRunner", "/" + getArchiveNameWithoutExtension(archive)));
} else {
@@ -140,7 +140,7 @@ public abstract class TomEEContainer imp
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() + "/openejb/ejb");
+ properties.setProperty(Context.PROVIDER_URL, "http://" + LOCALHOST + ":" + configuration.getHttpPort() + "/openejb/ejb");
InitialContext context = new InitialContext(properties);
String appId = moduleIds.get(archive.getName());
Deployer deployer = (Deployer) context.lookup("openejb/DeployerBusinessRemote");
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded-with-war/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded-with-war/pom.xml?rev=1195030&r1=1195029&r2=1195030&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded-with-war/pom.xml (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded-with-war/pom.xml Sat Oct 29 20:52:54 2011
@@ -29,7 +29,7 @@
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>TomEE Arquillian Adaptor :: Embedded Adaptor using openejb.war</name>
+ <name>OpenEJB :: TomEE Arquillian Adaptor :: Embedded Adaptor using openejb.war</name>
<dependencies>
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/pom.xml?rev=1195030&r1=1195029&r2=1195030&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/pom.xml (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/pom.xml Sat Oct 29 20:52:54 2011
@@ -29,7 +29,7 @@
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>TomEE Arquillian Adaptor :: Embedded Adaptor</name>
+ <name>OpenEJB :: TomEE Arquillian Adaptor :: Embedded Adaptor</name>
<dependencies>
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml?rev=1195030&r1=1195029&r2=1195030&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml Sat Oct 29 20:52:54 2011
@@ -24,7 +24,7 @@
<artifactId>arquillian-tomee-moviefun-example</artifactId>
<packaging>war</packaging>
<version>1.0-SNAPSHOT</version>
- <name>TomEE Arquillian Adaptor :: Sample :: Moviefun</name>
+ <name>OpenEJB :: TomEE Arquillian Adaptor :: Sample :: Moviefun</name>
<properties>
<version.selenium>2.7.0</version.selenium>
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml?rev=1195030&r1=1195029&r2=1195030&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml Sat Oct 29 20:52:54 2011
@@ -29,7 +29,7 @@
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>TomEE Arquillian Adaptor :: Remote</name>
+ <name>OpenEJB :: TomEE Arquillian Adaptor :: Remote</name>
<dependencies>
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml?rev=1195030&r1=1195029&r2=1195030&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml Sat Oct 29 20:52:54 2011
@@ -22,7 +22,7 @@
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>TomEE Arquillian Adaptor :: Tests</name>
+ <name>OpenEJB :: TomEE Arquillian Adaptor :: Tests</name>
<dependencies>
<dependency>
Modified: openejb/trunk/openejb/arquillian-tomee/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/pom.xml?rev=1195030&r1=1195029&r2=1195030&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/pom.xml (original)
+++ openejb/trunk/openejb/arquillian-tomee/pom.xml Sat Oct 29 20:52:54 2011
@@ -29,7 +29,7 @@
<artifactId>arquillian-tomee</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>TomEE Arquillian Adaptor</name>
+ <name>OpenEJB :: TomEE Arquillian Adaptor</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Modified: openejb/trunk/openejb/arquillian-tomee/ziplock/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/ziplock/pom.xml?rev=1195030&r1=1195029&r2=1195030&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/ziplock/pom.xml (original)
+++ openejb/trunk/openejb/arquillian-tomee/ziplock/pom.xml Sat Oct 29 20:52:54 2011
@@ -11,7 +11,7 @@
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>TomEE Arquillian Adaptor :: ZipLock</name>
+ <name>OpenEJB :: TomEE Arquillian Adaptor :: ZipLock</name>
<dependencies>
<dependency>