[jbossws-commits] JBossWS SVN: r3196 - trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-05-22 15:45:49 -0400 (Tue, 22 May 2007)
New Revision: 3196

Modified:
   trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppGeneratorDeployer.java
Log:
Fix EJB3 security

Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppGeneratorDeployer.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppGeneratorDeployer.java	2007-05-22 19:32:06 UTC (rev 3195)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppGeneratorDeployer.java	2007-05-22 19:45:49 UTC (rev 3196)
@@ -165,6 +165,16 @@
          String beanAuthMethod = null;
 
          WebContext anWebContext = (WebContext)ep.getTargetBeanClass().getAnnotation(WebContext.class);
+         if(anWebContext != null)
+         {
+            if (anWebContext.authMethod().length() > 0)
+               beanAuthMethod = anWebContext.authMethod();
+            if (anWebContext.transportGuarantee().length() > 0)
+               transportGuarantee = anWebContext.transportGuarantee();
+            if (anWebContext.secureWSDLAccess())
+               secureWSDLAccess = anWebContext.secureWSDLAccess();
+         }
+         
          UnifiedApplicationMetaData appMetaData = dep.getContext().getAttachment(UnifiedApplicationMetaData.class);
          if (appMetaData != null && appMetaData.getBeanByEjbName(ejbName) != null)
          {
@@ -177,15 +187,6 @@
                secureWSDLAccess = pc.getSecureWSDLAccess();
             }
          }
-         else if(anWebContext != null)
-         {
-            if (anWebContext.authMethod().length() > 0)
-               beanAuthMethod = anWebContext.authMethod();
-            if (anWebContext.transportGuarantee().length() > 0)
-               transportGuarantee = anWebContext.transportGuarantee();
-            if (anWebContext.secureWSDLAccess())
-               secureWSDLAccess = anWebContext.secureWSDLAccess();
-         }
 
          if (beanAuthMethod != null || transportGuarantee != null)
          {