[jboss-cvs] JBossAS SVN: r66602 - trunk/webservices/src/main/org/jboss/wsf/container/jboss50.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-10-31 08:18:08 -0400 (Wed, 31 Oct 2007)
New Revision: 66602

Modified:
   trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JSEArchiveMetaDataAdapter.java
Log:
Fix config-name for jse endpoints

Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JSEArchiveMetaDataAdapter.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JSEArchiveMetaDataAdapter.java	2007-10-31 12:12:20 UTC (rev 66601)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JSEArchiveMetaDataAdapter.java	2007-10-31 12:18:08 UTC (rev 66602)
@@ -29,6 +29,7 @@
 import java.util.Map;
 
 import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.logging.Logger;
 import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData;
 import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData;
 import org.jboss.metadata.ear.jboss.JBossAppMetaData;
@@ -56,6 +57,9 @@
  */
 public class JSEArchiveMetaDataAdapter
 {
+   // logging support
+   private static Logger log = Logger.getLogger(JSEArchiveMetaDataAdapter.class);
+   
    public JSEArchiveMetaData buildMetaData(Deployment dep, DeploymentUnit unit)
    {
       String contextRoot = null;
@@ -95,9 +99,20 @@
 
    private void setConfigNameAndFile(JSEArchiveMetaData umd, JBossWebMetaData jbossWebMetaData)
    {
-      String configName = jbossWebMetaData.getConfigName();
-      String configFile = jbossWebMetaData.getConfigFile();
+      String configName = null;
+      String configFile = null;
       
+      WebserviceDescriptionsMetaData wsDescriptions = jbossWebMetaData.getWebserviceDescriptions();
+      if (wsDescriptions != null && wsDescriptions.size() > 1)
+         log.warn("Multiple <webservice-description> elements not supported");
+
+      if (wsDescriptions != null && wsDescriptions.size() > 0)
+      {
+         WebserviceDescriptionMetaData wsd = wsDescriptions.iterator().next();
+         configName = wsd.getConfigName();
+         configFile = wsd.getConfigFile();
+      }
+
       List<ParamValueMetaData> contextParams = jbossWebMetaData.getContextParams();
       if (contextParams != null)
       {