[jboss-cvs] JBossAS SVN: r106333 - in projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld: wbtomc and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Jun 29 16:02:28 EDT 2010


Author: kabir.khan at jboss.com
Date: 2010-06-29 16:02:22 -0400 (Tue, 29 Jun 2010)
New Revision: 106333

Added:
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/Bean.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanConstructor.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanField.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanMixed.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/FailedBean.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBean.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanAnnotationsFromMetaData.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanInitializerMethod.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanInjectedFromWeldAndMcFields.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanMcConstructor.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanWebBeanSetter.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanWithPostConstructAndPreDestroy.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/MissingDependenciesConstructorBean.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/MissingDependenciesFieldBean.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/Simple.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/WebBean.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/WebBeanConsumer.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/test/
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/test/InjectWeldInMcBeansTestCase.java
Removed:
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/push/
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/Bean.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanConstructor.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanField.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanMixed.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/FailedBean.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBean.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanAnnotationsFromMetaData.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanInitializerMethod.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanInjectedFromWeldAndMcFields.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanMcConstructor.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanWebBeanSetter.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanWithPostConstructAndPreDestroy.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/MissingDependenciesConstructorBean.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/MissingDependenciesFieldBean.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/Simple.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/WebBean.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/WebBeanConsumer.java
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/test/InjectWeldInMcBeansTestCase.java
Modified:
   projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/WeldTestSuite.java
Log:
Last commit was the wrong way around :-)

Modified: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/WeldTestSuite.java
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/WeldTestSuite.java	2010-06-29 19:42:00 UTC (rev 106332)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/WeldTestSuite.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -28,7 +28,7 @@
 import org.jboss.test.kernel.weld.bidirectional.test.BidirectionalWeldAndMcTestCase;
 //import org.jboss.test.kernel.weld.beanwrapper.test.BeanImplementationTestCase;
 import org.jboss.test.kernel.weld.mctowb.test.InjectMcBeansInWeldTestCase;
-import org.jboss.test.kernel.weld.wbtomc.push.test.InjectWeldInMcBeansTestCase;
+import org.jboss.test.kernel.weld.wbtomc.test.InjectWeldInMcBeansTestCase;
 
 /**
  * 

Copied: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support (from rev 106315, projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support)

Deleted: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/Bean.java
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/Bean.java	2010-06-29 17:19:52 UTC (rev 106315)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/Bean.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -1,45 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors. 
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.test.kernel.weld.wbtomc.support;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
- at Retention(RetentionPolicy.RUNTIME)
- at Qualifier
- at Target({METHOD, FIELD, PARAMETER, TYPE})
-public @interface Bean {
-
-}

Copied: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/Bean.java (from rev 106315, projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/Bean.java)
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/Bean.java	                        (rev 0)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/Bean.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -0,0 +1,45 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors. 
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/ 
+package org.jboss.test.kernel.weld.wbtomc.support;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Retention(RetentionPolicy.RUNTIME)
+ at Qualifier
+ at Target({METHOD, FIELD, PARAMETER, TYPE})
+public @interface Bean {
+
+}

Deleted: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanConstructor.java
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanConstructor.java	2010-06-29 17:19:52 UTC (rev 106315)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanConstructor.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -1,56 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors. 
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.test.kernel.weld.wbtomc.support;
-
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
-
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class ExternalBeanConstructor
-{
-   WebBean bean;
-   
-   WebBean nonAnnotated;
-   
-   @Inject
-   public ExternalBeanConstructor(@Default WebBean bean)
-   {
-      this.bean = bean;
-   }
-
-   public WebBean getBean()
-   {
-      return bean;
-   }
-
-   public WebBean getNonAnnotated()
-   {
-      return nonAnnotated;
-   }
-   
-   
-}

Copied: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanConstructor.java (from rev 106315, projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanConstructor.java)
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanConstructor.java	                        (rev 0)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanConstructor.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -0,0 +1,56 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors. 
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/ 
+package org.jboss.test.kernel.weld.wbtomc.support;
+
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
+
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class ExternalBeanConstructor
+{
+   WebBean bean;
+   
+   WebBean nonAnnotated;
+   
+   @Inject
+   public ExternalBeanConstructor(@Default WebBean bean)
+   {
+      this.bean = bean;
+   }
+
+   public WebBean getBean()
+   {
+      return bean;
+   }
+
+   public WebBean getNonAnnotated()
+   {
+      return nonAnnotated;
+   }
+   
+   
+}

Deleted: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanField.java
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanField.java	2010-06-29 17:19:52 UTC (rev 106315)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanField.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -1,48 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors. 
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.test.kernel.weld.wbtomc.support;
-
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
-
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class ExternalBeanField
-{
-   @Inject @Default WebBean bean;
-   
-   WebBean nonAnnotated;
-
-   public WebBean getBean()
-   {
-      return bean;
-   }
-
-   public WebBean getNonAnnotated()
-   {
-      return nonAnnotated;
-   }
-}

Copied: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanField.java (from rev 106315, projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanField.java)
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanField.java	                        (rev 0)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanField.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -0,0 +1,48 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors. 
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/ 
+package org.jboss.test.kernel.weld.wbtomc.support;
+
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
+
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class ExternalBeanField
+{
+   @Inject @Default WebBean bean;
+   
+   WebBean nonAnnotated;
+
+   public WebBean getBean()
+   {
+      return bean;
+   }
+
+   public WebBean getNonAnnotated()
+   {
+      return nonAnnotated;
+   }
+}

Deleted: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanMixed.java
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanMixed.java	2010-06-29 17:19:52 UTC (rev 106315)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanMixed.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -1,61 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors. 
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.test.kernel.weld.wbtomc.support;
-
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
-
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class ExternalBeanMixed
-{
-   @Inject @Default WebBean fieldBean;
-   
-   WebBean nonAnnotated;
-
-   WebBean constructorBean;
-   
-   @Inject
-   public ExternalBeanMixed(@Default WebBean bean)
-   {
-      this.constructorBean = bean;
-   }
-
-   public WebBean getFieldBean()
-   {
-      return fieldBean;
-   }
-
-   public WebBean getNonAnnotated()
-   {
-      return nonAnnotated;
-   }
-
-   public WebBean getConstructorBean()
-   {
-      return constructorBean;
-   }
-}

Copied: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanMixed.java (from rev 106315, projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanMixed.java)
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanMixed.java	                        (rev 0)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/ExternalBeanMixed.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -0,0 +1,61 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors. 
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/ 
+package org.jboss.test.kernel.weld.wbtomc.support;
+
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
+
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class ExternalBeanMixed
+{
+   @Inject @Default WebBean fieldBean;
+   
+   WebBean nonAnnotated;
+
+   WebBean constructorBean;
+   
+   @Inject
+   public ExternalBeanMixed(@Default WebBean bean)
+   {
+      this.constructorBean = bean;
+   }
+
+   public WebBean getFieldBean()
+   {
+      return fieldBean;
+   }
+
+   public WebBean getNonAnnotated()
+   {
+      return nonAnnotated;
+   }
+
+   public WebBean getConstructorBean()
+   {
+      return constructorBean;
+   }
+}

Deleted: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/FailedBean.java
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/FailedBean.java	2010-06-29 17:19:52 UTC (rev 106315)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/FailedBean.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -1,41 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors. 
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.test.kernel.weld.wbtomc.support;
-
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
-
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class FailedBean
-{
-   @Inject @Default @Bean WebBean bean;
-
-   public WebBean getBean()
-   {
-      return bean;
-   }
-}

Copied: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/FailedBean.java (from rev 106315, projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/FailedBean.java)
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/FailedBean.java	                        (rev 0)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/FailedBean.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -0,0 +1,41 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors. 
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/ 
+package org.jboss.test.kernel.weld.wbtomc.support;
+
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
+
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class FailedBean
+{
+   @Inject @Default @Bean WebBean bean;
+
+   public WebBean getBean()
+   {
+      return bean;
+   }
+}

Deleted: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBean.java
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBean.java	2010-06-29 17:19:52 UTC (rev 106315)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBean.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -1,64 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors. 
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.test.kernel.weld.wbtomc.support;
-
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
-
-import org.jboss.kernel.weld.metadata.api.annotations.Weld;
-
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class McBean
-{
-   WebBean beanFromConstructor;
-   
-   @Weld @Inject @Default
-   WebBean bean;
-   
-   WebBean nonInject;
-   
-   @Weld @Inject
-   public McBean(@Default WebBean beanFromConstructor)
-   {
-      this.beanFromConstructor = beanFromConstructor;
-   }
-
-   public WebBean getBean()
-   {
-      return bean;
-   }
-
-   public WebBean getBeanFromConstructor()
-   {
-      return beanFromConstructor;
-   }
-
-   public WebBean getNonInject()
-   {
-      return nonInject;
-   }
-}   

Copied: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBean.java (from rev 106315, projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBean.java)
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBean.java	                        (rev 0)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBean.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -0,0 +1,64 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors. 
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/ 
+package org.jboss.test.kernel.weld.wbtomc.support;
+
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
+
+import org.jboss.kernel.weld.metadata.api.annotations.Weld;
+
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class McBean
+{
+   WebBean beanFromConstructor;
+   
+   @Weld @Inject @Default
+   WebBean bean;
+   
+   WebBean nonInject;
+   
+   @Weld @Inject
+   public McBean(@Default WebBean beanFromConstructor)
+   {
+      this.beanFromConstructor = beanFromConstructor;
+   }
+
+   public WebBean getBean()
+   {
+      return bean;
+   }
+
+   public WebBean getBeanFromConstructor()
+   {
+      return beanFromConstructor;
+   }
+
+   public WebBean getNonInject()
+   {
+      return nonInject;
+   }
+}   

Deleted: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanAnnotationsFromMetaData.java
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanAnnotationsFromMetaData.java	2010-06-29 17:19:52 UTC (rev 106315)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanAnnotationsFromMetaData.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -1,60 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors. 
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.test.kernel.weld.wbtomc.support;
-
-
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class McBeanAnnotationsFromMetaData
-{
-   WebBean beanFromConstructor;
-   
-   /*@Current*/
-   WebBean bean;
-   
-   WebBean nonInject;
-   
-//   /*@Initializer*/
-   public McBeanAnnotationsFromMetaData(/*@Current*/ WebBean beanFromConstructor)
-   {
-      this.beanFromConstructor = beanFromConstructor;
-   }
-
-   public WebBean getBean()
-   {
-      return bean;
-   }
-
-   public WebBean getBeanFromConstructor()
-   {
-      return beanFromConstructor;
-   }
-
-   public WebBean getNonInject()
-   {
-      return nonInject;
-   }
-}   

