Author: thomas.diesler(a)jboss.com
Date: 2007-04-26 08:45:01 -0400 (Thu, 26 Apr 2007)
New Revision: 2931
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointGeneratorEJB.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java
Log:
Restore SEI name as <servlet-class>
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointGeneratorEJB.java
===================================================================
---
trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointGeneratorEJB.java 2007-04-26
12:34:40 UTC (rev 2930)
+++
trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointGeneratorEJB.java 2007-04-26
12:45:01 UTC (rev 2931)
@@ -119,11 +119,10 @@
servletName.appendChild(DOMUtils.createTextNode(ejbName));
Element servletClass =
(Element)servlet.appendChild(DOMUtils.createElement("servlet-class"));
- String servletClassName = sepMetaData.getServiceEndpointImplName();
- if (servletClassName == null)
- throw new IllegalStateException("Cannot obtain endpoint bean
name");
-
- servletClass.appendChild(DOMUtils.createTextNode(servletClassName));
+ String implName = sepMetaData.getServiceEndpointImplName();
+ String seiName = sepMetaData.getServiceEndpointInterfaceName();
+ String endpointTarget = (implName != null ? implName : seiName);
+ servletClass.appendChild(DOMUtils.createTextNode(endpointTarget));
}
/*
Modified:
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java
===================================================================
---
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java 2007-04-26
12:34:40 UTC (rev 2930)
+++
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java 2007-04-26
12:45:01 UTC (rev 2931)
@@ -47,7 +47,7 @@
protected void setUp() throws Exception
{
super.setUp();
- if (port == null && isTargetJBoss50() == false)
+ if (port == null)
{
InitialContext iniCtx = getInitialContext();
Service service =
(Service)iniCtx.lookup("java:comp/env/service/TestService");
@@ -55,14 +55,8 @@
}
}
- public void testHandlers() throws Exception
+ public void testEndpoint() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and
Servlets");
- return;
- }
-
String res = port.helloEnvEntry("InitalMessage");
assertEquals("InitalMessage:ClientSideHandler:appclient:8:ServerSideHandler:ejb:8:endpoint:ejb:8:ServerSideHandler:ejb:8:ClientSideHandler:appclient:8",
res);
}
Modified:
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java
===================================================================
---
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java 2007-04-26
12:34:40 UTC (rev 2930)
+++
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java 2007-04-26
12:45:01 UTC (rev 2931)
@@ -55,14 +55,8 @@
}
}
- public void testHandlers() throws Exception
+ public void testEndpoint() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and
Servlets");
- return;
- }
-
String res = port.helloEnvEntry("InitalMessage");
assertEquals("InitalMessage:ClientSideHandler:appclient:8:ServerSideHandler:web:8:endpoint:web:8:ServerSideHandler:web:8:ClientSideHandler:appclient:8",
res);
}
Show replies by date