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 11:48:21 UTC
svn commit: r1238386 - in /openejb/trunk/openejb:
arquillian-tomee/arquillian-tomcat-openejb-remote/src/main/java/org/apache/openejb/arquillian/remote/
arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/
arquill...
Author: rmannibucau
Date: Tue Jan 31 10:48:20 2012
New Revision: 1238386
URL: http://svn.apache.org/viewvc?rev=1238386&view=rev
Log:
TOMEE-134 fixing openejb/ejb urls since openejb is now tomee
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomcat-openejb-remote/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java
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-moviefun-example/src/test/java/org/superbiz/moviefun/EJBClient.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
openejb/trunk/openejb/examples/webapps/applet/README.md
openejb/trunk/openejb/examples/webapps/applet/README.txt
openejb/trunk/openejb/examples/webapps/applet/src/test/java/org/superbiz/JNDILookupTest.java
openejb/trunk/openejb/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TomcatRemoteTestServer.java
openejb/trunk/openejb/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/servlet/ServletTestClient.java
openejb/trunk/openejb/tck/bval-tomee/pom.xml
openejb/trunk/openejb/tck/cdi-tomee/pom.xml
openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/FullRestartContainer.java
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomcat-openejb-remote/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomcat-openejb-remote/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java?rev=1238386&r1=1238385&r2=1238386&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomcat-openejb-remote/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomcat-openejb-remote/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java Tue Jan 31 10:48:20 2012
@@ -116,7 +116,7 @@ public class RemoteTomEEContainer extend
System.setProperty("tomee.http.port", String.valueOf(configuration.getHttpPort()));
System.setProperty("tomee.shutdown.port", String.valueOf(configuration.getStopPort()));
- System.setProperty("java.naming.provider.url", "http://localhost:" + configuration.getHttpPort() + "/openejb/ejb");
+ System.setProperty("java.naming.provider.url", "http://localhost:" + configuration.getHttpPort() + "/tomee/ejb");
System.setProperty("connect.tries", "90");
System.setProperty("server.http.port", String.valueOf(configuration.getHttpPort()));
System.setProperty("server.shutdown.port", String.valueOf(configuration.getStopPort()));
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=1238386&r1=1238385&r2=1238386&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 10:48:20 2012
@@ -151,7 +151,7 @@ public abstract class TomEEContainer imp
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");
+ properties.setProperty(Context.PROVIDER_URL, "http://" + LOCALHOST + ":" + configuration.getHttpPort() + "/tomee/ejb");
InitialContext context = new InitialContext(properties);
Deployer deployer = (Deployer) context.lookup("openejb/DeployerBusinessRemote");
@@ -172,7 +172,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() + "/tomee/ejb");
InitialContext context = new InitialContext(properties);
File file = moduleIds.get(archive.getName());
Deployer deployer = (Deployer) context.lookup("openejb/DeployerBusinessRemote");
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/EJBClient.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/EJBClient.java?rev=1238386&r1=1238385&r2=1238386&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/EJBClient.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/EJBClient.java Tue Jan 31 10:48:20 2012
@@ -31,7 +31,7 @@ public class EJBClient {
try {
Properties p = new Properties();
p.setProperty(Context.INITIAL_CONTEXT_FACTORY, RemoteInitialContextFactory.class.getName());
- p.setProperty(Context.PROVIDER_URL, "http://localhost:8080/openejb/ejb");
+ p.setProperty(Context.PROVIDER_URL, "http://localhost:8080/tomee/ejb");
InitialContext context = new InitialContext(p);
MoviesRemote movies = (MoviesRemote) context.lookup("MoviesRemote");
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java?rev=1238386&r1=1238385&r2=1238386&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java Tue Jan 31 10:48:20 2012
@@ -116,7 +116,7 @@ public class RemoteTomEEContainer extend
System.setProperty("tomee.http.port", String.valueOf(configuration.getHttpPort()));
System.setProperty("tomee.shutdown.port", String.valueOf(configuration.getStopPort()));
- System.setProperty("java.naming.provider.url", "http://localhost:" + configuration.getHttpPort() + "/openejb/ejb");
+ System.setProperty("java.naming.provider.url", "http://localhost:" + configuration.getHttpPort() + "/tomee/ejb");
System.setProperty("connect.tries", "90");
System.setProperty("server.http.port", String.valueOf(configuration.getHttpPort()));
System.setProperty("server.shutdown.port", String.valueOf(configuration.getStopPort()));
Modified: openejb/trunk/openejb/examples/webapps/applet/README.md
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webapps/applet/README.md?rev=1238386&r1=1238385&r2=1238386&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/webapps/applet/README.md (original)
+++ openejb/trunk/openejb/examples/webapps/applet/README.md Tue Jan 31 10:48:20 2012
@@ -149,7 +149,7 @@ Title: Applet
public void test() {
Properties props = new Properties();
props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
- props.put(Context.PROVIDER_URL, "http://127.0.0.1:8080/openejb/ejb");
+ props.put(Context.PROVIDER_URL, "http://127.0.0.1:8080/tomee/ejb");
try {
Context ctx = new InitialContext(props);
System.out.println("Found context " + ctx);
Modified: openejb/trunk/openejb/examples/webapps/applet/README.txt
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webapps/applet/README.txt?rev=1238386&r1=1238385&r2=1238386&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/webapps/applet/README.txt (original)
+++ openejb/trunk/openejb/examples/webapps/applet/README.txt Tue Jan 31 10:48:20 2012
@@ -69,7 +69,7 @@ actually maps the /ejb/* to a servlet na
too keep in mind in your web-app. Yes, the provider url actually points to a servlet named
ServerServlet. This servlet is provided by openejb and is automatically added to you webapps
classpath.
-[Note:- All other clients (except applets) will use a provider url of http://127.0.0.1:8080/openejb/ejb,
+[Note:- All other clients (except applets) will use a provider url of http://127.0.0.1:8080/tomee/ejb,
since an applet cannot connect to another web-app, hence the above little trick to work around this
limitation. If you do not make the change, you will get a HTTP 403 error i.e. server denied
access to the ServerServlet . A unit test named JNDILookupTest has been added to the example to
Modified: openejb/trunk/openejb/examples/webapps/applet/src/test/java/org/superbiz/JNDILookupTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webapps/applet/src/test/java/org/superbiz/JNDILookupTest.java?rev=1238386&r1=1238385&r2=1238386&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/webapps/applet/src/test/java/org/superbiz/JNDILookupTest.java (original)
+++ openejb/trunk/openejb/examples/webapps/applet/src/test/java/org/superbiz/JNDILookupTest.java Tue Jan 31 10:48:20 2012
@@ -33,7 +33,7 @@ public class JNDILookupTest {
public void test() {
Properties props = new Properties();
props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
- props.put(Context.PROVIDER_URL, "http://127.0.0.1:8080/openejb/ejb");
+ props.put(Context.PROVIDER_URL, "http://127.0.0.1:8080/tomee/ejb");
try {
Context ctx = new InitialContext(props);
System.out.println("Found context " + ctx);
Modified: openejb/trunk/openejb/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TomcatRemoteTestServer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TomcatRemoteTestServer.java?rev=1238386&r1=1238385&r2=1238386&view=diff
==============================================================================
--- openejb/trunk/openejb/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TomcatRemoteTestServer.java (original)
+++ openejb/trunk/openejb/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TomcatRemoteTestServer.java Tue Jan 31 10:48:20 2012
@@ -31,7 +31,7 @@ public class TomcatRemoteTestServer impl
public void init(Properties props) {
properties = props;
- serverUri = System.getProperty("openejb.server.uri", "http://127.0.0.1:8080/openejb/ejb");
+ serverUri = System.getProperty("openejb.server.uri", "http://127.0.0.1:8080/tomee/ejb");
if (!serverUri.startsWith("http:")) {
throw new IllegalStateException("TomcatRemoteTestServer requires that openejb.server.uri property starts with http:");
}
Modified: openejb/trunk/openejb/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/servlet/ServletTestClient.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/servlet/ServletTestClient.java?rev=1238386&r1=1238385&r2=1238386&view=diff
==============================================================================
--- openejb/trunk/openejb/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/servlet/ServletTestClient.java (original)
+++ openejb/trunk/openejb/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/servlet/ServletTestClient.java Tue Jan 31 10:48:20 2012
@@ -39,7 +39,7 @@ public abstract class ServletTestClient
public ServletTestClient(String servletName) {
super("Servlet." + servletName + ".");
this.servletName = servletName;
- String serverUri = System.getProperty("openejb.server.uri", "http://127.0.0.1:8080/openejb/ejb");
+ String serverUri = System.getProperty("openejb.server.uri", "http://127.0.0.1:8080/tomee/ejb");
try {
serverUrl = new URL(serverUri);
} catch (MalformedURLException e) {
Modified: openejb/trunk/openejb/tck/bval-tomee/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/bval-tomee/pom.xml?rev=1238386&r1=1238385&r2=1238386&view=diff
==============================================================================
--- openejb/trunk/openejb/tck/bval-tomee/pom.xml (original)
+++ openejb/trunk/openejb/tck/bval-tomee/pom.xml Tue Jan 31 10:48:20 2012
@@ -201,7 +201,7 @@
<!--<maven.failsafe.debug>true</maven.failsafe.debug>-->
<!--<openejb.server.debug>true</openejb.server.debug>-->
- <java.naming.provider.url>http://localhost:${tomee.http.port}/openejb/ejb</java.naming.provider.url>
+ <java.naming.provider.url>http://localhost:${tomee.http.port}/tomee/ejb</java.naming.provider.url>
<connect.tries>90</connect.tries>
<server.http.port>${tomee.http.port}</server.http.port>
<server.shutdown.port>${tomee.shutdown.port}</server.shutdown.port>
Modified: openejb/trunk/openejb/tck/cdi-tomee/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/cdi-tomee/pom.xml?rev=1238386&r1=1238385&r2=1238386&view=diff
==============================================================================
--- openejb/trunk/openejb/tck/cdi-tomee/pom.xml (original)
+++ openejb/trunk/openejb/tck/cdi-tomee/pom.xml Tue Jan 31 10:48:20 2012
@@ -225,7 +225,7 @@
<!--<maven.failsafe.debug>true</maven.failsafe.debug>-->
<!--<openejb.server.debug>true</openejb.server.debug>-->
- <java.naming.provider.url>http://127.0.0.1:${tomee.http.port}/openejb/ejb</java.naming.provider.url>
+ <java.naming.provider.url>http://127.0.0.1:${tomee.http.port}/tomee/ejb</java.naming.provider.url>
<connect.tries>90</connect.tries>
<server.http.port>${tomee.http.port}</server.http.port>
<server.shutdown.port>${tomee.shutdown.port}</server.shutdown.port>
Modified: openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java?rev=1238386&r1=1238385&r2=1238386&view=diff
==============================================================================
--- openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java (original)
+++ openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java Tue Jan 31 10:48:20 2012
@@ -49,7 +49,7 @@ public class ContainersImplTomEE extends
props.put(Context.INITIAL_CONTEXT_FACTORY, RemoteInitialContextFactory.class.getName());
String port = System.getProperty("server.http.port");
if (port != null) {
- props.put(Context.PROVIDER_URL, options.get(Context.PROVIDER_URL,"http://localhost:" + port + "/openejb/ejb"));
+ props.put(Context.PROVIDER_URL, options.get(Context.PROVIDER_URL,"http://localhost:" + port + "/tomee/ejb"));
} else {
throw new RuntimeException("Please set the tomee port as a system property");
}
Modified: openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/FullRestartContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/FullRestartContainer.java?rev=1238386&r1=1238385&r2=1238386&view=diff
==============================================================================
--- openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/FullRestartContainer.java (original)
+++ openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/FullRestartContainer.java Tue Jan 31 10:48:20 2012
@@ -109,8 +109,8 @@ public class FullRestartContainer extend
props.put(Context.INITIAL_CONTEXT_FACTORY, RemoteInitialContextFactory.class.getName());
String port = System.getProperty("server.http.port");
if (port != null) {
- System.out.println("provider url = " + "http://localhost:" + port + "/openejb/ejb");
- props.put(Context.PROVIDER_URL, options.get(Context.PROVIDER_URL,"http://localhost:" + port + "/openejb/ejb"));
+ System.out.println("provider url = " + "http://localhost:" + port + "/tomee/ejb");
+ props.put(Context.PROVIDER_URL, options.get(Context.PROVIDER_URL,"http://localhost:" + port + "/tomee/ejb"));
} else {
throw new RuntimeException("Please set the tomee port as a system property");
}
Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java?rev=1238386&r1=1238385&r2=1238386&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java Tue Jan 31 10:48:20 2012
@@ -230,7 +230,7 @@ public class TomcatLoader implements Loa
Properties ejbServerProps = new Properties();
ejbServerProps.putAll(properties);
- ejbServerProps.setProperty("openejb.ejbd.uri", "http://127.0.0.1:8080/openejb/ejb");
+ ejbServerProps.setProperty("openejb.ejbd.uri", "http://127.0.0.1:8080/tomee/ejb");
ejbServer.init(ejbServerProps);
// Add our naming context listener to the server which registers all Tomcat resources with OpenEJB