Copied: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanAnnotationsFromMetaData.java (from rev 106315, projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanAnnotationsFromMetaData.java)
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanAnnotationsFromMetaData.java	                        (rev 0)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanAnnotationsFromMetaData.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -0,0 +1,60 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors. 
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/ 
+package org.jboss.test.kernel.weld.wbtomc.support;
+
+
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class McBeanAnnotationsFromMetaData
+{
+   WebBean beanFromConstructor;
+   
+   /*@Current*/
+   WebBean bean;
+   
+   WebBean nonInject;
+   
+//   /*@Initializer*/
+   public McBeanAnnotationsFromMetaData(/*@Current*/ WebBean beanFromConstructor)
+   {
+      this.beanFromConstructor = beanFromConstructor;
+   }
+
+   public WebBean getBean()
+   {
+      return bean;
+   }
+
+   public WebBean getBeanFromConstructor()
+   {
+      return beanFromConstructor;
+   }
+
+   public WebBean getNonInject()
+   {
+      return nonInject;
+   }
+}   

Deleted: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanInitializerMethod.java
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanInitializerMethod.java	2010-06-29 17:19:52 UTC (rev 106315)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanInitializerMethod.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -1,57 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors. 
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.test.kernel.weld.wbtomc.support;
-
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
-
-import org.jboss.kernel.weld.metadata.api.annotations.Weld;
-
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class McBeanInitializerMethod
-{
-   WebBean bean;
-   
-   WebBean nonInject;
-   
-   @Weld @Inject
-   public void initializerMethod(@Default WebBean bean)
-   {
-      this.bean = bean;
-   }
-
-   public WebBean getBean()
-   {
-      return bean;
-   }
-
-   public WebBean getNonInject()
-   {
-      return nonInject;
-   }
-
-}

Copied: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanInitializerMethod.java (from rev 106315, projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanInitializerMethod.java)
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanInitializerMethod.java	                        (rev 0)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanInitializerMethod.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -0,0 +1,57 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors. 
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/ 
+package org.jboss.test.kernel.weld.wbtomc.support;
+
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
+
+import org.jboss.kernel.weld.metadata.api.annotations.Weld;
+
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class McBeanInitializerMethod
+{
+   WebBean bean;
+   
+   WebBean nonInject;
+   
+   @Weld @Inject
+   public void initializerMethod(@Default WebBean bean)
+   {
+      this.bean = bean;
+   }
+
+   public WebBean getBean()
+   {
+      return bean;
+   }
+
+   public WebBean getNonInject()
+   {
+      return nonInject;
+   }
+
+}

Deleted: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanInjectedFromWeldAndMcFields.java
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanInjectedFromWeldAndMcFields.java	2010-06-29 17:19:52 UTC (rev 106315)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanInjectedFromWeldAndMcFields.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -1,50 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors. 
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.test.kernel.weld.wbtomc.support;
-
-import javax.inject.Inject;
-
-import org.jboss.kernel.weld.metadata.api.annotations.Weld;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class McBeanInjectedFromWeldAndMcFields
-{
-   @Inject 
-   public Simple simple;
-   
-   @Weld @Inject 
-   public WebBean webBean;
-
-   public Simple getSimple()
-   {
-      return simple;
-   }
-
-   public WebBean getWebBean()
-   {
-      return webBean;
-   }
-}

