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/02/19 20:07:00 UTC
svn commit: r1291041 - in /openejb/trunk/openejb:
examples/rest-on-ejb/src/test/java/org/superbiz/rest/
examples/simple-webservice-without-interface/src/test/java/org/superbiz/calculator/
examples/simple-webservice/src/test/java/org/superbiz/calculator...
Author: rmannibucau
Date: Sun Feb 19 19:06:59 2012
New Revision: 1291041
URL: http://svn.apache.org/viewvc?rev=1291041&view=rev
Log:
OPENEJB-1780 managing sub context in standalone mode (module name of ejbmodule)
Modified:
openejb/trunk/openejb/examples/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java
openejb/trunk/openejb/examples/simple-webservice-without-interface/src/test/java/org/superbiz/calculator/CalculatorTest.java
openejb/trunk/openejb/examples/simple-webservice/src/test/java/org/superbiz/calculator/ws/CalculatorTest.java
openejb/trunk/openejb/examples/webapps/rest-example/pom.xml
openejb/trunk/openejb/examples/webservice-attachments/src/test/java/org/superbiz/attachment/AttachmentTest.java
openejb/trunk/openejb/examples/webservice-handlerchain/src/test/java/org/superbiz/calculator/wsh/CalculatorTest.java
openejb/trunk/openejb/examples/webservice-holder/src/test/java/org/superbiz/ws/out/CalculatorTest.java
openejb/trunk/openejb/examples/webservice-inheritance/src/test/java/org/superbiz/inheritance/InheritanceTest.java
openejb/trunk/openejb/examples/webservice-security/src/test/java/org/superbiz/calculator/CalculatorTest.java
openejb/trunk/openejb/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CalculatorTest.java
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EjbDeploymentTest.java
openejb/trunk/openejb/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CxfJaxWsProviderTest.java
openejb/trunk/openejb/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WebServiceWithAnUserInterceptorTest.java
openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
openejb/trunk/openejb/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/OpenEJBHttpWsRegistry.java
openejb/trunk/openejb/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
Modified: openejb/trunk/openejb/examples/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java?rev=1291041&r1=1291040&r2=1291041&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java (original)
+++ openejb/trunk/openejb/examples/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java Sun Feb 19 19:06:59 2012
@@ -64,7 +64,7 @@ public class UserServiceTest {
@Test
public void create() {
int expected = service.list(0, 100).size() + 1;
- Response response = WebClient.create("http://localhost:4204")
+ Response response = WebClient.create("http://localhost:4204/rest-on-ejb")
.path("/user/create")
.query("name", "dummy")
.query("pwd", "unbreakable")
@@ -84,7 +84,7 @@ public class UserServiceTest {
public void delete() throws Exception {
User user = service.create("todelete", "dontforget", "delete@me.com");
- WebClient.create("http://localhost:4204").path("/user/delete/" + user.getId()).delete();
+ WebClient.create("http://localhost:4204/rest-on-ejb").path("/user/delete/" + user.getId()).delete();
user = service.find(user.getId());
assertNull(user);
@@ -92,7 +92,7 @@ public class UserServiceTest {
@Test
public void show() {
- User user = WebClient.create("http://localhost:4204")
+ User user = WebClient.create("http://localhost:4204/rest-on-ejb")
.path("/user/show/" + users.iterator().next().getId())
.get(User.class);
assertEquals("foo", user.getFullname());
@@ -102,7 +102,7 @@ public class UserServiceTest {
@Test
public void list() throws Exception {
- String users = WebClient.create("http://localhost:4204")
+ String users = WebClient.create("http://localhost:4204/rest-on-ejb")
.path("/user/list")
.get(String.class);
assertEquals(
@@ -131,7 +131,7 @@ public class UserServiceTest {
@Test
public void update() throws Exception {
User created = service.create("name", "pwd", "mail");
- Response response = WebClient.create("http://localhost:4204")
+ Response response = WebClient.create("http://localhost:4204/rest-on-ejb")
.path("/user/update/" + created.getId())
.query("name", "corrected")
.query("pwd", "userpwd")
Modified: openejb/trunk/openejb/examples/simple-webservice-without-interface/src/test/java/org/superbiz/calculator/CalculatorTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/simple-webservice-without-interface/src/test/java/org/superbiz/calculator/CalculatorTest.java?rev=1291041&r1=1291040&r2=1291041&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/simple-webservice-without-interface/src/test/java/org/superbiz/calculator/CalculatorTest.java (original)
+++ openejb/trunk/openejb/examples/simple-webservice-without-interface/src/test/java/org/superbiz/calculator/CalculatorTest.java Sun Feb 19 19:06:59 2012
@@ -56,7 +56,7 @@ public class CalculatorTest {
@Test
public void wsdlExists() throws Exception {
- final URL url = new URL("http://127.0.0.1:4204/Calculator?wsdl");
+ final URL url = new URL("http://127.0.0.1:4204/simple-webservice-without-interface/Calculator?wsdl");
assertTrue(IOUtils.readLines(url.openStream()).size() > 0);
assertTrue(IOUtils.readLines(url.openStream()).toString().contains("CalculatorWsService"));
}
Modified: openejb/trunk/openejb/examples/simple-webservice/src/test/java/org/superbiz/calculator/ws/CalculatorTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/simple-webservice/src/test/java/org/superbiz/calculator/ws/CalculatorTest.java?rev=1291041&r1=1291040&r2=1291041&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/simple-webservice/src/test/java/org/superbiz/calculator/ws/CalculatorTest.java (original)
+++ openejb/trunk/openejb/examples/simple-webservice/src/test/java/org/superbiz/calculator/ws/CalculatorTest.java Sun Feb 19 19:06:59 2012
@@ -42,7 +42,7 @@ public class CalculatorTest {
@Test
public void test() throws Exception {
Service calculatorService = Service.create(
- new URL("http://127.0.0.1:4204/Calculator?wsdl"),
+ new URL("http://127.0.0.1:4204/simple-webservice/Calculator?wsdl"),
new QName("http://superbiz.org/wsdl", "CalculatorService"));
assertNotNull(calculatorService);
Modified: openejb/trunk/openejb/examples/webapps/rest-example/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webapps/rest-example/pom.xml?rev=1291041&r1=1291040&r2=1291041&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/webapps/rest-example/pom.xml (original)
+++ openejb/trunk/openejb/examples/webapps/rest-example/pom.xml Sun Feb 19 19:06:59 2012
@@ -118,9 +118,23 @@
</dependency>
</dependencies>
</plugin>
+<plugin>
+<groupId>org.apache.openejb</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+<artifactId>dd-maven-plugin</artifactId>
+<executions><execution>
+<id>foo</id>
+<goals><goal>merge</goal></goals>
+</execution>
+</executions></plugin>
</plugins>
</build>
<dependencies>
+<dependency>
+<groupId>org.superbiz</groupId>
+ <artifactId>webservice-security</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
Modified: openejb/trunk/openejb/examples/webservice-attachments/src/test/java/org/superbiz/attachment/AttachmentTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webservice-attachments/src/test/java/org/superbiz/attachment/AttachmentTest.java?rev=1291041&r1=1291040&r2=1291041&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/webservice-attachments/src/test/java/org/superbiz/attachment/AttachmentTest.java (original)
+++ openejb/trunk/openejb/examples/webservice-attachments/src/test/java/org/superbiz/attachment/AttachmentTest.java Sun Feb 19 19:06:59 2012
@@ -53,7 +53,7 @@ public class AttachmentTest extends Test
//START SNIPPET: webservice
public void testAttachmentViaWsInterface() throws Exception {
Service service = Service.create(
- new URL("http://127.0.0.1:4204/AttachmentImpl?wsdl"),
+ new URL("http://127.0.0.1:4204/webservice-attachements/AttachmentImpl?wsdl"),
new QName("http://superbiz.org/wsdl", "AttachmentWsService"));
assertNotNull(service);
Modified: openejb/trunk/openejb/examples/webservice-handlerchain/src/test/java/org/superbiz/calculator/wsh/CalculatorTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webservice-handlerchain/src/test/java/org/superbiz/calculator/wsh/CalculatorTest.java?rev=1291041&r1=1291040&r2=1291041&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/webservice-handlerchain/src/test/java/org/superbiz/calculator/wsh/CalculatorTest.java (original)
+++ openejb/trunk/openejb/examples/webservice-handlerchain/src/test/java/org/superbiz/calculator/wsh/CalculatorTest.java Sun Feb 19 19:06:59 2012
@@ -22,6 +22,7 @@ import org.junit.Test;
import javax.ejb.embeddable.EJBContainer;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
+import java.lang.Thread;
import java.net.URL;
import java.util.Properties;
@@ -42,7 +43,7 @@ public class CalculatorTest {
@Test
public void testCalculatorViaWsInterface() throws Exception {
final Service calculatorService = Service.create(
- new URL("http://127.0.0.1:4204/Calculator?wsdl"),
+ new URL("http://127.0.0.1:4204/webservice-handlerchain/Calculator?wsdl"),
new QName("http://superbiz.org/wsdl", "CalculatorService"));
assertNotNull(calculatorService);
Modified: openejb/trunk/openejb/examples/webservice-holder/src/test/java/org/superbiz/ws/out/CalculatorTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webservice-holder/src/test/java/org/superbiz/ws/out/CalculatorTest.java?rev=1291041&r1=1291040&r2=1291041&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/webservice-holder/src/test/java/org/superbiz/ws/out/CalculatorTest.java (original)
+++ openejb/trunk/openejb/examples/webservice-holder/src/test/java/org/superbiz/ws/out/CalculatorTest.java Sun Feb 19 19:06:59 2012
@@ -43,7 +43,7 @@ public class CalculatorTest {
@Test
public void outParams() throws Exception {
final Service calculatorService = Service.create(
- new URL("http://127.0.0.1:4204/Calculator?wsdl"),
+ new URL("http://127.0.0.1:4204/webservice-holder/Calculator?wsdl"),
new QName("http://superbiz.org/wsdl", "CalculatorService"));
assertNotNull(calculatorService);
Modified: openejb/trunk/openejb/examples/webservice-inheritance/src/test/java/org/superbiz/inheritance/InheritanceTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webservice-inheritance/src/test/java/org/superbiz/inheritance/InheritanceTest.java?rev=1291041&r1=1291040&r2=1291041&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/webservice-inheritance/src/test/java/org/superbiz/inheritance/InheritanceTest.java (original)
+++ openejb/trunk/openejb/examples/webservice-inheritance/src/test/java/org/superbiz/inheritance/InheritanceTest.java Sun Feb 19 19:06:59 2012
@@ -59,7 +59,7 @@ public class InheritanceTest extends Tes
//START SNIPPET: webservice
public void testInheritanceViaWsInterface() throws Exception {
Service service = Service.create(
- new URL("http://127.0.0.1:4204/WakeRiderImpl?wsdl"),
+ new URL("http://127.0.0.1:4204/webservice-inheritance/WakeRiderImpl?wsdl"),
new QName("http://superbiz.org/wsdl", "InheritanceWsService"));
assertNotNull(service);
Modified: openejb/trunk/openejb/examples/webservice-security/src/test/java/org/superbiz/calculator/CalculatorTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webservice-security/src/test/java/org/superbiz/calculator/CalculatorTest.java?rev=1291041&r1=1291040&r2=1291041&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/webservice-security/src/test/java/org/superbiz/calculator/CalculatorTest.java (original)
+++ openejb/trunk/openejb/examples/webservice-security/src/test/java/org/superbiz/calculator/CalculatorTest.java Sun Feb 19 19:06:59 2012
@@ -47,7 +47,7 @@ public class CalculatorTest extends Test
*/
//START SNIPPET: webservice
public void testCalculatorViaWsInterface() throws Exception {
- URL url = new URL("http://127.0.0.1:4204/CalculatorImpl?wsdl");
+ URL url = new URL("http://127.0.0.1:4204/webservice-security/CalculatorImpl?wsdl");
QName calcServiceQName = new QName("http://superbiz.org/wsdl", "CalculatorWsService");
Service calcService = Service.create(url, calcServiceQName);
assertNotNull(calcService);
Modified: openejb/trunk/openejb/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CalculatorTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CalculatorTest.java?rev=1291041&r1=1291040&r2=1291041&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CalculatorTest.java (original)
+++ openejb/trunk/openejb/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CalculatorTest.java Sun Feb 19 19:06:59 2012
@@ -56,7 +56,7 @@ public class CalculatorTest extends Test
//START SNIPPET: webservice
public void testCalculatorViaWsInterface() throws Exception {
- Service calcService = Service.create(new URL("http://127.0.0.1:4204/CalculatorImpl?wsdl"),
+ Service calcService = Service.create(new URL("http://127.0.0.1:4204/webservice-ws-security/CalculatorImpl?wsdl"),
new QName("http://superbiz.org/wsdl", "CalculatorWsService"));
assertNotNull(calcService);
@@ -85,7 +85,7 @@ public class CalculatorTest extends Test
}
public void testCalculatorViaWsInterfaceWithTimestamp1way() throws Exception {
- Service calcService = Service.create(new URL("http://127.0.0.1:4204/CalculatorImplTimestamp1way?wsdl"),
+ Service calcService = Service.create(new URL("http://127.0.0.1:4204/webservice-ws-security/CalculatorImplTimestamp1way?wsdl"),
new QName("http://superbiz.org/wsdl", "CalculatorWsService"));
assertNotNull(calcService);
@@ -113,7 +113,7 @@ public class CalculatorTest extends Test
}
public void testCalculatorViaWsInterfaceWithTimestamp2ways() throws Exception {
- Service calcService = Service.create(new URL("http://127.0.0.1:4204/CalculatorImplTimestamp2ways?wsdl"),
+ Service calcService = Service.create(new URL("http://127.0.0.1:4204/webservice-ws-security/CalculatorImplTimestamp2ways?wsdl"),
new QName("http://superbiz.org/wsdl", "CalculatorWsService"));
assertNotNull(calcService);
@@ -147,7 +147,7 @@ public class CalculatorTest extends Test
}
public void testCalculatorViaWsInterfaceWithUsernameTokenPlainPassword() throws Exception {
- Service calcService = Service.create(new URL("http://127.0.0.1:4204/CalculatorImplUsernameTokenPlainPassword?wsdl"),
+ Service calcService = Service.create(new URL("http://127.0.0.1:4204/webservice-ws-security/CalculatorImplUsernameTokenPlainPassword?wsdl"),
new QName("http://superbiz.org/wsdl", "CalculatorWsService"));
assertNotNull(calcService);
@@ -186,7 +186,7 @@ public class CalculatorTest extends Test
}
public void testCalculatorViaWsInterfaceWithUsernameTokenHashedPassword() throws Exception {
- Service calcService = Service.create(new URL("http://127.0.0.1:4204/CalculatorImplUsernameTokenHashedPassword?wsdl"),
+ Service calcService = Service.create(new URL("http://127.0.0.1:4204/webservice-ws-security/CalculatorImplUsernameTokenHashedPassword?wsdl"),
new QName("http://superbiz.org/wsdl", "CalculatorWsService"));
assertNotNull(calcService);
@@ -225,7 +225,7 @@ public class CalculatorTest extends Test
}
public void testCalculatorViaWsInterfaceWithUsernameTokenPlainPasswordEncrypt() throws Exception {
- Service calcService = Service.create(new URL("http://127.0.0.1:4204/CalculatorImplUsernameTokenPlainPasswordEncrypt?wsdl"),
+ Service calcService = Service.create(new URL("http://127.0.0.1:4204/webservice-ws-security/CalculatorImplUsernameTokenPlainPasswordEncrypt?wsdl"),
new QName("http://superbiz.org/wsdl", "CalculatorWsService"));
assertNotNull(calcService);
@@ -267,7 +267,7 @@ public class CalculatorTest extends Test
}
public void testCalculatorViaWsInterfaceWithSign() throws Exception {
- Service calcService = Service.create(new URL("http://127.0.0.1:4204/CalculatorImplSign?wsdl"),
+ Service calcService = Service.create(new URL("http://127.0.0.1:4204/webservice-ws-security/CalculatorImplSign?wsdl"),
new QName("http://superbiz.org/wsdl", "CalculatorWsService"));
assertNotNull(calcService);
Modified: openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java?rev=1291041&r1=1291040&r2=1291041&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java (original)
+++ openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java Sun Feb 19 19:06:59 2012
@@ -65,13 +65,13 @@ public class CustomProviderTest {
}
@Test public void customProvider() {
- String response = WebClient.create("http://localhost:4204").accept("openejb/reverse")
+ String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").accept("openejb/reverse")
.path("/custom1/reverse").get(String.class);
assertEquals("provider", response);
}
@Test public void customSpecificProvider() {
- String response = WebClient.create("http://localhost:4204").accept("openejb/constant")
+ String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").accept("openejb/constant")
.path("/custom2/constant").get(String.class);
assertEquals("it works!", response);
}
Modified: openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EjbDeploymentTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EjbDeploymentTest.java?rev=1291041&r1=1291040&r2=1291041&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EjbDeploymentTest.java (original)
+++ openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EjbDeploymentTest.java Sun Feb 19 19:06:59 2012
@@ -17,22 +17,22 @@
package org.apache.openejb.server.cxf.rs;
-import java.util.Properties;
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.openejb.OpenEjbContainer;
+import org.apache.openejb.server.cxf.rs.beans.SimpleEJB;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
import javax.ejb.EJB;
import javax.ejb.Stateless;
import javax.ejb.embeddable.EJBContainer;
-import javax.naming.Context;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Request;
-import org.apache.cxf.jaxrs.client.WebClient;
-import org.apache.openejb.OpenEjbContainer;
-import org.apache.openejb.server.cxf.rs.beans.SimpleEJB;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import java.util.Properties;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotNull;
@@ -60,20 +60,20 @@ public class EjbDeploymentTest {
}
@Test public void rest() {
- String response = WebClient.create("http://localhost:4204").path("/ejb/rest").get(String.class);
+ String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").path("/ejb/rest").get(String.class);
assertEquals("ok", response);
}
@Test public void restParameterInjected() {
- String response = WebClient.create("http://localhost:4204").path("/ejb/param").get(String.class);
+ String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").path("/ejb/param").get(String.class);
assertEquals("true", response);
- response = WebClient.create("http://localhost:4204").path("/ejb/param").query("arg", "foo").get(String.class);
+ response = WebClient.create("http://localhost:4204/openejb-cxf-rs").path("/ejb/param").query("arg", "foo").get(String.class);
assertEquals("foo", response);
}
@Test public void restFieldInjected() {
- Boolean response = WebClient.create("http://localhost:4204").path("/ejb/field").get(Boolean.class);
+ Boolean response = WebClient.create("http://localhost:4204/openejb-cxf-rs").path("/ejb/field").get(Boolean.class);
assertEquals(true, response.booleanValue());
}
Modified: openejb/trunk/openejb/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CxfJaxWsProviderTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CxfJaxWsProviderTest.java?rev=1291041&r1=1291040&r2=1291041&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CxfJaxWsProviderTest.java (original)
+++ openejb/trunk/openejb/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CxfJaxWsProviderTest.java Sun Feb 19 19:06:59 2012
@@ -16,20 +16,18 @@
*/
package org.apache.openejb.server.cxf;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Properties;
+import junit.framework.TestCase;
+import org.apache.openejb.server.cxf.fault.AuthenticatorService;
+import org.apache.openejb.server.cxf.fault.WrongPasswordException;
+import org.apache.openejb.server.cxf.fault.WrongPasswordRuntimeException;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
-
-import junit.framework.TestCase;
-
-import org.apache.openejb.server.cxf.fault.AuthenticatorService;
-import org.apache.openejb.server.cxf.fault.WrongPasswordException;
-import org.apache.openejb.server.cxf.fault.WrongPasswordRuntimeException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Properties;
/**
* @version $Rev$
@@ -51,13 +49,13 @@ public class CxfJaxWsProviderTest extend
public void test00_runCheckedException() {
try {
AuthenticatorService withHandler = Service.create(
- new URL("http://localhost:4204/AuthenticatorServiceBean?wsdl"),
+ new URL("http://localhost:4204/openejb-cxf/AuthenticatorServiceBean?wsdl"),
new QName("http://superbiz.org/wsdl", "AuthenticatorServiceBeanService"))
.getPort(AuthenticatorService.class);
assertNotNull(withHandler);
AuthenticatorService noHandler = Service.create(
- new URL("http://localhost:4204/AuthenticatorServiceBeanNoHandler?wsdl"),
+ new URL("http://localhost:4204/openejb-cxf/AuthenticatorServiceBeanNoHandler?wsdl"),
new QName("http://superbiz.org/wsdl", "AuthenticatorServiceBeanNoHandlerService"))
.getPort(AuthenticatorService.class);
assertNotNull(noHandler);
@@ -90,13 +88,13 @@ public class CxfJaxWsProviderTest extend
public void test01_runRuntimeException() {
try {
AuthenticatorService withHandler = Service.create(
- new URL("http://localhost:4204/AuthenticatorServiceBean?wsdl"),
+ new URL("http://localhost:4204/openejb-cxf/AuthenticatorServiceBean?wsdl"),
new QName("http://superbiz.org/wsdl", "AuthenticatorServiceBeanService"))
.getPort(AuthenticatorService.class);
assertNotNull(withHandler);
AuthenticatorService noHandler = Service.create(
- new URL("http://localhost:4204/AuthenticatorServiceBeanNoHandler?wsdl"),
+ new URL("http://localhost:4204/openejb-cxf/AuthenticatorServiceBeanNoHandler?wsdl"),
new QName("http://superbiz.org/wsdl", "AuthenticatorServiceBeanNoHandlerService"))
.getPort(AuthenticatorService.class);
assertNotNull(noHandler);
Modified: openejb/trunk/openejb/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WebServiceWithAnUserInterceptorTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WebServiceWithAnUserInterceptorTest.java?rev=1291041&r1=1291040&r2=1291041&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WebServiceWithAnUserInterceptorTest.java (original)
+++ openejb/trunk/openejb/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WebServiceWithAnUserInterceptorTest.java Sun Feb 19 19:06:59 2012
@@ -52,7 +52,7 @@ public class WebServiceWithAnUserInterce
@Test public void test() throws Exception {
Foo foo = Service.create(
- new URL("http://localhost:4204/FooImpl?wsdl"),
+ new URL("http://localhost:4204/openejb-cxf/FooImpl?wsdl"),
new QName("http://cxf.server.openejb.apache.org/", "FooImplService"))
.getPort(Foo.class);
assertNotNull(foo);
Modified: openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java?rev=1291041&r1=1291040&r2=1291041&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java (original)
+++ openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java Sun Feb 19 19:06:59 2012
@@ -60,6 +60,7 @@ import java.util.Set;
public abstract class RESTService implements ServerService, SelfManaging, DeploymentListener {
public static final Logger LOGGER = Logger.getInstance(LogCategory.OPENEJB_RS, RESTService.class);
+ private static final boolean OLD_WEBSERVICE_DEPLOYMENT = SystemInstance.get().getOptions().get("openejb.webservice.old-deployment", false);
private static final String IP = "n/a";
private static final int PORT = -1;
@@ -213,7 +214,11 @@ public abstract class RESTService implem
final String clazz = ejbs.getKey();
if (!restEjbs.containsKey(clazz)) {
// null is important, it means there is no webroot path in standalone
- restEjbs.put(clazz, new EJBRestServiceInfo(null, beanContexts.get(clazz)));
+ String context = null;
+ if (!OLD_WEBSERVICE_DEPLOYMENT) {
+ context = ejbs.getValue().getModuleName();
+ }
+ restEjbs.put(clazz, new EJBRestServiceInfo(context, beanContexts.get(clazz)));
}
}
beanContexts.clear();
Modified: openejb/trunk/openejb/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/OpenEJBHttpWsRegistry.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/OpenEJBHttpWsRegistry.java?rev=1291041&r1=1291040&r2=1291041&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/OpenEJBHttpWsRegistry.java (original)
+++ openejb/trunk/openejb/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/OpenEJBHttpWsRegistry.java Sun Feb 19 19:06:59 2012
@@ -46,16 +46,23 @@ public class OpenEJBHttpWsRegistry exten
StringBuilder deployedPath = new StringBuilder("");
if (context != null) {
+ if (!context.startsWith("/")) {
+ deployedPath.append("/");
+ }
deployedPath.append(context);
if (!context.endsWith("/")) {
deployedPath.append("/");
}
}
- deployedPath.append(path);
+ if (path.startsWith("/") && path.length() > 1) {
+ deployedPath.append(path.substring(1));
+ } else if (path.length() > 1) {
+ deployedPath.append(path);
+ }
addWrappedHttpListener(httpListener, classLoader, deployedPath.toString());
// register wsdl locations for service-ref resolution
- return getResolvedAddresses(path);
+ return getResolvedAddresses(deployedPath.toString());
}
public void removeWsContainer(String path) {
Modified: openejb/trunk/openejb/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java?rev=1291041&r1=1291040&r2=1291041&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java (original)
+++ openejb/trunk/openejb/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java Sun Feb 19 19:06:59 2012
@@ -69,6 +69,7 @@ public abstract class WsService implemen
public static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_WS, WsService.class);
public static final String WS_ADDRESS_FORMAT = "openejb.wsAddress.format";
public static final String WS_FORCE_ADDRESS = "openejb.webservice.deployment.address";
+ private static final boolean OLD_WEBSERVICE_DEPLOYMENT = SystemInstance.get().getOptions().get("openejb.webservice.old-deployment", false);
private StringTemplate wsAddressTemplate;
private PortAddressRegistry portAddressRegistry;
@@ -263,7 +264,11 @@ public abstract class WsService implemen
transport = portInfo.transportGuarantee;
}
- List<String> addresses = wsRegistry.addWsContainer(webContextByEjb.get(bean.ejbClass), location, container, virtualHost, realm, transport, auth, classLoader);
+ String context = webContextByEjb.get(bean.ejbClass);
+ if (context == null && !OLD_WEBSERVICE_DEPLOYMENT) {
+ context = ejbJar.moduleName;
+ }
+ List<String> addresses = wsRegistry.addWsContainer(context, location, container, virtualHost, realm, transport, auth, classLoader);
// one of the registered addresses to be the canonical address
String address = HttpUtil.selectSingleAddress(addresses);