Author: thomas.diesler(a)jboss.com
Date: 2007-07-30 14:17:57 -0400 (Mon, 30 Jul 2007)
New Revision: 4029
Modified:
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentModelFactory.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeploymentModelFactory.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java
Log:
optional Endpoint.shortName
Modified:
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java
===================================================================
---
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java 2007-07-30
17:28:34 UTC (rev 4028)
+++
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java 2007-07-30
18:17:57 UTC (rev 4029)
@@ -95,11 +95,11 @@
}
}
- public Endpoint newEndpoint(String shortName, String targetBean)
+ public Endpoint newEndpoint(String targetBean)
{
try
{
- return getDeploymentModelFactory().newEndpoint(shortName, targetBean);
+ return getDeploymentModelFactory().newEndpoint(targetBean);
}
catch (Exception ex)
{
Modified:
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java
===================================================================
---
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java 2007-07-30
17:28:34 UTC (rev 4028)
+++
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java 2007-07-30
18:17:57 UTC (rev 4029)
@@ -70,7 +70,7 @@
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
DeploymentModelFactory depFactory =
spiProvider.getSPI(DeploymentModelFactory.class);
Deployment dep = depFactory.newDeployment("jaxws-endpoint-deployment",
implClass.getClassLoader());
- dep.getService().addEndpoint(depFactory.newEndpoint("jaxws-endpoint",
implClass.getName()));
+ dep.getService().addEndpoint(depFactory.newEndpoint(implClass.getName()));
}
catch (RuntimeException rte)
Modified:
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java
===================================================================
---
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-30
17:28:34 UTC (rev 4028)
+++
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-30
18:17:57 UTC (rev 4029)
@@ -88,7 +88,8 @@
String ejbClass = beanMetaData.getEjbClass();
// Create the endpoint
- Endpoint ep = newEndpoint(ejbLink, ejbClass);
+ Endpoint ep = newEndpoint(ejbClass);
+ ep.setShortName(ejbLink);
service.addEndpoint(ep);
}
}
Modified:
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java
===================================================================
---
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-30
17:28:34 UTC (rev 4028)
+++
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-30
18:17:57 UTC (rev 4029)
@@ -105,7 +105,8 @@
}
// Create the endpoint
- Endpoint ep = newEndpoint(servletLink, servletClass);
+ Endpoint ep = newEndpoint(servletClass);
+ ep.setShortName(servletLink);
service.addEndpoint(ep);
}
}
Modified:
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
===================================================================
---
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-30
17:28:34 UTC (rev 4028)
+++
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-30
18:17:57 UTC (rev 4029)
@@ -74,7 +74,8 @@
String epBean = container.getBeanClassName();
// Create the endpoint
- Endpoint ep = newEndpoint(ejbName, epBean);
+ Endpoint ep = newEndpoint(epBean);
+ ep.setShortName(ejbName);
service.addEndpoint(ep);
}
}
Modified:
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java
===================================================================
---
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-30
17:28:34 UTC (rev 4028)
+++
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-30
18:17:57 UTC (rev 4029)
@@ -80,7 +80,8 @@
String servletClass = servlet.getServletClass();
// Create the endpoint
- Endpoint ep = newEndpoint(servletName, servletClass);
+ Endpoint ep = newEndpoint(servletClass);
+ ep.setShortName(servletName);
service.addEndpoint(ep);
}
Modified:
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java
===================================================================
---
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-07-30
17:28:34 UTC (rev 4028)
+++
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-07-30
18:17:57 UTC (rev 4029)
@@ -88,11 +88,11 @@
}
}
- public Endpoint newEndpoint(String shortName, String targetBean)
+ public Endpoint newEndpoint(String targetBean)
{
try
{
- return getDeploymentModelFactory().newEndpoint(shortName, targetBean);
+ return getDeploymentModelFactory().newEndpoint(targetBean);
}
catch (Exception ex)
{
Modified:
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java
===================================================================
---
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-07-30
17:28:34 UTC (rev 4028)
+++
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-07-30
18:17:57 UTC (rev 4029)
@@ -88,7 +88,8 @@
String ejbClass = beanMetaData.getEjbClass();
// Create the endpoint
- Endpoint ep = newEndpoint(ejbLink, ejbClass);
+ Endpoint ep = newEndpoint(ejbClass);
+ ep.setShortName(ejbLink);
service.addEndpoint(ep);
}
}
Modified:
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java
===================================================================
---
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-30
17:28:34 UTC (rev 4028)
+++
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-30
18:17:57 UTC (rev 4029)
@@ -88,7 +88,8 @@
String servletClass = servlet.getServletClass();
// Create the endpoint
- Endpoint ep = newEndpoint(servletLink, servletClass);
+ Endpoint ep = newEndpoint(servletClass);
+ ep.setShortName(servletLink);
service.addEndpoint(ep);
}
}
Modified:
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java
===================================================================
---
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-30
17:28:34 UTC (rev 4028)
+++
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-30
18:17:57 UTC (rev 4029)
@@ -80,7 +80,8 @@
String epBean = container.getBeanClassName();
// Create the endpoint
- Endpoint ep = newEndpoint(ejbName, epBean);
+ Endpoint ep = newEndpoint(epBean);
+ ep.setShortName(ejbName);
service.addEndpoint(ep);
}
}
Modified:
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java
===================================================================
---
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-30
17:28:34 UTC (rev 4028)
+++
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-30
18:17:57 UTC (rev 4029)
@@ -77,7 +77,8 @@
String servletClass = servlet.getServletClass();
// Create the endpoint
- Endpoint ep = newEndpoint(servletName, servletClass);
+ Endpoint ep = newEndpoint(servletClass);
+ ep.setShortName(servletName);
service.addEndpoint(ep);
}
Modified:
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentModelFactory.java
===================================================================
---
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentModelFactory.java 2007-07-30
17:28:34 UTC (rev 4028)
+++
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentModelFactory.java 2007-07-30
18:17:57 UTC (rev 4029)
@@ -42,8 +42,8 @@
return new DefaultService();
}
- public Endpoint newEndpoint(String shortName, String targetBean)
+ public Endpoint newEndpoint(String targetBean)
{
- return new DefaultEndpoint(shortName, targetBean);
+ return new DefaultEndpoint(targetBean);
}
}
Modified:
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeploymentModelFactory.java
===================================================================
---
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeploymentModelFactory.java 2007-07-30
17:28:34 UTC (rev 4028)
+++
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeploymentModelFactory.java 2007-07-30
18:17:57 UTC (rev 4029)
@@ -42,8 +42,8 @@
return new DefaultService();
}
- public Endpoint newEndpoint(String shortName, String targetBean)
+ public Endpoint newEndpoint(String targetBean)
{
- return new DefaultEndpoint(shortName, targetBean);
+ return new DefaultEndpoint(targetBean);
}
}
Modified:
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java
===================================================================
---
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2007-07-30
17:28:34 UTC (rev 4028)
+++
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2007-07-30
18:17:57 UTC (rev 4029)
@@ -57,9 +57,8 @@
private List<BindingCustomization> bindingCustomizsations = new
ArrayList<BindingCustomization>();
private String address;
- DefaultEndpoint(String shortName, String targetBean)
+ DefaultEndpoint(String targetBean)
{
- this.shortName = shortName;
this.targetBean = targetBean;
this.state = EndpointState.UNDEFINED;
}
Modified:
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java
===================================================================
---
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java 2007-07-30
17:28:34 UTC (rev 4028)
+++
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java 2007-07-30
18:17:57 UTC (rev 4029)
@@ -30,7 +30,8 @@
public abstract class DeploymentModelFactory implements SPIView
{
public abstract Deployment newDeployment(String simpleName, ClassLoader
initialLoader);
+
public abstract Service newService();
- public abstract Endpoint newEndpoint(String shortName, String targetBean);
+ public abstract Endpoint newEndpoint(String targetBean);
}
Modified:
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java
===================================================================
---
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java 2007-07-30
17:28:34 UTC (rev 4028)
+++
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java 2007-07-30
18:17:57 UTC (rev 4029)
@@ -49,7 +49,7 @@
public void testCustomizationWriteAccess() throws Exception
{
- Endpoint endpoint = deploymentModelFactory.newEndpoint(null, null);
+ Endpoint endpoint = deploymentModelFactory.newEndpoint(null);
JAXBBindingCustomization jaxbCustomization = new JAXBBindingCustomization();
jaxbCustomization.put(JAXBBindingCustomization.DEFAULT_NAMESPACE_REMAP,
"http://org.jboss.bindingCustomization");
endpoint.addAttachment(BindingCustomization.class, jaxbCustomization);
@@ -70,7 +70,7 @@
public void testCustomizationReadAccess() throws Exception
{
- Endpoint endpoint = deploymentModelFactory.newEndpoint(null, null);
+ Endpoint endpoint = deploymentModelFactory.newEndpoint(null);
JAXBBindingCustomization jaxbCustomization = new JAXBBindingCustomization();
jaxbCustomization.put(JAXBBindingCustomization.DEFAULT_NAMESPACE_REMAP,
"http://org.jboss.bindingCustomization");
endpoint.addAttachment(BindingCustomization.class, jaxbCustomization);