Copied: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanInjectedFromWeldAndMcFields.java (from rev 106315, projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanInjectedFromWeldAndMcFields.java)
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanInjectedFromWeldAndMcFields.java	                        (rev 0)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanInjectedFromWeldAndMcFields.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -0,0 +1,50 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors. 
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/ 
+package org.jboss.test.kernel.weld.wbtomc.support;
+
+import javax.inject.Inject;
+
+import org.jboss.kernel.weld.metadata.api.annotations.Weld;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class McBeanInjectedFromWeldAndMcFields
+{
+   @Inject 
+   public Simple simple;
+   
+   @Weld @Inject 
+   public WebBean webBean;
+
+   public Simple getSimple()
+   {
+      return simple;
+   }
+
+   public WebBean getWebBean()
+   {
+      return webBean;
+   }
+}

Deleted: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanMcConstructor.java
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanMcConstructor.java	2010-06-29 17:19:52 UTC (rev 106315)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanMcConstructor.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -1,68 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors. 
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.test.kernel.weld.wbtomc.support;
-
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
-
-import org.jboss.kernel.weld.metadata.api.annotations.Weld;
-
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class McBeanMcConstructor
-{
-   @Weld @Inject @Default
-   WebBean bean;
-   
-   Simple simple;
-   
-   WebBean nonInject;
-   
-   public McBeanMcConstructor()
-   {
-      
-   }
-   
-   public McBeanMcConstructor(Simple simple)
-   {
-      this.simple = simple;
-   }
-   
-   public WebBean getBean()
-   {
-      return bean;
-   }
-
-   public WebBean getNonInject()
-   {
-      return nonInject;
-   }
-
-   public Simple getSimple()
-   {
-      return simple;
-   }
-}

Copied: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanMcConstructor.java (from rev 106315, projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanMcConstructor.java)
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanMcConstructor.java	                        (rev 0)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanMcConstructor.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -0,0 +1,68 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors. 
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/ 
+package org.jboss.test.kernel.weld.wbtomc.support;
+
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
+
+import org.jboss.kernel.weld.metadata.api.annotations.Weld;
+
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class McBeanMcConstructor
+{
+   @Weld @Inject @Default
+   WebBean bean;
+   
+   Simple simple;
+   
+   WebBean nonInject;
+   
+   public McBeanMcConstructor()
+   {
+      
+   }
+   
+   public McBeanMcConstructor(Simple simple)
+   {
+      this.simple = simple;
+   }
+   
+   public WebBean getBean()
+   {
+      return bean;
+   }
+
+   public WebBean getNonInject()
+   {
+      return nonInject;
+   }
+
+   public Simple getSimple()
+   {
+      return simple;
+   }
+}

Deleted: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanWebBeanSetter.java
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanWebBeanSetter.java	2010-06-29 17:19:52 UTC (rev 106315)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanWebBeanSetter.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -1,54 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors. 
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.test.kernel.weld.wbtomc.support;
-
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
-
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class McBeanWebBeanSetter
-{
-   WebBean bean;
-   
-   WebBean nonInject;
-   
-   public WebBean getBean()
-   {
-      return bean;
-   }
-
-   @Inject @Default
-   public void setBean(WebBean bean)
-   {
-      this.bean = bean;
-   }
-   
-   public WebBean getNonInject()
-   {
-      return nonInject;
-   }
-}   

Copied: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanWebBeanSetter.java (from rev 106315, projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanWebBeanSetter.java)
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanWebBeanSetter.java	                        (rev 0)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanWebBeanSetter.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -0,0 +1,54 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors. 
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/ 
+package org.jboss.test.kernel.weld.wbtomc.support;
+
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
+
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class McBeanWebBeanSetter
+{
+   WebBean bean;
+   
+   WebBean nonInject;
+   
+   public WebBean getBean()
+   {
+      return bean;
+   }
+
+   @Inject @Default
+   public void setBean(WebBean bean)
+   {
+      this.bean = bean;
+   }
+   
+   public WebBean getNonInject()
+   {
+      return nonInject;
+   }
+}   

Deleted: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanWithPostConstructAndPreDestroy.java
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanWithPostConstructAndPreDestroy.java	2010-06-29 17:19:52 UTC (rev 106315)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanWithPostConstructAndPreDestroy.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -1,77 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors. 
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.test.kernel.weld.wbtomc.support;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
-
-import org.jboss.kernel.weld.metadata.api.annotations.Weld;
-
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class McBeanWithPostConstructAndPreDestroy
-{
-   @Weld @Inject @Default
-   WebBean bean;
-   
-   boolean postConstructCalled;
-   
-   boolean preDestroyCalled;
-   
-   @Weld @Inject
-   public McBeanWithPostConstructAndPreDestroy()
-   {
-   }
-
-   public WebBean getBean()
-   {
-      return bean;
-   }
-
-   public boolean isPostConstructCalled()
-   {
-      return postConstructCalled;
-   }
-
-   public boolean isPreDestroyCalled()
-   {
-      return preDestroyCalled;
-   }
-
-   @PostConstruct
-   public void postConstruct()
-   {
-      postConstructCalled = true;
-   }
-   
-   @PreDestroy
-   public void preDestroy()
-   {
-      preDestroyCalled = true;
-   }
-}   

Copied: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanWithPostConstructAndPreDestroy.java (from rev 106315, projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanWithPostConstructAndPreDestroy.java)
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanWithPostConstructAndPreDestroy.java	                        (rev 0)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/McBeanWithPostConstructAndPreDestroy.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -0,0 +1,77 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors. 
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/ 
+package org.jboss.test.kernel.weld.wbtomc.support;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
+
+import org.jboss.kernel.weld.metadata.api.annotations.Weld;
+
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class McBeanWithPostConstructAndPreDestroy
+{
+   @Weld @Inject @Default
+   WebBean bean;
+   
+   boolean postConstructCalled;
+   
+   boolean preDestroyCalled;
+   
+   @Weld @Inject
+   public McBeanWithPostConstructAndPreDestroy()
+   {
+   }
+
+   public WebBean getBean()
+   {
+      return bean;
+   }
+
+   public boolean isPostConstructCalled()
+   {
+      return postConstructCalled;
+   }
+
+   public boolean isPreDestroyCalled()
+   {
+      return preDestroyCalled;
+   }
+
+   @PostConstruct
+   public void postConstruct()
+   {
+      postConstructCalled = true;
+   }
+   
+   @PreDestroy
+   public void preDestroy()
+   {
+      preDestroyCalled = true;
+   }
+}   

Deleted: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/MissingDependenciesConstructorBean.java
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/MissingDependenciesConstructorBean.java	2010-06-29 17:19:52 UTC (rev 106315)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/MissingDependenciesConstructorBean.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -1,40 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors. 
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.test.kernel.weld.wbtomc.support;
-
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
-
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class MissingDependenciesConstructorBean
-{
-   @Inject
-   public MissingDependenciesConstructorBean(@Default @Bean WebBean bean)
-   {
-      
-   }
-}

Copied: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/MissingDependenciesConstructorBean.java (from rev 106315, projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/MissingDependenciesConstructorBean.java)
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/MissingDependenciesConstructorBean.java	                        (rev 0)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/MissingDependenciesConstructorBean.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -0,0 +1,40 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors. 
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/ 
+package org.jboss.test.kernel.weld.wbtomc.support;
+
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
+
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class MissingDependenciesConstructorBean
+{
+   @Inject
+   public MissingDependenciesConstructorBean(@Default @Bean WebBean bean)
+   {
+      
+   }
+}

