[jbossws-commits] JBossWS SVN: r1766 - branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2006-12-23 17:06:20 -0500 (Sat, 23 Dec 2006)
New Revision: 1766

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/DeploymentInfoAdaptor.java
   branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointPublisher.java
Log:
partial commit

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-23 22:06:16 UTC (rev 1765)
+++ branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java	2006-12-23 22:06:20 UTC (rev 1766)
@@ -84,7 +84,7 @@
       if (udi != null)
       {
          AbstractServiceEndpointPublisher endpointPublisher = getServiceEndpointPublisher();
-         RewriteResults results = endpointPublisher.rewriteWebXml(udi.url);
+         RewriteResults results = endpointPublisher.rewriteWebXml(udi);
          updateServiceEndpointTargetBeans(udi, results);
       }
    }

Modified: branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdaptor.java
===================================================================
--- branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdaptor.java	2006-12-23 22:06:16 UTC (rev 1765)
+++ branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdaptor.java	2006-12-23 22:06:20 UTC (rev 1766)
@@ -51,9 +51,10 @@
       udi.name = di.getCanonicalName();
       udi.simpleName = di.shortName;
       udi.url = getDeploymentURL(di);
-      udi.metaData = buildMetaData(di.metaData);
       udi.classLoader = di.annotationsCl;
       udi.deployedObject = di.deployedObject;
+      
+      buildMetaData(udi, di.metaData);
 
       return udi;
    }
@@ -72,17 +73,16 @@
       return deploymentURL;
    }
 
-   private static Object buildMetaData(Object metaData)
+   private static void buildMetaData(UnifiedDeploymentInfo udi, Object metaData)
    {
-      Object retMetaData = null;
       if (metaData instanceof WebMetaData)
       {
-         retMetaData = WebMetaDataAdaptor.buildUnifiedWebMetaData((WebMetaData)metaData);
+         udi.metaData = WebMetaDataAdaptor.buildUnifiedWebMetaData((WebMetaData)metaData);
+         udi.webappURL = udi.url;
       }
       else if (metaData instanceof ApplicationMetaData)
       {
-         retMetaData = ApplicationMetaDataAdaptor.buildUnifiedApplicationMetaData((ApplicationMetaData)metaData);
+         udi.metaData = ApplicationMetaDataAdaptor.buildUnifiedApplicationMetaData((ApplicationMetaData)metaData);
       }
-      return retMetaData;
    }
 }

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-23 22:06:16 UTC (rev 1765)
+++ branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointPublisher.java	2006-12-23 22:06:20 UTC (rev 1766)
@@ -53,10 +53,10 @@
       if (di == null)
          throw new IllegalStateException("Cannot obtain DeploymentInfo from context");
 
-      URL warURL = udi.url;
-      rewriteWebXml(warURL);
+      rewriteWebXml(udi);
 
       // Preserve the repository config
+      URL warURL = udi.webappURL;
       DeploymentInfo auxdi = new DeploymentInfo(warURL, null, MBeanServerLocator.locateJBoss());
       auxdi.repositoryConfig = di.getTopRepositoryConfig();
       getMainDeployer().deploy(auxdi);