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

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

Author: thomas.diesler at jboss.com
Date: 2007-11-05 12:32:41 -0500 (Mon, 05 Nov 2007)
New Revision: 66746

Modified:
   trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPreJSE.java
Log:
Fix JBWS-1762 for JAXWS JSE

Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPreJSE.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPreJSE.java	2007-11-05 17:22:10 UTC (rev 66745)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPreJSE.java	2007-11-05 17:32:41 UTC (rev 66746)
@@ -70,7 +70,7 @@
       // Copy the attachments
       dep.addAttachment(JBossWebMetaData.class, webMetaData);
 
-      List<ServletMetaData> servlets = getRelevantServletMetaDatas(webMetaData, unit.getClassLoader());
+      List<ServletMetaData> servlets = getRelevantServlets(webMetaData, unit.getClassLoader());
       for (ServletMetaData servlet : servlets)
       {
          String servletName = servlet.getName();
@@ -95,7 +95,7 @@
       try
       {
          JBossWebMetaData webMetaData = unit.getAttachment(JBossWebMetaData.class);
-         List<ServletMetaData> servlets = getRelevantServletMetaDatas(webMetaData, unit.getClassLoader());
+         List<ServletMetaData> servlets = getRelevantServlets(webMetaData, unit.getClassLoader());
          isWebServiceDeployment = servlets.size() > 0;
       }
       catch (Exception ex)
@@ -106,12 +106,12 @@
       return isWebServiceDeployment;
    }
 
-   private List<ServletMetaData> getRelevantServletMetaDatas(JBossWebMetaData webMetaData, ClassLoader loader)
+   private List<ServletMetaData> getRelevantServlets(JBossWebMetaData webMetaData, ClassLoader loader)
    {
       List<ServletMetaData> servlets = new ArrayList<ServletMetaData>();
       for (ServletMetaData servlet : webMetaData.getServlets())
       {
-         String servletClassName = servlet.getServletClass();
+         String servletClassName = getTargetBean(servlet);
 
          // Skip JSPs
          if (servletClassName == null || servletClassName.length() == 0)