Deleted: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/MissingDependenciesFieldBean.java
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/MissingDependenciesFieldBean.java	2010-06-29 17:19:52 UTC (rev 106315)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/MissingDependenciesFieldBean.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -1,38 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors. 
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.test.kernel.weld.wbtomc.support;
-
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
-
-import org.jboss.kernel.weld.metadata.api.annotations.Weld;
-
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class MissingDependenciesFieldBean
-{
-   @Weld @Inject @Default @Bean WebBean bean;
-}

Copied: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/MissingDependenciesFieldBean.java (from rev 106315, projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/MissingDependenciesFieldBean.java)
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/MissingDependenciesFieldBean.java	                        (rev 0)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/MissingDependenciesFieldBean.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -0,0 +1,38 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors. 
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/ 
+package org.jboss.test.kernel.weld.wbtomc.support;
+
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
+
+import org.jboss.kernel.weld.metadata.api.annotations.Weld;
+
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class MissingDependenciesFieldBean
+{
+   @Weld @Inject @Default @Bean WebBean bean;
+}

Deleted: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/Simple.java
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/Simple.java	2010-06-29 17:19:52 UTC (rev 106315)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/Simple.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -1,32 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors. 
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.test.kernel.weld.wbtomc.support;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class Simple
-{
-
-}

Copied: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/Simple.java (from rev 106315, projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/Simple.java)
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/Simple.java	                        (rev 0)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/Simple.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -0,0 +1,32 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors. 
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/ 
+package org.jboss.test.kernel.weld.wbtomc.support;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class Simple
+{
+
+}

Deleted: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/WebBean.java
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/WebBean.java	2010-06-29 17:19:52 UTC (rev 106315)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/WebBean.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -1,32 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors. 
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.test.kernel.weld.wbtomc.support;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class WebBean
-{
-
-}

Copied: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/WebBean.java (from rev 106315, projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/WebBean.java)
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/WebBean.java	                        (rev 0)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/WebBean.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -0,0 +1,32 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors. 
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/ 
+package org.jboss.test.kernel.weld.wbtomc.support;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class WebBean
+{
+
+}

Deleted: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/WebBeanConsumer.java
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/WebBeanConsumer.java	2010-06-29 17:19:52 UTC (rev 106315)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/WebBeanConsumer.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -1,41 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors. 
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.test.kernel.weld.wbtomc.support;
-
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class WebBeanConsumer
-{
-   @Inject @Default
-   WebBean bean;
-
-   public WebBean getBean()
-   {
-      return bean;
-   }
-}

Copied: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/WebBeanConsumer.java (from rev 106315, projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/WebBeanConsumer.java)
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/WebBeanConsumer.java	                        (rev 0)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/support/WebBeanConsumer.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -0,0 +1,41 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors. 
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/ 
+package org.jboss.test.kernel.weld.wbtomc.support;
+
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class WebBeanConsumer
+{
+   @Inject @Default
+   WebBean bean;
+
+   public WebBean getBean()
+   {
+      return bean;
+   }
+}

Copied: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/test (from rev 106315, projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/test)

