[jboss-cvs] JBossAS SVN: r77019 - trunk/server/src/main/org/jboss/deployment.

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

Author: emuckenhuber
Date: 2008-08-13 12:50:33 -0400 (Wed, 13 Aug 2008)
New Revision: 77019

Modified:
   trunk/server/src/main/org/jboss/deployment/OptAnnotationMetaDataDeployer.java
Log:
correct client annotation processing [JBMETA-94]

Modified: trunk/server/src/main/org/jboss/deployment/OptAnnotationMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/OptAnnotationMetaDataDeployer.java	2008-08-13 16:48:13 UTC (rev 77018)
+++ trunk/server/src/main/org/jboss/deployment/OptAnnotationMetaDataDeployer.java	2008-08-13 16:50:33 UTC (rev 77019)
@@ -62,29 +62,23 @@
 
    protected void processMetaData(VFSDeploymentUnit unit, WebMetaData webMetaData, ApplicationClientMetaData clientMetaData, List<VirtualFile> classpath) throws Exception
    {
+      String mainClassName = getMainClassName(unit);
       AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
       if(webMetaData != null)
       {
          processJBossWebMetaData(unit, finder);
       }
+      else if (clientMetaData != null || mainClassName != null)
+      {
+         // 
+         if(mainClassName == null)
+            return;
+         
+         processJBossClientMetaData(unit, finder, mainClassName);
+      }
       else
       {
-         if (clientMetaData != null)
-         {
-            processJBossClientMetaData(unit, finder);
-         }
-         else
-         {
-            String mainClassName = getMainClassName(unit);
-            if (mainClassName != null)
-            {
-               processJBossClientMetaData(unit, finder);
-            }
-            else
-            {
-               processJBossMetaData(unit, finder);
-            }
-         }
+         processJBossMetaData(unit, finder);
       }
    }
 
@@ -109,9 +103,9 @@
     * @param unit the deployment unit
     * @param finder the finder
     */
-   protected void processJBossClientMetaData(VFSDeploymentUnit unit, AnnotationFinder<AnnotatedElement> finder)
+   protected void processJBossClientMetaData(VFSDeploymentUnit unit, AnnotationFinder<AnnotatedElement> finder, String mainClassName)
    {
-      ApplicationClient5MetaDataCreator creator = new ApplicationClient5MetaDataCreator(finder);
+      ApplicationClient5MetaDataCreator creator = new ApplicationClient5MetaDataCreator(finder, mainClassName);
       Collection<Class<?>> classes = getClasses(unit, creator);
       ApplicationClientMetaData annotationMetaData = creator.create(classes);
       if(annotationMetaData != null)