Author: thomas.diesler(a)jboss.com
Date: 2007-05-16 08:24:40 -0400 (Wed, 16 May 2007)
New Revision: 3106
Added:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/
Modified:
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerJSE.java
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookEJB21.java
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookJSE.java
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookEJB3.java
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookJSE.java
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookEJB21.java
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookJSE.java
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookEJB3.java
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookJSE.java
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ModifyWebMetaDataDeployer.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/BasicEndpoint.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/Endpoint.java
branches/tdiesler/trunk/integration/sunri-jboss50/src/main/java/org/jboss/ws/integration/jboss50/sunri/SunJaxwsDeployer.java
branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/deployment/UnifiedMetaDataAssociationDeployer.java
branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
Log:
restructure
Modified:
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerJSE.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerJSE.java 2007-05-16
12:10:39 UTC (rev 3105)
+++
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerJSE.java 2007-05-16
12:24:40 UTC (rev 3106)
@@ -62,7 +62,7 @@
public Object getTargetBean(Endpoint endpoint) throws InstantiationException,
IllegalAccessException
{
- Class epImpl = endpoint.getEndpointImpl();
+ Class epImpl = endpoint.getTargetBean();
Object targetBean = epImpl.newInstance();
return targetBean;
}
Modified:
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookEJB21.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookEJB21.java 2007-05-16
12:10:39 UTC (rev 3105)
+++
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookEJB21.java 2007-05-16
12:24:40 UTC (rev 3106)
@@ -92,7 +92,7 @@
// Create the endpoint
Endpoint ep = createEndpoint();
ep.setService(service);
- ep.setEndpointImpl(epBean);
+ ep.setTargetBean(epBean);
String nameStr = Endpoint.SEPID_DOMAIN + ":" +
Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbLink;
ep.setName(ObjectNameFactory.create(nameStr));
Modified:
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookJSE.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookJSE.java 2007-05-16
12:10:39 UTC (rev 3105)
+++
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookJSE.java 2007-05-16
12:24:40 UTC (rev 3106)
@@ -95,7 +95,7 @@
// Create the endpoint
Endpoint ep = createEndpoint();
ep.setService(service);
- ep.setEndpointImpl(epBean);
+ ep.setTargetBean(epBean);
String nameStr = Endpoint.SEPID_DOMAIN + ":" +
Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletLink;
ep.setName(ObjectNameFactory.create(nameStr));
Modified:
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookEJB3.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookEJB3.java 2007-05-16
12:10:39 UTC (rev 3105)
+++
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookEJB3.java 2007-05-16
12:24:40 UTC (rev 3106)
@@ -83,7 +83,7 @@
// Create the endpoint
Endpoint ep = createEndpoint();
ep.setService(service);
- ep.setEndpointImpl(epBean);
+ ep.setTargetBean(epBean);
String nameStr = Endpoint.SEPID_DOMAIN + ":" +
Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbName;
ep.setName(ObjectNameFactory.create(nameStr));
Modified:
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookJSE.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookJSE.java 2007-05-16
12:10:39 UTC (rev 3105)
+++
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookJSE.java 2007-05-16
12:24:40 UTC (rev 3106)
@@ -85,7 +85,7 @@
// Create the endpoint
Endpoint ep = createEndpoint();
ep.setService(service);
- ep.setEndpointImpl(epBean);
+ ep.setTargetBean(epBean);
String nameStr = Endpoint.SEPID_DOMAIN + ":" +
Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName;
ep.setName(ObjectNameFactory.create(nameStr));
Modified:
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookEJB21.java
===================================================================
---
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookEJB21.java 2007-05-16
12:10:39 UTC (rev 3105)
+++
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookEJB21.java 2007-05-16
12:24:40 UTC (rev 3106)
@@ -92,7 +92,7 @@
// Create the endpoint
Endpoint ep = createEndpoint();
ep.setService(service);
- ep.setEndpointImpl(epBean);
+ ep.setTargetBean(epBean);
String nameStr = Endpoint.SEPID_DOMAIN + ":" +
Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbLink;
ep.setName(ObjectNameFactory.create(nameStr));
Modified:
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookJSE.java
===================================================================
---
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookJSE.java 2007-05-16
12:10:39 UTC (rev 3105)
+++
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookJSE.java 2007-05-16
12:24:40 UTC (rev 3106)
@@ -102,7 +102,7 @@
// Create the endpoint
Endpoint ep = createEndpoint();
ep.setService(service);
- ep.setEndpointImpl(epBean);
+ ep.setTargetBean(epBean);
String nameStr = Endpoint.SEPID_DOMAIN + ":" +
Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletLink;
ep.setName(ObjectNameFactory.create(nameStr));
Modified:
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookEJB3.java
===================================================================
---
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookEJB3.java 2007-05-16
12:10:39 UTC (rev 3105)
+++
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookEJB3.java 2007-05-16
12:24:40 UTC (rev 3106)
@@ -74,7 +74,7 @@
// Create the endpoint
Endpoint ep = createEndpoint();
ep.setService(service);
- ep.setEndpointImpl(epBean);
+ ep.setTargetBean(epBean);
String nameStr = Endpoint.SEPID_DOMAIN + ":" +
Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbName;
ep.setName(ObjectNameFactory.create(nameStr));
Modified:
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookJSE.java
===================================================================
---
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookJSE.java 2007-05-16
12:10:39 UTC (rev 3105)
+++
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookJSE.java 2007-05-16
12:24:40 UTC (rev 3106)
@@ -85,7 +85,7 @@
// Create the endpoint
Endpoint ep = createEndpoint();
ep.setService(service);
- ep.setEndpointImpl(epBean);
+ ep.setTargetBean(epBean);
String nameStr = Endpoint.SEPID_DOMAIN + ":" +
Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName;
ep.setName(ObjectNameFactory.create(nameStr));
Modified:
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ModifyWebMetaDataDeployer.java
===================================================================
---
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ModifyWebMetaDataDeployer.java 2007-05-16
12:10:39 UTC (rev 3105)
+++
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ModifyWebMetaDataDeployer.java 2007-05-16
12:24:40 UTC (rev 3106)
@@ -58,7 +58,7 @@
// <servlet-class> originally contained a javax.servlet.Servlet
for (Endpoint ep : dep.getService().getEndpoints())
{
- if (ep.getEndpointImpl() == null)
+ if (ep.getTargetBean() == null)
{
String servletName =
ep.getName().getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT);
String beanName = results.sepTargetMap.get(servletName);
@@ -69,7 +69,7 @@
{
ClassLoader loader = dep.getClassLoader();
Class<?> epBean = loader.loadClass(beanName);
- ep.setEndpointImpl(epBean);
+ ep.setTargetBean(epBean);
ServerEndpointMetaData sepMetaData =
ep.getAttachment(ServerEndpointMetaData.class);
sepMetaData.setServiceEndpointImplName(beanName);
Modified:
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/BasicEndpoint.java
===================================================================
---
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/BasicEndpoint.java 2007-05-16
12:10:39 UTC (rev 3105)
+++
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/BasicEndpoint.java 2007-05-16
12:24:40 UTC (rev 3106)
@@ -72,7 +72,7 @@
{
private Service service;
private ObjectName name;
- private Class endpointImpl;
+ private Class targetBean;
private EndpointState state;
private RequestHandler requestHandler;
private InvocationHandler invocationHandler;
@@ -94,14 +94,14 @@
this.service = service;
}
- public Class getEndpointImpl()
+ public Class getTargetBean()
{
- return endpointImpl;
+ return targetBean;
}
- public void setEndpointImpl(Class endpointImpl)
+ public void setTargetBean(Class targetBean)
{
- this.endpointImpl = endpointImpl;
+ this.targetBean = targetBean;
}
public EndpointState getState()
Modified:
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/Endpoint.java
===================================================================
---
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/Endpoint.java 2007-05-16
12:10:39 UTC (rev 3105)
+++
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/Endpoint.java 2007-05-16
12:24:40 UTC (rev 3106)
@@ -97,10 +97,10 @@
void setState(EndpointState state);
/** Get the endpoint implementation bean */
- Class getEndpointImpl();
+ Class getTargetBean();
/** Set the endpoint implementation bean */
- void setEndpointImpl(Class epImpl);
+ void setTargetBean(Class epImpl);
/** Set the request handler for this endpoint */
void setRequestHandler(RequestHandler handler);
Modified:
branches/tdiesler/trunk/integration/sunri-jboss50/src/main/java/org/jboss/ws/integration/jboss50/sunri/SunJaxwsDeployer.java
===================================================================
---
branches/tdiesler/trunk/integration/sunri-jboss50/src/main/java/org/jboss/ws/integration/jboss50/sunri/SunJaxwsDeployer.java 2007-05-16
12:10:39 UTC (rev 3105)
+++
branches/tdiesler/trunk/integration/sunri-jboss50/src/main/java/org/jboss/ws/integration/jboss50/sunri/SunJaxwsDeployer.java 2007-05-16
12:24:40 UTC (rev 3106)
@@ -50,7 +50,7 @@
for (Endpoint ep : dep.getService().getEndpoints())
{
String name = getName(dep, ep);
- String implementation = ep.getEndpointImpl().getName();
+ String implementation = ep.getTargetBean().getName();
String urlPattern = getUrlPattern(dep, ep);
DDEndpoint ddep = new DDEndpoint(name, implementation, urlPattern);
@@ -63,7 +63,7 @@
private String getName(Deployment dep, Endpoint ep)
{
String name = null;
- String impl = ep.getEndpointImpl().getName();
+ String impl = ep.getTargetBean().getName();
WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class);
if (webMetaData != null)
{
@@ -82,7 +82,7 @@
private String getUrlPattern(Deployment dep, Endpoint ep)
{
String urlPattern = null;
- String impl = ep.getEndpointImpl().getName();
+ String impl = ep.getTargetBean().getName();
WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class);
if (webMetaData != null)
{
Modified:
branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/deployment/UnifiedMetaDataAssociationDeployer.java
===================================================================
---
branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/deployment/UnifiedMetaDataAssociationDeployer.java 2007-05-16
12:10:39 UTC (rev 3105)
+++
branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/deployment/UnifiedMetaDataAssociationDeployer.java 2007-05-16
12:24:40 UTC (rev 3106)
@@ -56,7 +56,7 @@
sepMetaData = getEndpointMetaData(umd, ep.getName());
ep.addAttachment(ServerEndpointMetaData.class, sepMetaData);
- Class targetBean = ep.getEndpointImpl();
+ Class targetBean = ep.getTargetBean();
if (targetBean != null)
sepMetaData.setServiceEndpointImplName(targetBean.getName());
}
Modified:
branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
---
branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-05-16
12:10:39 UTC (rev 3105)
+++
branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-05-16
12:24:40 UTC (rev 3106)
@@ -422,7 +422,7 @@
protected Method getImplMethod(Endpoint endpoint, EndpointInvocation epInv) throws
ClassNotFoundException, NoSuchMethodException
{
- Class implClass = endpoint.getEndpointImpl();
+ Class implClass = endpoint.getTargetBean();
Method seiMethod = epInv.getJavaMethod();
String methodName = seiMethod.getName();