Deleted: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/test/InjectWeldInMcBeansTestCase.java
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/test/InjectWeldInMcBeansTestCase.java	2010-06-29 17:19:52 UTC (rev 106315)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/test/InjectWeldInMcBeansTestCase.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -1,450 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors. 
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.test.kernel.weld.wbtomc.test;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.UnsatisfiedResolutionException;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.inject.Inject;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.jboss.beans.info.spi.BeanAccessMode;
-import org.jboss.beans.metadata.plugins.AbstractAnnotationMetaData;
-import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
-import org.jboss.beans.metadata.plugins.AbstractParameterMetaData;
-import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
-import org.jboss.beans.metadata.spi.AnnotationMetaData;
-import org.jboss.beans.metadata.spi.ParameterMetaData;
-import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.dependency.spi.ControllerState;
-import org.jboss.kernel.weld.metadata.api.annotations.Weld;
-import org.jboss.kernel.weld.plugins.dependency.WeldKernelControllerContext;
-import org.jboss.test.kernel.weld.AbstractWeldMcTest;
-import org.jboss.test.kernel.weld.wbtomc.support.ExternalBeanConstructor;
-import org.jboss.test.kernel.weld.wbtomc.support.ExternalBeanField;
-import org.jboss.test.kernel.weld.wbtomc.support.ExternalBeanMixed;
-import org.jboss.test.kernel.weld.wbtomc.support.FailedBean;
-import org.jboss.test.kernel.weld.wbtomc.support.McBean;
-import org.jboss.test.kernel.weld.wbtomc.support.McBeanAnnotationsFromMetaData;
-import org.jboss.test.kernel.weld.wbtomc.support.McBeanInitializerMethod;
-import org.jboss.test.kernel.weld.wbtomc.support.McBeanInjectedFromWeldAndMcFields;
-import org.jboss.test.kernel.weld.wbtomc.support.McBeanMcConstructor;
-import org.jboss.test.kernel.weld.wbtomc.support.McBeanWithPostConstructAndPreDestroy;
-import org.jboss.test.kernel.weld.wbtomc.support.MissingDependenciesConstructorBean;
-import org.jboss.test.kernel.weld.wbtomc.support.MissingDependenciesFieldBean;
-import org.jboss.test.kernel.weld.wbtomc.support.Simple;
-import org.jboss.test.kernel.weld.wbtomc.support.WebBean;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class InjectWeldInMcBeansTestCase extends AbstractWeldMcTest
-{
-   public InjectWeldInMcBeansTestCase(String name)
-   {
-      super(name);
-   }
-
-   public static Test suite()
-   {
-      return new TestSuite(InjectWeldInMcBeansTestCase.class);
-   }
-   
-   @Override
-   protected void setUp() throws Exception
-   {
-      super.setUp();
-      deployWeld(WebBean.class);
-   }
-
-   @Override
-   protected void tearDown() throws Exception
-   {
-      undeployWeld();
-      super.tearDown();
-   }
-   
-   public void testInjectFromWeldToExternalFieldObject() throws Exception
-   {
-      NonContextual<ExternalBeanField> nonContextual = new NonContextual<ExternalBeanField>(getCurrentManager(), ExternalBeanField.class);
-      
-      ExternalBeanField bean = new ExternalBeanField();
-      assertNull(bean.getBean());
-      nonContextual.postConstruct(bean);
-      assertNotNull(bean.getBean());
-      assertNull(bean.getNonAnnotated());
-      nonContextual.preDestroy(bean);
-   }
-   
-   public void testInjectFromWeldToExternalFieldObjectCreatedByProducer() throws Exception
-   {
-      NonContextual<ExternalBeanField> nonContextual = new NonContextual<ExternalBeanField>(getCurrentManager(), ExternalBeanField.class);
-      
-      ExternalBeanField bean = nonContextual.produce();
-      assertNull(bean.getBean());
-      nonContextual.postConstruct(bean);
-      assertNotNull(bean.getBean());
-      assertNull(bean.getNonAnnotated());
-      nonContextual.preDestroy(bean);
-   }
-   
-   public void testInjectFromWeldToExternalConstructorObject() throws Exception
-   {
-      NonContextual<ExternalBeanConstructor> nonContextual = new NonContextual<ExternalBeanConstructor>(getCurrentManager(), ExternalBeanConstructor.class);
-      
-      ExternalBeanConstructor bean = nonContextual.produce();
-      assertNotNull(bean.getBean());
-      assertNull(bean.getNonAnnotated());
-      nonContextual.preDestroy(bean);
-   }
-   
-   public void testInjectFromWeldToExternalMixedObject() throws Exception
-   {
-      NonContextual<ExternalBeanMixed> nonContextual = new NonContextual<ExternalBeanMixed>(getCurrentManager(), ExternalBeanMixed.class);
-      
-      ExternalBeanMixed bean = nonContextual.produce();
-      assertNotNull(bean.getConstructorBean());
-      assertNull(bean.getFieldBean());
-      assertNull(bean.getNonAnnotated());
-      
-      nonContextual.postConstruct(bean);
-      assertNotNull(bean.getConstructorBean());
-      assertNotNull(bean.getFieldBean());
-      assertNull(bean.getNonAnnotated());
-      
-      nonContextual.preDestroy(bean);
-   }
-   
-   public void testFailedInjectFromWeldToExternalObject() throws Exception
-   {
-      NonContextual<FailedBean> nonContextual = new NonContextual<FailedBean>(getCurrentManager(), FailedBean.class);
-      
-      FailedBean bean = new FailedBean();
-      assertNull(bean.getBean());
-      try
-      {
-         nonContextual.postConstruct(bean);
-         fail("Should not be here");
-      }
-      catch(UnsatisfiedResolutionException expected)
-      {
-         
-      }
-   }
-   
-   public void testInjectFromWeldToMcInitializer() throws Exception
-   {
-      WeldKernelControllerContext context = deploy(createBeanMetaData("McBean", McBeanInitializerMethod.class));
-      McBeanInitializerMethod bean = null;
-      try
-      {
-         bean = assertBean("McBean", McBeanInitializerMethod.class);
-         assertNotNull(bean.getBean());
-         assertNull(bean.getNonInject());
-      }
-      finally
-      {
-         undeploy(context);
-      }
-      assertNull(bean.getBean());
-   }
-   
-   public void testInjectFromWeldToMcField() throws Exception
-   {
-      WeldKernelControllerContext context = deploy(createBeanMetaData("McBean", McBean.class));
-      McBean bean = null; 
-      try
-      {
-         bean = assertBean("McBean", McBean.class);
-         assertNotNull(bean.getBean());
-         assertNotNull(bean.getBeanFromConstructor());
-         assertNull(bean.getNonInject());
-      }
-      finally
-      {
-         undeploy(context);
-      }
-      assertNull(bean.getBean());
-   }
-   
-//   public void testInjectFromWeldToMcSetter() throws Exception
-//   {
-//      WeldKernelControllerContext context = deploy(createBeanMetaData("McBean", McBeanWebBeanSetter.class));
-//      McBeanWebBeanSetter bean = null; 
-//      try
-//      {
-//         bean = assertBean("McBean", McBeanWebBeanSetter.class);
-//         assertNotNull(bean.getBean());
-//         assertNull(bean.getNonInject());
-//      }
-//      finally
-//      {
-//         undeploy(context);
-//      }
-//      assertNull(bean.getBean());
-//   }
-   
-   public void testInjectFromWeldToMcMcConstructorNoParams() throws Exception
-   {
-      WeldKernelControllerContext context = deploy(createBeanMetaData("McBean", McBeanMcConstructor.class));
-      McBeanMcConstructor bean = null;
-      try
-      {
-         bean = assertBean("McBean", McBeanMcConstructor.class);
-         assertNotNull(bean.getBean());
-         assertNull(bean.getNonInject());
-      }
-      finally
-      {
-         undeploy(context);
-      }
-      assertNull(bean.getBean());
-   }
-   
-   public void testInjectFromWeldToMcMcConstructorWithParams() throws Exception
-   {
-      WeldKernelControllerContext contextSimple = deploy(createBeanMetaData("Simple", Simple.class));
-      
-      BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder("McBean", McBeanMcConstructor.class.getName());
-      builder.addConstructorParameter(Simple.class.getName(), builder.createInject("Simple"));
-      WeldKernelControllerContext  context = deploy(builder.getBeanMetaData());
-      
-      
-      try
-      {
-         Simple simple = assertBean("Simple", Simple.class);
-         McBeanMcConstructor bean = assertBean("McBean", McBeanMcConstructor.class);
-         assertNotNull(bean.getBean());
-         assertNull(bean.getNonInject());
-         assertNotNull(bean.getSimple());
-         assertEquals(simple, bean.getSimple());
-      }
-      finally
-      {
-         undeploy(context);
-         undeploy(contextSimple);
-      }
-   }
-   
-   public void testConstructorMissingDependencies() throws Exception
-   {
-      WeldKernelControllerContext context = deploy(createBeanMetaData("McBean", MissingDependenciesConstructorBean.class));
-      
-      try
-      {
-         assertNoControllerContext("McBean", ControllerState.INSTALLED);
-         ControllerContext ctx = getControllerContext("McBean", ControllerState.DESCRIBED);
-         assertSame(context, ctx);
-      }
-      finally
-      {
-         undeploy(context);
-      }
-   }
-   
-   public void testFieldMissingDependencies() throws Exception
-   {
-      WeldKernelControllerContext context = deploy(createBeanMetaData("McBean", MissingDependenciesFieldBean.class));
-      
-      try
-      {
-         assertNoControllerContext("McBean", ControllerState.INSTALLED);
-         ControllerContext ctx = getControllerContext("McBean", ControllerState.INSTANTIATED);
-         assertSame(context, ctx);
-      }
-      finally
-      {
-         undeploy(context);
-      }
-   }
-   
-   public void testDependenciesNotDuplicated() throws Throwable
-   {
-      WeldKernelControllerContext context = deploy(createBeanMetaData("McBean", McBean.class));
-      try
-      {
-         assertNotNull(context.getBeanMetaData().getDepends());
-         int dependsSize = context.getBeanMetaData().getDepends().size();
-         assertTrue(dependsSize > 0);
-         
-         assertNotNull(context.getDependencyInfo().getIDependOn(null));
-         int dependencySize = context.getDependencyInfo().getIDependOn(null).size();
-         assertTrue(dependencySize > 0);
-         
-         change(context, ControllerState.PRE_INSTALL);
-         assertNotNull(context.getBeanMetaData().getDepends());
-         assertEquals(dependsSize, context.getBeanMetaData().getDepends().size());
-         assertNotNull(context.getDependencyInfo().getIDependOn(null));
-         assertEquals(dependencySize, context.getDependencyInfo().getIDependOn(null).size());
-         
-         change(context, ControllerState.INSTALLED);
-         assertNotNull(context.getBeanMetaData().getDepends());
-         assertEquals(dependsSize, context.getBeanMetaData().getDepends().size());
-         assertNotNull(context.getDependencyInfo().getIDependOn(null));
-         assertEquals(dependencySize, context.getDependencyInfo().getIDependOn(null).size());
-      }
-      finally
-      {
-         undeploy(context);
-      }
-   }
-   
-   public void testPostConstructAndPreDestroy() throws Exception
-   {
-      WeldKernelControllerContext context = deploy(createBeanMetaData("McBean", McBeanWithPostConstructAndPreDestroy.class));
-      McBeanWithPostConstructAndPreDestroy bean = null;
-      try
-      {
-         bean = assertBean("McBean", McBeanWithPostConstructAndPreDestroy.class);
-         assertNotNull(bean.getBean());
-         assertTrue(bean.isPostConstructCalled());
-         assertFalse(bean.isPreDestroyCalled());
-      }
-      finally
-      {
-         undeploy(context);
-      }
-      assertNull(bean.getBean());
-      assertTrue(bean.isPreDestroyCalled());
-   }
-   
-   public void testAnnotationsFromMetaData() throws Exception
-   {
-      AbstractBeanMetaData metaData = new AbstractBeanMetaData("McBean", McBeanAnnotationsFromMetaData.class.getName());
-      metaData.setAccessMode(BeanAccessMode.ALL);
-      
-      AbstractConstructorMetaData ctor = new AbstractConstructorMetaData();
-      Set<AnnotationMetaData> annotations = new HashSet<AnnotationMetaData>();
-      annotations.add(new AbstractAnnotationMetaData("@" + Inject.class.getName()));
-      annotations.add(new AbstractAnnotationMetaData("@" + Weld.class.getName()));
-      ctor.setAnnotations(annotations);
-      AbstractParameterMetaData param = new AbstractParameterMetaData(WebBean.class.getName(), (String)null);
-      annotations = new HashSet<AnnotationMetaData>();
-      annotations.add(new AbstractAnnotationMetaData("@" + Default.class.getName()));
-      param.setAnnotations(annotations);
-      ctor.setParameters(Collections.singletonList((ParameterMetaData)param));
-      metaData.setConstructor(ctor);
-      
-      AbstractPropertyMetaData property = new AbstractPropertyMetaData("bean", (String)null);
-      Set<AnnotationMetaData> propertyAnns = new HashSet<AnnotationMetaData>();
-      propertyAnns.add(new AbstractAnnotationMetaData("@" + Default.class.getName()));
-      propertyAnns.add(new AbstractAnnotationMetaData("@" + Inject.class.getName()));
-      propertyAnns.add(new AbstractAnnotationMetaData("@" + Weld.class.getName()));
-
-      property.setAnnotations(propertyAnns);
-      metaData.addProperty(property);
-      
-      WeldKernelControllerContext context = deploy(metaData);
-      McBeanAnnotationsFromMetaData bean = null;
-      try
-      {
-         bean = assertBean("McBean", McBeanAnnotationsFromMetaData.class);
-         assertNotNull(bean.getBean());
-         assertNotNull(bean.getBeanFromConstructor());
-         assertNull(bean.getNonInject());
-      }
-      finally
-      {
-         undeploy(context);
-      }
-   }
-   
-   public void testInjectFromWeldAndMc() throws Exception
-   {
-      WeldKernelControllerContext simpleContext = null;
-      WeldKernelControllerContext mcContext = null;
-      
-      try
-      {
-         simpleContext = deploy(new AbstractBeanMetaData("Simple", Simple.class.getName()));
-         AbstractBeanMetaData metaData = new AbstractBeanMetaData("McBean", McBeanInjectedFromWeldAndMcFields.class.getName());
-         metaData.setAccessMode(BeanAccessMode.ALL);
-         mcContext = deploy(metaData);
-         
-         Simple simple = assertBean("Simple", Simple.class);
-         McBeanInjectedFromWeldAndMcFields mcBean = assertBean("McBean", McBeanInjectedFromWeldAndMcFields.class);
-         
-         assertNotNull(mcBean.getSimple());
-         assertNotNull(mcBean.getWebBean());
-         assertEquals(simple, mcBean.getSimple());
-      }
-      finally
-      {
-         undeploy(mcContext);
-         undeploy(simpleContext);
-      }
-   }
-
-   public class NonContextual<T> {
-
-      final InjectionTarget<T> it;
-      final BeanManager manager;
-      Class<T> clazz;
-
-      public NonContextual(BeanManager manager, Class<T> clazz) {
-         this.manager = manager;
-         AnnotatedType<T> type = manager.createAnnotatedType(clazz);
-         this.it = manager.createInjectionTarget(type);
-         this.clazz = clazz;
-      }
-
-      public Class<T> getClazz()
-      {
-         return clazz;
-      }
-      
-      public InjectionTarget<T> getInjectionTarget()
-      {
-         return it;
-      }
-      
-      public CreationalContext<T> postConstruct(T instance) {
-         CreationalContext<T> cc = manager.createCreationalContext(null);
-         it.inject(instance, cc);
-         it.postConstruct(instance);
-         return cc;
-      }
-
-      public T produce()
-      {
-         CreationalContext<T> cc = manager.createCreationalContext(null);
-         return it.produce(cc);
-      }
-      
-      public void preDestroy(T instance) {
-         it.preDestroy(instance);
-      }
-   }
-}

