[jboss-cvs] JBossAS SVN: r107882 - branches/weld-snapshot/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env.

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

Author: pete.muir at jboss.org
Date: 2010-08-30 06:18:30 -0400 (Mon, 30 Aug 2010)
New Revision: 107882

Modified:
   branches/weld-snapshot/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/ArchiveDiscoveryDeployer.java
   branches/weld-snapshot/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldDiscoveryDeployer.java
   branches/weld-snapshot/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldDiscoveryEnvironment.java
Log:
WELD-644, Weld loads classes, not AS

Modified: branches/weld-snapshot/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/ArchiveDiscoveryDeployer.java
===================================================================
--- branches/weld-snapshot/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/ArchiveDiscoveryDeployer.java	2010-08-30 09:54:49 UTC (rev 107881)
+++ branches/weld-snapshot/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/ArchiveDiscoveryDeployer.java	2010-08-30 10:18:30 UTC (rev 107882)
@@ -58,6 +58,7 @@
       setStage(DeploymentStages.PRE_REAL);
    }
 
+   @Override
    public void deploy(VFSDeploymentUnit unit, JBossWeldMetaData deployment) throws DeploymentException
    {
       @SuppressWarnings("unchecked")
@@ -139,7 +140,7 @@
 
       public void visit(ResourceContext resource)
       {
-         wbdi.addWeldClass(resource.loadClass());
+         wbdi.addWeldClass(resource.getClassName());
       }
    }
 }
\ No newline at end of file

Modified: branches/weld-snapshot/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldDiscoveryDeployer.java
===================================================================
--- branches/weld-snapshot/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldDiscoveryDeployer.java	2010-08-30 09:54:49 UTC (rev 107881)
+++ branches/weld-snapshot/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldDiscoveryDeployer.java	2010-08-30 10:18:30 UTC (rev 107882)
@@ -132,7 +132,7 @@
 
       public void visit(ResourceContext resource)
       {
-         wbdi.addWeldClass(resource.loadClass());
+         wbdi.addWeldClass(resource.getClassName());
       }
    }
 }
\ No newline at end of file

Modified: branches/weld-snapshot/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldDiscoveryEnvironment.java
===================================================================
--- branches/weld-snapshot/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldDiscoveryEnvironment.java	2010-08-30 09:54:49 UTC (rev 107881)
+++ branches/weld-snapshot/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldDiscoveryEnvironment.java	2010-08-30 10:18:30 UTC (rev 107882)
@@ -42,9 +42,9 @@
     *
     * @param clazz the weld class
     */
-   public void addWeldClass(Class<?> clazz)
+   public void addWeldClass(String className)
    {
-      classes.add(clazz.getName());
+      classes.add(className);
    }
 
    /**