[jbossws-commits] JBossWS SVN: r1712 - branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 16:26:29 -0500 (Thu, 21 Dec 2006)
New Revision: 1712
Modified:
branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java
branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointPublisher.java
Log:
Modified:
branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java
===================================================================
---
branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java 2006-12-21
21:26:25 UTC (rev 1711)
+++
branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java 2006-12-21
21:26:29 UTC (rev 1712)
@@ -29,11 +29,11 @@
import org.jboss.deployment.DeploymentInfo;
import org.jboss.metadata.WebMetaData;
-import org.jboss.mx.server.Invocation;
import org.jboss.ws.WSException;
+import org.jboss.ws.core.server.AbstractServiceEndpointPublisher;
import org.jboss.ws.core.server.JAXWSDeployment;
-import org.jboss.ws.core.server.AbstractServiceEndpointPublisher;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
+import org.jboss.ws.core.server.AbstractServiceEndpointPublisher.RewriteResults;
import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType;
import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
@@ -84,9 +84,26 @@
if (udi != null)
{
AbstractServiceEndpointPublisher endpointPublisher =
getServiceEndpointPublisher();
- endpointPublisher.rewriteWebXml(udi);
+ RewriteResults results = endpointPublisher.rewriteWebXml(udi.url);
+ updateServiceEndpointTargetBeans(udi, results);
}
}
+
+ private void updateServiceEndpointTargetBeans(UnifiedDeploymentInfo udi,
RewriteResults results)
+ {
+ UnifiedMetaData wsMetaData = getServiceEndpointDeployer().getUnifiedMetaData(udi);
+ Map<String, String> sepTargetMap = results.sepTargetMap;
+
+ for (ServiceMetaData serviceMetaData : wsMetaData.getServices())
+ {
+ for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints())
+ {
+ ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData;
+ String targetBean = sepTargetMap.get(sepMetaData.getLinkName());
+ sepMetaData.setServiceEndpointImplName(targetBean);
+ }
+ }
+ }
/** Return true if the deployment is a web service endpoint
*/
Modified:
branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointPublisher.java
===================================================================
---
branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointPublisher.java 2006-12-21
21:26:25 UTC (rev 1711)
+++
branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointPublisher.java 2006-12-21
21:26:29 UTC (rev 1712)
@@ -49,12 +49,12 @@
public String publishServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception
{
- URL warURL = udi.expandedWebApp;
DeploymentInfo di =
(DeploymentInfo)udi.context.get(DeploymentInfo.class.getName());
if (di == null)
throw new IllegalStateException("Cannot obtain DeploymentInfo from
context");
- rewriteWebXml(udi);
+ URL warURL = udi.url;
+ rewriteWebXml(warURL);
// Preserve the repository config
DeploymentInfo auxdi = new DeploymentInfo(warURL, null,
MBeanServerLocator.locateJBoss());