Copied: projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/test/InjectWeldInMcBeansTestCase.java (from rev 106315, projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/test/InjectWeldInMcBeansTestCase.java)
===================================================================
--- projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/test/InjectWeldInMcBeansTestCase.java	                        (rev 0)
+++ projects/kernel/branches/kabir_weld_int_with_external_lookup/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/test/InjectWeldInMcBeansTestCase.java	2010-06-29 20:02:22 UTC (rev 106333)
@@ -0,0 +1,450 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors. 
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/ 
+package org.jboss.test.kernel.weld.wbtomc.test;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.UnsatisfiedResolutionException;
+import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionTarget;
+import javax.inject.Inject;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.jboss.beans.info.spi.BeanAccessMode;
+import org.jboss.beans.metadata.plugins.AbstractAnnotationMetaData;
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
+import org.jboss.beans.metadata.plugins.AbstractParameterMetaData;
+import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
+import org.jboss.beans.metadata.spi.AnnotationMetaData;
+import org.jboss.beans.metadata.spi.ParameterMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.kernel.weld.metadata.api.annotations.Weld;
+import org.jboss.kernel.weld.plugins.dependency.WeldKernelControllerContext;
+import org.jboss.test.kernel.weld.AbstractWeldMcTest;
+import org.jboss.test.kernel.weld.wbtomc.support.ExternalBeanConstructor;
+import org.jboss.test.kernel.weld.wbtomc.support.ExternalBeanField;
+import org.jboss.test.kernel.weld.wbtomc.support.ExternalBeanMixed;
+import org.jboss.test.kernel.weld.wbtomc.support.FailedBean;
+import org.jboss.test.kernel.weld.wbtomc.support.McBean;
+import org.jboss.test.kernel.weld.wbtomc.support.McBeanAnnotationsFromMetaData;
+import org.jboss.test.kernel.weld.wbtomc.support.McBeanInitializerMethod;
+import org.jboss.test.kernel.weld.wbtomc.support.McBeanInjectedFromWeldAndMcFields;
+import org.jboss.test.kernel.weld.wbtomc.support.McBeanMcConstructor;
+import org.jboss.test.kernel.weld.wbtomc.support.McBeanWithPostConstructAndPreDestroy;
+import org.jboss.test.kernel.weld.wbtomc.support.MissingDependenciesConstructorBean;
+import org.jboss.test.kernel.weld.wbtomc.support.MissingDependenciesFieldBean;
+import org.jboss.test.kernel.weld.wbtomc.support.Simple;
+import org.jboss.test.kernel.weld.wbtomc.support.WebBean;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class InjectWeldInMcBeansTestCase extends AbstractWeldMcTest
+{
+   public InjectWeldInMcBeansTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static Test suite()
+   {
+      return new TestSuite(InjectWeldInMcBeansTestCase.class);
+   }
+   
+   @Override
+   protected void setUp() throws Exception
+   {
+      super.setUp();
+      deployWeld(WebBean.class);
+   }
+
+   @Override
+   protected void tearDown() throws Exception
+   {
+      undeployWeld();
+      super.tearDown();
+   }
+   
+   public void testInjectFromWeldToExternalFieldObject() throws Exception
+   {
+      NonContextual<ExternalBeanField> nonContextual = new NonContextual<ExternalBeanField>(getCurrentManager(), ExternalBeanField.class);
+      
+      ExternalBeanField bean = new ExternalBeanField();
+      assertNull(bean.getBean());
+      nonContextual.postConstruct(bean);
+      assertNotNull(bean.getBean());
+      assertNull(bean.getNonAnnotated());
+      nonContextual.preDestroy(bean);
+   }
+   
+   public void testInjectFromWeldToExternalFieldObjectCreatedByProducer() throws Exception
+   {
+      NonContextual<ExternalBeanField> nonContextual = new NonContextual<ExternalBeanField>(getCurrentManager(), ExternalBeanField.class);
+      
+      ExternalBeanField bean = nonContextual.produce();
+      assertNull(bean.getBean());
+      nonContextual.postConstruct(bean);
+      assertNotNull(bean.getBean());
+      assertNull(bean.getNonAnnotated());
+      nonContextual.preDestroy(bean);
+   }
+   
+   public void testInjectFromWeldToExternalConstructorObject() throws Exception
+   {
+      NonContextual<ExternalBeanConstructor> nonContextual = new NonContextual<ExternalBeanConstructor>(getCurrentManager(), ExternalBeanConstructor.class);
+      
+      ExternalBeanConstructor bean = nonContextual.produce();
+      assertNotNull(bean.getBean());
+      assertNull(bean.getNonAnnotated());
+      nonContextual.preDestroy(bean);
+   }
+   
+   public void testInjectFromWeldToExternalMixedObject() throws Exception
+   {
+      NonContextual<ExternalBeanMixed> nonContextual = new NonContextual<ExternalBeanMixed>(getCurrentManager(), ExternalBeanMixed.class);
+      
+      ExternalBeanMixed bean = nonContextual.produce();
+      assertNotNull(bean.getConstructorBean());
+      assertNull(bean.getFieldBean());
+      assertNull(bean.getNonAnnotated());
+      
+      nonContextual.postConstruct(bean);
+      assertNotNull(bean.getConstructorBean());
+      assertNotNull(bean.getFieldBean());
+      assertNull(bean.getNonAnnotated());
+      
+      nonContextual.preDestroy(bean);
+   }
+   
+   public void testFailedInjectFromWeldToExternalObject() throws Exception
+   {
+      NonContextual<FailedBean> nonContextual = new NonContextual<FailedBean>(getCurrentManager(), FailedBean.class);
+      
+      FailedBean bean = new FailedBean();
+      assertNull(bean.getBean());
+      try
+      {
+         nonContextual.postConstruct(bean);
+         fail("Should not be here");
+      }
+      catch(UnsatisfiedResolutionException expected)
+      {
+         
+      }
+   }
+   
+   public void testInjectFromWeldToMcInitializer() throws Exception
+   {
+      WeldKernelControllerContext context = deploy(createBeanMetaData("McBean", McBeanInitializerMethod.class));
+      McBeanInitializerMethod bean = null;
+      try
+      {
+         bean = assertBean("McBean", McBeanInitializerMethod.class);
+         assertNotNull(bean.getBean());
+         assertNull(bean.getNonInject());
+      }
+      finally
+      {
+         undeploy(context);
+      }
+      assertNull(bean.getBean());
+   }
+   
+   public void testInjectFromWeldToMcField() throws Exception
+   {
+      WeldKernelControllerContext context = deploy(createBeanMetaData("McBean", McBean.class));
+      McBean bean = null; 
+      try
+      {
+         bean = assertBean("McBean", McBean.class);
+         assertNotNull(bean.getBean());
+         assertNotNull(bean.getBeanFromConstructor());
+         assertNull(bean.getNonInject());
+      }
+      finally
+      {
+         undeploy(context);
+      }
+      assertNull(bean.getBean());
+   }
+   
+//   public void testInjectFromWeldToMcSetter() throws Exception
+//   {
+//      WeldKernelControllerContext context = deploy(createBeanMetaData("McBean", McBeanWebBeanSetter.class));
+//      McBeanWebBeanSetter bean = null; 
+//      try
+//      {
+//         bean = assertBean("McBean", McBeanWebBeanSetter.class);
+//         assertNotNull(bean.getBean());
+//         assertNull(bean.getNonInject());
+//      }
+//      finally
+//      {
+//         undeploy(context);
+//      }
+//      assertNull(bean.getBean());
+//   }
+   
+   public void testInjectFromWeldToMcMcConstructorNoParams() throws Exception
+   {
+      WeldKernelControllerContext context = deploy(createBeanMetaData("McBean", McBeanMcConstructor.class));
+      McBeanMcConstructor bean = null;
+      try
+      {
+         bean = assertBean("McBean", McBeanMcConstructor.class);
+         assertNotNull(bean.getBean());
+         assertNull(bean.getNonInject());
+      }
+      finally
+      {
+         undeploy(context);
+      }
+      assertNull(bean.getBean());
+   }
+   
+   public void testInjectFromWeldToMcMcConstructorWithParams() throws Exception
+   {
+      WeldKernelControllerContext contextSimple = deploy(createBeanMetaData("Simple", Simple.class));
+      
+      BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder("McBean", McBeanMcConstructor.class.getName());
+      builder.addConstructorParameter(Simple.class.getName(), builder.createInject("Simple"));
+      WeldKernelControllerContext  context = deploy(builder.getBeanMetaData());
+      
+      
+      try
+      {
+         Simple simple = assertBean("Simple", Simple.class);
+         McBeanMcConstructor bean = assertBean("McBean", McBeanMcConstructor.class);
+         assertNotNull(bean.getBean());
+         assertNull(bean.getNonInject());
+         assertNotNull(bean.getSimple());
+         assertEquals(simple, bean.getSimple());
+      }
+      finally
+      {
+         undeploy(context);
+         undeploy(contextSimple);
+      }
+   }
+   
+   public void testConstructorMissingDependencies() throws Exception
+   {
+      WeldKernelControllerContext context = deploy(createBeanMetaData("McBean", MissingDependenciesConstructorBean.class));
+      
+      try
+      {
+         assertNoControllerContext("McBean", ControllerState.INSTALLED);
+         ControllerContext ctx = getControllerContext("McBean", ControllerState.DESCRIBED);
+         assertSame(context, ctx);
+      }
+      finally
+      {
+         undeploy(context);
+      }
+   }
+   
+   public void testFieldMissingDependencies() throws Exception
+   {
+      WeldKernelControllerContext context = deploy(createBeanMetaData("McBean", MissingDependenciesFieldBean.class));
+      
+      try
+      {
+         assertNoControllerContext("McBean", ControllerState.INSTALLED);
+         ControllerContext ctx = getControllerContext("McBean", ControllerState.INSTANTIATED);
+         assertSame(context, ctx);
+      }
+      finally
+      {
+         undeploy(context);
+      }
+   }
+   
+   public void testDependenciesNotDuplicated() throws Throwable
+   {
+      WeldKernelControllerContext context = deploy(createBeanMetaData("McBean", McBean.class));
+      try
+      {
+         assertNotNull(context.getBeanMetaData().getDepends());
+         int dependsSize = context.getBeanMetaData().getDepends().size();
+         assertTrue(dependsSize > 0);
+         
+         assertNotNull(context.getDependencyInfo().getIDependOn(null));
+         int dependencySize = context.getDependencyInfo().getIDependOn(null).size();
+         assertTrue(dependencySize > 0);
+         
+         change(context, ControllerState.PRE_INSTALL);
+         assertNotNull(context.getBeanMetaData().getDepends());
+         assertEquals(dependsSize, context.getBeanMetaData().getDepends().size());
+         assertNotNull(context.getDependencyInfo().getIDependOn(null));
+         assertEquals(dependencySize, context.getDependencyInfo().getIDependOn(null).size());
+         
+         change(context, ControllerState.INSTALLED);
+         assertNotNull(context.getBeanMetaData().getDepends());
+         assertEquals(dependsSize, context.getBeanMetaData().getDepends().size());
+         assertNotNull(context.getDependencyInfo().getIDependOn(null));
+         assertEquals(dependencySize, context.getDependencyInfo().getIDependOn(null).size());
+      }
+      finally
+      {
+         undeploy(context);
+      }
+   }
+   
+   public void testPostConstructAndPreDestroy() throws Exception
+   {
+      WeldKernelControllerContext context = deploy(createBeanMetaData("McBean", McBeanWithPostConstructAndPreDestroy.class));
+      McBeanWithPostConstructAndPreDestroy bean = null;
+      try
+      {
+         bean = assertBean("McBean", McBeanWithPostConstructAndPreDestroy.class);
+         assertNotNull(bean.getBean());
+         assertTrue(bean.isPostConstructCalled());
+         assertFalse(bean.isPreDestroyCalled());
+      }
+      finally
+      {
+         undeploy(context);
+      }
+      assertNull(bean.getBean());
+      assertTrue(bean.isPreDestroyCalled());
+   }
+   
+   public void testAnnotationsFromMetaData() throws Exception
+   {
+      AbstractBeanMetaData metaData = new AbstractBeanMetaData("McBean", McBeanAnnotationsFromMetaData.class.getName());
+      metaData.setAccessMode(BeanAccessMode.ALL);
+      
+      AbstractConstructorMetaData ctor = new AbstractConstructorMetaData();
+      Set<AnnotationMetaData> annotations = new HashSet<AnnotationMetaData>();
+      annotations.add(new AbstractAnnotationMetaData("@" + Inject.class.getName()));
+      annotations.add(new AbstractAnnotationMetaData("@" + Weld.class.getName()));
+      ctor.setAnnotations(annotations);
+      AbstractParameterMetaData param = new AbstractParameterMetaData(WebBean.class.getName(), (String)null);
+      annotations = new HashSet<AnnotationMetaData>();
+      annotations.add(new AbstractAnnotationMetaData("@" + Default.class.getName()));
+      param.setAnnotations(annotations);
+      ctor.setParameters(Collections.singletonList((ParameterMetaData)param));
+      metaData.setConstructor(ctor);
+      
+      AbstractPropertyMetaData property = new AbstractPropertyMetaData("bean", (String)null);
+      Set<AnnotationMetaData> propertyAnns = new HashSet<AnnotationMetaData>();
+      propertyAnns.add(new AbstractAnnotationMetaData("@" + Default.class.getName()));
+      propertyAnns.add(new AbstractAnnotationMetaData("@" + Inject.class.getName()));
+      propertyAnns.add(new AbstractAnnotationMetaData("@" + Weld.class.getName()));
+
+      property.setAnnotations(propertyAnns);
+      metaData.addProperty(property);
+      
+      WeldKernelControllerContext context = deploy(metaData);
+      McBeanAnnotationsFromMetaData bean = null;
+      try
+      {
+         bean = assertBean("McBean", McBeanAnnotationsFromMetaData.class);
+         assertNotNull(bean.getBean());
+         assertNotNull(bean.getBeanFromConstructor());
+         assertNull(bean.getNonInject());
+      }
+      finally
+      {
+         undeploy(context);
+      }
+   }
+   
+   public void testInjectFromWeldAndMc() throws Exception
+   {
+      WeldKernelControllerContext simpleContext = null;
+      WeldKernelControllerContext mcContext = null;
+      
+      try
+      {
+         simpleContext = deploy(new AbstractBeanMetaData("Simple", Simple.class.getName()));
+         AbstractBeanMetaData metaData = new AbstractBeanMetaData("McBean", McBeanInjectedFromWeldAndMcFields.class.getName());
+         metaData.setAccessMode(BeanAccessMode.ALL);
+         mcContext = deploy(metaData);
+         
+         Simple simple = assertBean("Simple", Simple.class);
+         McBeanInjectedFromWeldAndMcFields mcBean = assertBean("McBean", McBeanInjectedFromWeldAndMcFields.class);
+         
+         assertNotNull(mcBean.getSimple());
+         assertNotNull(mcBean.getWebBean());
+         assertEquals(simple, mcBean.getSimple());
+      }
+      finally
+      {
+         undeploy(mcContext);
+         undeploy(simpleContext);
+      }
+   }
+
+   public class NonContextual<T> {
+
+      final InjectionTarget<T> it;
+      final BeanManager manager;
+      Class<T> clazz;
+
+      public NonContextual(BeanManager manager, Class<T> clazz) {
+         this.manager = manager;
+         AnnotatedType<T> type = manager.createAnnotatedType(clazz);
+         this.it = manager.createInjectionTarget(type);
+         this.clazz = clazz;
+      }
+
+      public Class<T> getClazz()
+      {
+         return clazz;
+      }
+      
+      public InjectionTarget<T> getInjectionTarget()
+      {
+         return it;
+      }
+      
+      public CreationalContext<T> postConstruct(T instance) {
+         CreationalContext<T> cc = manager.createCreationalContext(null);
+         it.inject(instance, cc);
+         it.postConstruct(instance);
+         return cc;
+      }
+
+      public T produce()
+      {
+         CreationalContext<T> cc = manager.createCreationalContext(null);
+         return it.produce(cc);
+      }
+      
+      public void preDestroy(T instance) {
+         it.preDestroy(instance);
+      }
+   }
+}



More information about the jboss-cvs-commits mailing list