Weld SVN: r3889 - ri/trunk/tests/src/test/resources/org/jboss.
by weld-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-10-08 01:17:19 -0400 (Thu, 08 Oct 2009)
New Revision: 3889
Removed:
ri/trunk/tests/src/test/resources/org/jboss/webbeans/
Log:
rename resource dir
14 years, 7 months
- 1
- 0
Weld SVN: r3888 - ri/trunk/spi/src/test/java/org/jboss.
by weld-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-10-08 00:54:00 -0400 (Thu, 08 Oct 2009)
New Revision: 3888
Removed:
ri/trunk/spi/src/test/java/org/jboss/webbeans/
Log:
removed empty dirs
14 years, 7 months
- 1
- 0
Weld SVN: r3887 - in ri/trunk/spi/src/test/java/org/jboss: weld and 3 other directories.
by weld-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-10-08 00:53:32 -0400 (Thu, 08 Oct 2009)
New Revision: 3887
Added:
ri/trunk/spi/src/test/java/org/jboss/weld/
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/BootstrapTest.java
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockBootstrap.java
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockDeployment.java
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbInjectionServices.java
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbServices.java
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockJpaServices.java
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceLoader.java
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceServices.java
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockSecurityServices.java
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockService.java
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockServletServices.java
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockTransactionServices.java
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockValidationServices.java
Removed:
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/BootstrapTest.java
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockBootstrap.java
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockDeployment.java
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbInjectionServices.java
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbServices.java
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockJpaServices.java
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceLoader.java
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceServices.java
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockSecurityServices.java
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockService.java
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockServletServices.java
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockTransactionServices.java
ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockValidationServices.java
Log:
refactor package
Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test (from rev 3872, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test)
Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/BootstrapTest.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/BootstrapTest.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,229 +0,0 @@
-package org.jboss.webbeans.bootstrap.api.test;
-
-import org.jboss.webbeans.bootstrap.api.Bootstrap;
-import org.jboss.webbeans.bootstrap.api.Environments;
-import org.jboss.webbeans.bootstrap.api.ServiceRegistry;
-import org.jboss.webbeans.bootstrap.api.helpers.SimpleServiceRegistry;
-import org.jboss.webbeans.bootstrap.api.test.MockDeployment.MockBeanDeploymentArchive;
-import org.jboss.webbeans.bootstrap.spi.Deployment;
-import org.jboss.webbeans.ejb.spi.EjbServices;
-import org.jboss.webbeans.injection.spi.EjbInjectionServices;
-import org.jboss.webbeans.injection.spi.JpaInjectionServices;
-import org.jboss.webbeans.injection.spi.ResourceInjectionServices;
-import org.jboss.webbeans.resources.spi.ResourceLoader;
-import org.jboss.webbeans.security.spi.SecurityServices;
-import org.jboss.webbeans.servlet.api.ServletServices;
-import org.jboss.webbeans.transaction.spi.TransactionServices;
-import org.jboss.webbeans.validation.spi.ValidationServices;
-import org.testng.annotations.Test;
-
-public class BootstrapTest
-{
-
- @Test(expectedExceptions = IllegalStateException.class)
- public void testMissingEjbServices()
- {
- Bootstrap bootstrap = new MockBootstrap();
- ServiceRegistry deploymentServices = new SimpleServiceRegistry();
- ServiceRegistry bdaServices = new SimpleServiceRegistry();
- deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
- deploymentServices.add(TransactionServices.class, new MockTransactionServices());
- deploymentServices.add(SecurityServices.class, new MockSecurityServices());
- deploymentServices.add(ValidationServices.class, new MockValidationServices());
- deploymentServices.add(ServletServices.class, new MockServletServices());
-
- bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
- bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
- bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
-
- Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
- bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
- }
-
- @Test(expectedExceptions = IllegalStateException.class)
- public void testMissingEjbInjectionServices()
- {
- Bootstrap bootstrap = new MockBootstrap();
- ServiceRegistry deploymentServices = new SimpleServiceRegistry();
- ServiceRegistry bdaServices = new SimpleServiceRegistry();
- deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
- deploymentServices.add(TransactionServices.class, new MockTransactionServices());
- deploymentServices.add(SecurityServices.class, new MockSecurityServices());
- deploymentServices.add(ValidationServices.class, new MockValidationServices());
- deploymentServices.add(ServletServices.class, new MockServletServices());
-
- bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
- bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
-
- Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
- bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
- }
-
- @Test(expectedExceptions = IllegalStateException.class)
- public void testMissingJpaServices()
- {
- Bootstrap bootstrap = new MockBootstrap();
- ServiceRegistry deploymentServices = new SimpleServiceRegistry();
- deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
- deploymentServices.add(TransactionServices.class, new MockTransactionServices());
- deploymentServices.add(SecurityServices.class, new MockSecurityServices());
- deploymentServices.add(ValidationServices.class, new MockValidationServices());
- deploymentServices.add(ServletServices.class, new MockServletServices());
- deploymentServices.add(EjbServices.class, new MockEjbServices());
-
- ServiceRegistry bdaServices = new SimpleServiceRegistry();
-
- bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
- bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
- bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
-
- Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
- bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
- }
-
- @Test(expectedExceptions = IllegalStateException.class)
- public void testMissingSecurityServices()
- {
- Bootstrap bootstrap = new MockBootstrap();
- ServiceRegistry deploymentServices = new SimpleServiceRegistry();
- deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
- deploymentServices.add(TransactionServices.class, new MockTransactionServices());
- deploymentServices.add(ValidationServices.class, new MockValidationServices());
- deploymentServices.add(ServletServices.class, new MockServletServices());
- deploymentServices.add(EjbServices.class, new MockEjbServices());
-
- ServiceRegistry bdaServices = new SimpleServiceRegistry();
-
- bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
- bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
- bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
-
- Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
- bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
- }
-
- @Test(expectedExceptions = IllegalStateException.class)
- public void testMissingValidationServices()
- {
- Bootstrap bootstrap = new MockBootstrap();
- ServiceRegistry deploymentServices = new SimpleServiceRegistry();
- deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
- deploymentServices.add(TransactionServices.class, new MockTransactionServices());
- deploymentServices.add(SecurityServices.class, new MockSecurityServices());
- deploymentServices.add(ServletServices.class, new MockServletServices());
- deploymentServices.add(EjbServices.class, new MockEjbServices());
-
- ServiceRegistry bdaServices = new SimpleServiceRegistry();
- bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
- bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
- bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
-
- Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
- bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
- }
-
- @Test
- public void testEEEnv()
- {
- Bootstrap bootstrap = new MockBootstrap();
- ServiceRegistry deploymentServices = new SimpleServiceRegistry();
- deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
- deploymentServices.add(TransactionServices.class, new MockTransactionServices());
- deploymentServices.add(SecurityServices.class, new MockSecurityServices());
- deploymentServices.add(ValidationServices.class, new MockValidationServices());
- deploymentServices.add(ServletServices.class, new MockServletServices());
- deploymentServices.add(EjbServices.class, new MockEjbServices());
-
- ServiceRegistry bdaServices = new SimpleServiceRegistry();
- bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
- bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
- bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
-
- Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
- bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
- }
-
- @Test(expectedExceptions = IllegalStateException.class)
- public void testMissingTxServices()
- {
- Bootstrap bootstrap = new MockBootstrap();
- ServiceRegistry deploymentServices = new SimpleServiceRegistry();
- deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
- deploymentServices.add(SecurityServices.class, new MockSecurityServices());
- deploymentServices.add(ValidationServices.class, new MockValidationServices());
- deploymentServices.add(ServletServices.class, new MockServletServices());
- deploymentServices.add(EjbServices.class, new MockEjbServices());
-
- ServiceRegistry bdaServices = new SimpleServiceRegistry();
- bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
- bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
- bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
-
- Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
- bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
- }
-
- @Test(expectedExceptions = IllegalStateException.class)
- public void testMissingResourceServices()
- {
- Bootstrap bootstrap = new MockBootstrap();
- ServiceRegistry deploymentServices = new SimpleServiceRegistry();
- deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
- deploymentServices.add(TransactionServices.class, new MockTransactionServices());
- deploymentServices.add(SecurityServices.class, new MockSecurityServices());
- deploymentServices.add(ValidationServices.class, new MockValidationServices());
- deploymentServices.add(ServletServices.class, new MockServletServices());
- deploymentServices.add(EjbServices.class, new MockEjbServices());
-
- ServiceRegistry bdaServices = new SimpleServiceRegistry();
- bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
- bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
-
- Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
- bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
- }
-
- @Test(expectedExceptions = IllegalStateException.class)
- public void testMissingServletServices()
- {
- Bootstrap bootstrap = new MockBootstrap();
- ServiceRegistry deploymentServices = new SimpleServiceRegistry();
- deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
- deploymentServices.add(TransactionServices.class, new MockTransactionServices());
- deploymentServices.add(SecurityServices.class, new MockSecurityServices());
- deploymentServices.add(ValidationServices.class, new MockValidationServices());
- deploymentServices.add(EjbServices.class, new MockEjbServices());
-
- ServiceRegistry bdaServices = new SimpleServiceRegistry();
- bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
- bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
- bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
-
- Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
- bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
- }
-
- @Test
- public void testSEEnv()
- {
- Bootstrap bootstrap = new MockBootstrap();
- ServiceRegistry deploymentServices = new SimpleServiceRegistry();
- deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
- ServiceRegistry bdaServices = new SimpleServiceRegistry();
- Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
- bootstrap.startContainer(Environments.SE, deployment, null);
- }
-
- @Test
- public void testServletEnv()
- {
- Bootstrap bootstrap = new MockBootstrap();
- ServiceRegistry deploymentServices = new SimpleServiceRegistry();
- deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
- deploymentServices.add(ServletServices.class, new MockServletServices());
- ServiceRegistry bdaServices = new SimpleServiceRegistry();
- Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
- bootstrap.startContainer(Environments.SERVLET, deployment, null);
- }
-
-}
Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/BootstrapTest.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/BootstrapTest.java (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/BootstrapTest.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,229 @@
+package org.jboss.weld.bootstrap.api.test;
+
+import org.jboss.weld.bootstrap.api.Bootstrap;
+import org.jboss.weld.bootstrap.api.Environments;
+import org.jboss.weld.bootstrap.api.ServiceRegistry;
+import org.jboss.weld.bootstrap.api.helpers.SimpleServiceRegistry;
+import org.jboss.weld.bootstrap.api.test.MockDeployment.MockBeanDeploymentArchive;
+import org.jboss.weld.bootstrap.spi.Deployment;
+import org.jboss.weld.ejb.spi.EjbServices;
+import org.jboss.weld.injection.spi.EjbInjectionServices;
+import org.jboss.weld.injection.spi.JpaInjectionServices;
+import org.jboss.weld.injection.spi.ResourceInjectionServices;
+import org.jboss.weld.resources.spi.ResourceLoader;
+import org.jboss.weld.security.spi.SecurityServices;
+import org.jboss.weld.servlet.api.ServletServices;
+import org.jboss.weld.transaction.spi.TransactionServices;
+import org.jboss.weld.validation.spi.ValidationServices;
+import org.testng.annotations.Test;
+
+public class BootstrapTest
+{
+
+ @Test(expectedExceptions = IllegalStateException.class)
+ public void testMissingEjbServices()
+ {
+ Bootstrap bootstrap = new MockBootstrap();
+ ServiceRegistry deploymentServices = new SimpleServiceRegistry();
+ ServiceRegistry bdaServices = new SimpleServiceRegistry();
+ deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
+ deploymentServices.add(TransactionServices.class, new MockTransactionServices());
+ deploymentServices.add(SecurityServices.class, new MockSecurityServices());
+ deploymentServices.add(ValidationServices.class, new MockValidationServices());
+ deploymentServices.add(ServletServices.class, new MockServletServices());
+
+ bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
+ bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
+ bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
+
+ Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
+ bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
+ }
+
+ @Test(expectedExceptions = IllegalStateException.class)
+ public void testMissingEjbInjectionServices()
+ {
+ Bootstrap bootstrap = new MockBootstrap();
+ ServiceRegistry deploymentServices = new SimpleServiceRegistry();
+ ServiceRegistry bdaServices = new SimpleServiceRegistry();
+ deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
+ deploymentServices.add(TransactionServices.class, new MockTransactionServices());
+ deploymentServices.add(SecurityServices.class, new MockSecurityServices());
+ deploymentServices.add(ValidationServices.class, new MockValidationServices());
+ deploymentServices.add(ServletServices.class, new MockServletServices());
+
+ bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
+ bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
+
+ Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
+ bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
+ }
+
+ @Test(expectedExceptions = IllegalStateException.class)
+ public void testMissingJpaServices()
+ {
+ Bootstrap bootstrap = new MockBootstrap();
+ ServiceRegistry deploymentServices = new SimpleServiceRegistry();
+ deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
+ deploymentServices.add(TransactionServices.class, new MockTransactionServices());
+ deploymentServices.add(SecurityServices.class, new MockSecurityServices());
+ deploymentServices.add(ValidationServices.class, new MockValidationServices());
+ deploymentServices.add(ServletServices.class, new MockServletServices());
+ deploymentServices.add(EjbServices.class, new MockEjbServices());
+
+ ServiceRegistry bdaServices = new SimpleServiceRegistry();
+
+ bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
+ bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
+ bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
+
+ Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
+ bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
+ }
+
+ @Test(expectedExceptions = IllegalStateException.class)
+ public void testMissingSecurityServices()
+ {
+ Bootstrap bootstrap = new MockBootstrap();
+ ServiceRegistry deploymentServices = new SimpleServiceRegistry();
+ deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
+ deploymentServices.add(TransactionServices.class, new MockTransactionServices());
+ deploymentServices.add(ValidationServices.class, new MockValidationServices());
+ deploymentServices.add(ServletServices.class, new MockServletServices());
+ deploymentServices.add(EjbServices.class, new MockEjbServices());
+
+ ServiceRegistry bdaServices = new SimpleServiceRegistry();
+
+ bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
+ bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
+ bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
+
+ Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
+ bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
+ }
+
+ @Test(expectedExceptions = IllegalStateException.class)
+ public void testMissingValidationServices()
+ {
+ Bootstrap bootstrap = new MockBootstrap();
+ ServiceRegistry deploymentServices = new SimpleServiceRegistry();
+ deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
+ deploymentServices.add(TransactionServices.class, new MockTransactionServices());
+ deploymentServices.add(SecurityServices.class, new MockSecurityServices());
+ deploymentServices.add(ServletServices.class, new MockServletServices());
+ deploymentServices.add(EjbServices.class, new MockEjbServices());
+
+ ServiceRegistry bdaServices = new SimpleServiceRegistry();
+ bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
+ bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
+ bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
+
+ Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
+ bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
+ }
+
+ @Test
+ public void testEEEnv()
+ {
+ Bootstrap bootstrap = new MockBootstrap();
+ ServiceRegistry deploymentServices = new SimpleServiceRegistry();
+ deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
+ deploymentServices.add(TransactionServices.class, new MockTransactionServices());
+ deploymentServices.add(SecurityServices.class, new MockSecurityServices());
+ deploymentServices.add(ValidationServices.class, new MockValidationServices());
+ deploymentServices.add(ServletServices.class, new MockServletServices());
+ deploymentServices.add(EjbServices.class, new MockEjbServices());
+
+ ServiceRegistry bdaServices = new SimpleServiceRegistry();
+ bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
+ bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
+ bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
+
+ Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
+ bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
+ }
+
+ @Test(expectedExceptions = IllegalStateException.class)
+ public void testMissingTxServices()
+ {
+ Bootstrap bootstrap = new MockBootstrap();
+ ServiceRegistry deploymentServices = new SimpleServiceRegistry();
+ deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
+ deploymentServices.add(SecurityServices.class, new MockSecurityServices());
+ deploymentServices.add(ValidationServices.class, new MockValidationServices());
+ deploymentServices.add(ServletServices.class, new MockServletServices());
+ deploymentServices.add(EjbServices.class, new MockEjbServices());
+
+ ServiceRegistry bdaServices = new SimpleServiceRegistry();
+ bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
+ bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
+ bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
+
+ Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
+ bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
+ }
+
+ @Test(expectedExceptions = IllegalStateException.class)
+ public void testMissingResourceServices()
+ {
+ Bootstrap bootstrap = new MockBootstrap();
+ ServiceRegistry deploymentServices = new SimpleServiceRegistry();
+ deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
+ deploymentServices.add(TransactionServices.class, new MockTransactionServices());
+ deploymentServices.add(SecurityServices.class, new MockSecurityServices());
+ deploymentServices.add(ValidationServices.class, new MockValidationServices());
+ deploymentServices.add(ServletServices.class, new MockServletServices());
+ deploymentServices.add(EjbServices.class, new MockEjbServices());
+
+ ServiceRegistry bdaServices = new SimpleServiceRegistry();
+ bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
+ bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
+
+ Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
+ bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
+ }
+
+ @Test(expectedExceptions = IllegalStateException.class)
+ public void testMissingServletServices()
+ {
+ Bootstrap bootstrap = new MockBootstrap();
+ ServiceRegistry deploymentServices = new SimpleServiceRegistry();
+ deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
+ deploymentServices.add(TransactionServices.class, new MockTransactionServices());
+ deploymentServices.add(SecurityServices.class, new MockSecurityServices());
+ deploymentServices.add(ValidationServices.class, new MockValidationServices());
+ deploymentServices.add(EjbServices.class, new MockEjbServices());
+
+ ServiceRegistry bdaServices = new SimpleServiceRegistry();
+ bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
+ bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
+ bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
+
+ Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
+ bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
+ }
+
+ @Test
+ public void testSEEnv()
+ {
+ Bootstrap bootstrap = new MockBootstrap();
+ ServiceRegistry deploymentServices = new SimpleServiceRegistry();
+ deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
+ ServiceRegistry bdaServices = new SimpleServiceRegistry();
+ Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
+ bootstrap.startContainer(Environments.SE, deployment, null);
+ }
+
+ @Test
+ public void testServletEnv()
+ {
+ Bootstrap bootstrap = new MockBootstrap();
+ ServiceRegistry deploymentServices = new SimpleServiceRegistry();
+ deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
+ deploymentServices.add(ServletServices.class, new MockServletServices());
+ ServiceRegistry bdaServices = new SimpleServiceRegistry();
+ Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
+ bootstrap.startContainer(Environments.SERVLET, deployment, null);
+ }
+
+}
Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockBootstrap.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockBootstrap.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockBootstrap.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,65 +0,0 @@
-package org.jboss.webbeans.bootstrap.api.test;
-
-import java.util.Set;
-
-import org.jboss.webbeans.bootstrap.api.Bootstrap;
-import org.jboss.webbeans.bootstrap.api.Environment;
-import org.jboss.webbeans.bootstrap.api.Service;
-import org.jboss.webbeans.bootstrap.api.ServiceRegistry;
-import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.webbeans.bootstrap.spi.Deployment;
-import org.jboss.webbeans.context.api.BeanStore;
-import org.jboss.webbeans.manager.api.WebBeansManager;
-
-public class MockBootstrap implements Bootstrap
-{
-
- public WebBeansManager getManager(BeanDeploymentArchive beanDeploymentArchive)
- {
- return null;
- }
-
- public void shutdown()
- {
- }
-
- public Bootstrap deployBeans()
- {
- return this;
- }
-
- public Bootstrap endInitialization()
- {
- return this;
- }
-
- public Bootstrap startInitialization()
- {
- return this;
- }
-
- public Bootstrap validateBeans()
- {
- return this;
- }
-
- protected static void verifyServices(ServiceRegistry services, Set<Class<? extends Service>> requiredServices)
- {
- for (Class<? extends Service> serviceType : requiredServices)
- {
- if (!services.contains(serviceType))
- {
- throw new IllegalStateException("Required service " + serviceType.getName() + " has not been specified");
- }
- }
- }
-
- public Bootstrap startContainer(Environment environment, Deployment deployment, BeanStore beanStore)
- {
- verifyServices(deployment.getServices(), environment.getRequiredDeploymentServices());
- verifyServices(deployment.getBeanDeploymentArchives().iterator().next().getServices(), environment.getRequiredBeanDeploymentArchiveServices());
- return this;
- }
-
-
-}
Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockBootstrap.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockBootstrap.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockBootstrap.java (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockBootstrap.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,65 @@
+package org.jboss.weld.bootstrap.api.test;
+
+import java.util.Set;
+
+import org.jboss.weld.bootstrap.api.Bootstrap;
+import org.jboss.weld.bootstrap.api.Environment;
+import org.jboss.weld.bootstrap.api.Service;
+import org.jboss.weld.bootstrap.api.ServiceRegistry;
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.weld.bootstrap.spi.Deployment;
+import org.jboss.weld.context.api.BeanStore;
+import org.jboss.weld.manager.api.WebBeansManager;
+
+public class MockBootstrap implements Bootstrap
+{
+
+ public WebBeansManager getManager(BeanDeploymentArchive beanDeploymentArchive)
+ {
+ return null;
+ }
+
+ public void shutdown()
+ {
+ }
+
+ public Bootstrap deployBeans()
+ {
+ return this;
+ }
+
+ public Bootstrap endInitialization()
+ {
+ return this;
+ }
+
+ public Bootstrap startInitialization()
+ {
+ return this;
+ }
+
+ public Bootstrap validateBeans()
+ {
+ return this;
+ }
+
+ protected static void verifyServices(ServiceRegistry services, Set<Class<? extends Service>> requiredServices)
+ {
+ for (Class<? extends Service> serviceType : requiredServices)
+ {
+ if (!services.contains(serviceType))
+ {
+ throw new IllegalStateException("Required service " + serviceType.getName() + " has not been specified");
+ }
+ }
+ }
+
+ public Bootstrap startContainer(Environment environment, Deployment deployment, BeanStore beanStore)
+ {
+ verifyServices(deployment.getServices(), environment.getRequiredDeploymentServices());
+ verifyServices(deployment.getBeanDeploymentArchives().iterator().next().getServices(), environment.getRequiredBeanDeploymentArchiveServices());
+ return this;
+ }
+
+
+}
Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockDeployment.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockDeployment.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockDeployment.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,102 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.webbeans.bootstrap.api.test;
-
-import java.net.URL;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.jboss.webbeans.bootstrap.api.ServiceRegistry;
-import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.webbeans.bootstrap.spi.Deployment;
-import org.jboss.webbeans.ejb.spi.EjbDescriptor;
-
-/**
- * @author pmuir
- *
- */
-public class MockDeployment implements Deployment
-{
-
- static class MockBeanDeploymentArchive implements BeanDeploymentArchive
- {
-
- private final ServiceRegistry services;
-
- public MockBeanDeploymentArchive(ServiceRegistry services)
- {
- this.services = services;
- }
-
- public Collection<Class<?>> getBeanClasses()
- {
- return Collections.emptySet();
- }
-
- public Collection<BeanDeploymentArchive> getBeanDeploymentArchives()
- {
- return Collections.emptySet();
- }
-
- public Collection<URL> getBeansXml()
- {
- return Collections.emptySet();
- }
-
- public Collection<EjbDescriptor<?>> getEjbs()
- {
- return Collections.emptySet();
- }
-
- public ServiceRegistry getServices()
- {
- return services;
- }
-
- public String getId()
- {
- return "test";
- }
-
- }
-
- private final ServiceRegistry services;
- private final BeanDeploymentArchive beanDeploymentArchive;
-
- public MockDeployment(ServiceRegistry services, MockBeanDeploymentArchive beanDeploymentArchive)
- {
- this.services = services;
- this.beanDeploymentArchive = beanDeploymentArchive;
- }
-
- public List<BeanDeploymentArchive> getBeanDeploymentArchives()
- {
- return Collections.singletonList(beanDeploymentArchive);
- }
-
- public BeanDeploymentArchive loadBeanDeploymentArchive(Class<?> beanClass)
- {
- return null;
- }
-
- public ServiceRegistry getServices()
- {
- return services;
- }
-
-}
Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockDeployment.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockDeployment.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockDeployment.java (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockDeployment.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,102 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.bootstrap.api.test;
+
+import java.net.URL;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.jboss.weld.bootstrap.api.ServiceRegistry;
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.weld.bootstrap.spi.Deployment;
+import org.jboss.weld.ejb.spi.EjbDescriptor;
+
+/**
+ * @author pmuir
+ *
+ */
+public class MockDeployment implements Deployment
+{
+
+ static class MockBeanDeploymentArchive implements BeanDeploymentArchive
+ {
+
+ private final ServiceRegistry services;
+
+ public MockBeanDeploymentArchive(ServiceRegistry services)
+ {
+ this.services = services;
+ }
+
+ public Collection<Class<?>> getBeanClasses()
+ {
+ return Collections.emptySet();
+ }
+
+ public Collection<BeanDeploymentArchive> getBeanDeploymentArchives()
+ {
+ return Collections.emptySet();
+ }
+
+ public Collection<URL> getBeansXml()
+ {
+ return Collections.emptySet();
+ }
+
+ public Collection<EjbDescriptor<?>> getEjbs()
+ {
+ return Collections.emptySet();
+ }
+
+ public ServiceRegistry getServices()
+ {
+ return services;
+ }
+
+ public String getId()
+ {
+ return "test";
+ }
+
+ }
+
+ private final ServiceRegistry services;
+ private final BeanDeploymentArchive beanDeploymentArchive;
+
+ public MockDeployment(ServiceRegistry services, MockBeanDeploymentArchive beanDeploymentArchive)
+ {
+ this.services = services;
+ this.beanDeploymentArchive = beanDeploymentArchive;
+ }
+
+ public List<BeanDeploymentArchive> getBeanDeploymentArchives()
+ {
+ return Collections.singletonList(beanDeploymentArchive);
+ }
+
+ public BeanDeploymentArchive loadBeanDeploymentArchive(Class<?> beanClass)
+ {
+ return null;
+ }
+
+ public ServiceRegistry getServices()
+ {
+ return services;
+ }
+
+}
Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbInjectionServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbInjectionServices.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbInjectionServices.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.webbeans.bootstrap.api.test;
-
-import javax.enterprise.inject.spi.InjectionPoint;
-
-import org.jboss.webbeans.injection.spi.EjbInjectionServices;
-
-/**
- * @author pmuir
- *
- */
-public class MockEjbInjectionServices extends MockService implements EjbInjectionServices
-{
-
- public Object resolveEjb(InjectionPoint injectionPoint)
- {
- return null;
- }
-
-}
Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbInjectionServices.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbInjectionServices.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbInjectionServices.java (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbInjectionServices.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.bootstrap.api.test;
+
+import javax.enterprise.inject.spi.InjectionPoint;
+
+import org.jboss.weld.injection.spi.EjbInjectionServices;
+
+/**
+ * @author pmuir
+ *
+ */
+public class MockEjbInjectionServices extends MockService implements EjbInjectionServices
+{
+
+ public Object resolveEjb(InjectionPoint injectionPoint)
+ {
+ return null;
+ }
+
+}
Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbServices.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbServices.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,38 +0,0 @@
-package org.jboss.webbeans.bootstrap.api.test;
-
-import javax.enterprise.inject.spi.InjectionPoint;
-
-import org.jboss.webbeans.ejb.api.SessionObjectReference;
-import org.jboss.webbeans.ejb.spi.EjbDescriptor;
-import org.jboss.webbeans.ejb.spi.EjbServices;
-import org.jboss.webbeans.ejb.spi.InterceptorBindings;
-
-public class MockEjbServices extends MockService implements EjbServices
-{
-
- public Iterable<EjbDescriptor<?>> discoverEjbs()
- {
- return null;
- }
-
- public SessionObjectReference resolveEjb(EjbDescriptor<?> ejbDescriptor)
- {
- return null;
- }
-
- public void registerInterceptors(EjbDescriptor<?> ejbDescriptor, InterceptorBindings interceptorBindings)
- {
- // do nothing
- }
-
- public Object resolveEjb(InjectionPoint injectionPoint)
- {
- return null;
- }
-
- public Object resolveRemoteEjb(String jndiName, String mappedName, String ejbLink)
- {
- return null;
- }
-
-}
Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbServices.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbServices.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbServices.java (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbServices.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,38 @@
+package org.jboss.weld.bootstrap.api.test;
+
+import javax.enterprise.inject.spi.InjectionPoint;
+
+import org.jboss.weld.ejb.api.SessionObjectReference;
+import org.jboss.weld.ejb.spi.EjbDescriptor;
+import org.jboss.weld.ejb.spi.EjbServices;
+import org.jboss.weld.ejb.spi.InterceptorBindings;
+
+public class MockEjbServices extends MockService implements EjbServices
+{
+
+ public Iterable<EjbDescriptor<?>> discoverEjbs()
+ {
+ return null;
+ }
+
+ public SessionObjectReference resolveEjb(EjbDescriptor<?> ejbDescriptor)
+ {
+ return null;
+ }
+
+ public void registerInterceptors(EjbDescriptor<?> ejbDescriptor, InterceptorBindings interceptorBindings)
+ {
+ // do nothing
+ }
+
+ public Object resolveEjb(InjectionPoint injectionPoint)
+ {
+ return null;
+ }
+
+ public Object resolveRemoteEjb(String jndiName, String mappedName, String ejbLink)
+ {
+ return null;
+ }
+
+}
Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockJpaServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJpaServices.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockJpaServices.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,29 +0,0 @@
-package org.jboss.webbeans.bootstrap.api.test;
-
-import java.util.Collection;
-
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-
-import org.jboss.webbeans.injection.spi.JpaInjectionServices;
-
-public class MockJpaServices extends MockService implements JpaInjectionServices
-{
-
- public Collection<Class<?>> discoverEntities()
- {
- return null;
- }
-
- public EntityManager resolvePersistenceContext(InjectionPoint injectionPoint)
- {
- return null;
- }
-
- public EntityManagerFactory resolvePersistenceUnit(InjectionPoint injectionPoint)
- {
- return null;
- }
-
-}
Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockJpaServices.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJpaServices.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockJpaServices.java (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockJpaServices.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,29 @@
+package org.jboss.weld.bootstrap.api.test;
+
+import java.util.Collection;
+
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
+import org.jboss.weld.injection.spi.JpaInjectionServices;
+
+public class MockJpaServices extends MockService implements JpaInjectionServices
+{
+
+ public Collection<Class<?>> discoverEntities()
+ {
+ return null;
+ }
+
+ public EntityManager resolvePersistenceContext(InjectionPoint injectionPoint)
+ {
+ return null;
+ }
+
+ public EntityManagerFactory resolvePersistenceUnit(InjectionPoint injectionPoint)
+ {
+ return null;
+ }
+
+}
Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceLoader.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceLoader.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceLoader.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,26 +0,0 @@
-package org.jboss.webbeans.bootstrap.api.test;
-
-import java.net.URL;
-import java.util.Collection;
-
-import org.jboss.webbeans.resources.spi.ResourceLoader;
-
-public class MockResourceLoader extends MockService implements ResourceLoader
-{
-
- public Class<?> classForName(String name)
- {
- return null;
- }
-
- public URL getResource(String name)
- {
- return null;
- }
-
- public Collection<URL> getResources(String name)
- {
- return null;
- }
-
-}
Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceLoader.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceLoader.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceLoader.java (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceLoader.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,26 @@
+package org.jboss.weld.bootstrap.api.test;
+
+import java.net.URL;
+import java.util.Collection;
+
+import org.jboss.weld.resources.spi.ResourceLoader;
+
+public class MockResourceLoader extends MockService implements ResourceLoader
+{
+
+ public Class<?> classForName(String name)
+ {
+ return null;
+ }
+
+ public URL getResource(String name)
+ {
+ return null;
+ }
+
+ public Collection<URL> getResources(String name)
+ {
+ return null;
+ }
+
+}
Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceServices.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceServices.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,20 +0,0 @@
-package org.jboss.webbeans.bootstrap.api.test;
-
-import javax.enterprise.inject.spi.InjectionPoint;
-
-import org.jboss.webbeans.injection.spi.ResourceInjectionServices;
-
-public class MockResourceServices extends MockService implements ResourceInjectionServices
-{
-
- public Object resolveResource(InjectionPoint injectionPoint)
- {
- return null;
- }
-
- public Object resolveResource(String jndiName, String mappedName)
- {
- return null;
- }
-
-}
Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceServices.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceServices.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceServices.java (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceServices.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,20 @@
+package org.jboss.weld.bootstrap.api.test;
+
+import javax.enterprise.inject.spi.InjectionPoint;
+
+import org.jboss.weld.injection.spi.ResourceInjectionServices;
+
+public class MockResourceServices extends MockService implements ResourceInjectionServices
+{
+
+ public Object resolveResource(InjectionPoint injectionPoint)
+ {
+ return null;
+ }
+
+ public Object resolveResource(String jndiName, String mappedName)
+ {
+ return null;
+ }
+
+}
Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockSecurityServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockSecurityServices.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockSecurityServices.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.webbeans.bootstrap.api.test;
-
-import java.security.Principal;
-
-import org.jboss.webbeans.security.spi.SecurityServices;
-
-/**
- * @author pmuir
- *
- */
-public class MockSecurityServices extends MockService implements SecurityServices
-{
-
- /* (non-Javadoc)
- * @see org.jboss.webbeans.security.spi.SecurityServices#getPrincipal()
- */
- public Principal getPrincipal()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockSecurityServices.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockSecurityServices.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockSecurityServices.java (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockSecurityServices.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.bootstrap.api.test;
+
+import java.security.Principal;
+
+import org.jboss.weld.security.spi.SecurityServices;
+
+/**
+ * @author pmuir
+ *
+ */
+public class MockSecurityServices extends MockService implements SecurityServices
+{
+
+ /* (non-Javadoc)
+ * @see org.jboss.webbeans.security.spi.SecurityServices#getPrincipal()
+ */
+ public Principal getPrincipal()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+}
Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockService.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockService.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockService.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.webbeans.bootstrap.api.test;
-
-import org.jboss.webbeans.bootstrap.api.Service;
-
-/**
- * @author pmuir
- *
- */
-public abstract class MockService implements Service
-{
-
- public void cleanup()
- {
- // TODO Auto-generated method stub
-
- }
-
-}
Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockService.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockService.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockService.java (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockService.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.bootstrap.api.test;
+
+import org.jboss.weld.bootstrap.api.Service;
+
+/**
+ * @author pmuir
+ *
+ */
+public abstract class MockService implements Service
+{
+
+ public void cleanup()
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockServletServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockServletServices.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockServletServices.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.webbeans.bootstrap.api.test;
-
-import javax.servlet.ServletContext;
-
-import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.webbeans.servlet.api.ServletServices;
-
-/**
- * @author pmuir
- *
- */
-public class MockServletServices extends MockService implements ServletServices
-{
-
- public BeanDeploymentArchive getBeanDeploymentArchive(ServletContext ctx)
- {
- return null;
- }
-
-}
Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockServletServices.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockServletServices.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockServletServices.java (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockServletServices.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.bootstrap.api.test;
+
+import javax.servlet.ServletContext;
+
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.weld.servlet.api.ServletServices;
+
+/**
+ * @author pmuir
+ *
+ */
+public class MockServletServices extends MockService implements ServletServices
+{
+
+ public BeanDeploymentArchive getBeanDeploymentArchive(ServletContext ctx)
+ {
+ return null;
+ }
+
+}
Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockTransactionServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockTransactionServices.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockTransactionServices.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,25 +0,0 @@
-package org.jboss.webbeans.bootstrap.api.test;
-
-import javax.transaction.Synchronization;
-import javax.transaction.UserTransaction;
-
-import org.jboss.webbeans.transaction.spi.TransactionServices;
-
-public class MockTransactionServices extends MockService implements TransactionServices
-{
-
- public boolean isTransactionActive()
- {
- return false;
- }
-
- public void registerSynchronization(Synchronization synchronizedObserver)
- {
- }
-
- public UserTransaction getUserTransaction()
- {
- return null;
- }
-
-}
Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockTransactionServices.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockTransactionServices.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockTransactionServices.java (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockTransactionServices.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,25 @@
+package org.jboss.weld.bootstrap.api.test;
+
+import javax.transaction.Synchronization;
+import javax.transaction.UserTransaction;
+
+import org.jboss.weld.transaction.spi.TransactionServices;
+
+public class MockTransactionServices extends MockService implements TransactionServices
+{
+
+ public boolean isTransactionActive()
+ {
+ return false;
+ }
+
+ public void registerSynchronization(Synchronization synchronizedObserver)
+ {
+ }
+
+ public UserTransaction getUserTransaction()
+ {
+ return null;
+ }
+
+}
Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockValidationServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockValidationServices.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockValidationServices.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.webbeans.bootstrap.api.test;
-
-import javax.validation.ValidatorFactory;
-
-import org.jboss.webbeans.validation.spi.ValidationServices;
-
-/**
- * @author pmuir
- *
- */
-public class MockValidationServices extends MockService implements ValidationServices
-{
-
- public ValidatorFactory getDefaultValidatorFactory()
- {
- return null;
- }
-
-}
Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockValidationServices.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockValidationServices.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockValidationServices.java (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockValidationServices.java 2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.bootstrap.api.test;
+
+import javax.validation.ValidatorFactory;
+
+import org.jboss.weld.validation.spi.ValidationServices;
+
+/**
+ * @author pmuir
+ *
+ */
+public class MockValidationServices extends MockService implements ValidationServices
+{
+
+ public ValidatorFactory getDefaultValidatorFactory()
+ {
+ return null;
+ }
+
+}
14 years, 7 months
- 1
- 0
Weld SVN: r3886 - in ri/trunk: api and 11 other directories.
by weld-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-10-08 00:41:34 -0400 (Thu, 08 Oct 2009)
New Revision: 3886
Modified:
ri/trunk/api/pom.xml
ri/trunk/impl/pom.xml
ri/trunk/inject-tck-runner/pom.xml
ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/AtInjectTCK.java
ri/trunk/osgi-bundle/pom.xml
ri/trunk/parent/pom.xml
ri/trunk/pom.xml
ri/trunk/porting-package/pom.xml
ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/BeansImpl.java
ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ContextsImpl.java
ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ELImpl.java
ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ManagersImpl.java
ri/trunk/spi/pom.xml
ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java
ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockBootstrap.java
ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockDeployment.java
ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbInjectionServices.java
ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbServices.java
ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJpaServices.java
ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceLoader.java
ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceServices.java
ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockSecurityServices.java
ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockService.java
ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockServletServices.java
ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockTransactionServices.java
ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockValidationServices.java
ri/trunk/tests/pom.xml
ri/trunk/version-matrix/pom.xml
Log:
update poms
Modified: ri/trunk/api/pom.xml
===================================================================
--- ri/trunk/api/pom.xml 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/api/pom.xml 2009-10-08 04:41:34 UTC (rev 3886)
@@ -2,17 +2,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-parent</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.webbeans</groupId>
+ <groupId>org.jboss.weld</groupId>
<artifactId>jsr299-api</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JSR-299 API</name>
- <url>http://www.seamframework.org/WebBeans</url>
+ <url>http://www.seamframework.org/Weld</url>
<dependencies>
<dependency>
Modified: ri/trunk/impl/pom.xml
===================================================================
--- ri/trunk/impl/pom.xml 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/impl/pom.xml 2009-10-08 04:41:34 UTC (rev 3886)
@@ -1,34 +1,34 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>webbeans-parent</artifactId>
- <groupId>org.jboss.webbeans</groupId>
+ <artifactId>weld-parent</artifactId>
+ <groupId>org.jboss.weld</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-core</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <name>Web Beans Core</name>
+ <name>Weld Core</name>
<dependencies>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
+ <groupId>org.jboss.weld</groupId>
<artifactId>jsr299-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-api</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-spi</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-logging</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-logging</artifactId>
</dependency>
<dependency>
Modified: ri/trunk/inject-tck-runner/pom.xml
===================================================================
--- ri/trunk/inject-tck-runner/pom.xml 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/inject-tck-runner/pom.xml 2009-10-08 04:41:34 UTC (rev 3886)
@@ -1,26 +1,26 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>webbeans-parent</artifactId>
- <groupId>org.jboss.webbeans</groupId>
+ <artifactId>weld-parent</artifactId>
+ <groupId>org.jboss.weld</groupId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-inject-tck-runner</artifactId>
- <name>javax.inject TCK runner for Web Beans</name>
- <description>Aggregates dependencies and run's the javax.inject TCK for Web Beans</description>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-inject-tck-runner</artifactId>
+ <name>javax.inject TCK runner for Weld</name>
+ <description>Aggregates dependencies and run's the javax.inject TCK for Weld</description>
<dependencies>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-core</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-porting-package</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-porting-package</artifactId>
</dependency>
<dependency>
Modified: ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/AtInjectTCK.java
===================================================================
--- ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/AtInjectTCK.java 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/AtInjectTCK.java 2009-10-08 04:41:34 UTC (rev 3886)
@@ -16,8 +16,8 @@
import org.atinject.tck.auto.V8Engine;
import org.atinject.tck.auto.accessories.Cupholder;
import org.atinject.tck.auto.accessories.SpareTire;
-import org.jboss.webbeans.mock.MockEELifecycle;
-import org.jboss.webbeans.mock.TestContainer;
+import org.jboss.weld.mock.MockEELifecycle;
+import org.jboss.weld.mock.TestContainer;
/**
* Configure the AtInject TCK for use with the 299 RI
Modified: ri/trunk/osgi-bundle/pom.xml
===================================================================
--- ri/trunk/osgi-bundle/pom.xml 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/osgi-bundle/pom.xml 2009-10-08 04:41:34 UTC (rev 3886)
@@ -19,16 +19,16 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>webbeans-parent</artifactId>
- <groupId>org.jboss.webbeans</groupId>
+ <artifactId>weld-parent</artifactId>
+ <groupId>org.jboss.weld</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-osgi-bundle</artifactId>
- <name>Web Beans OSGi Bundle</name>
- <description>Web Beans implementation packaged as an OSGi bundle</description>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-osgi-bundle</artifactId>
+ <name>Weld OSGi Bundle</name>
+ <description>Weld implementation packaged as an OSGi bundle</description>
<developers>
<developer>
@@ -59,10 +59,10 @@
<_include>-osgi.bundle</_include>
<Embed-Dependency>*; scope=compile; inline=true</Embed-Dependency>
- <_exportcontents>javax.event; javax.context; javax.webbeans; javax.decorator; javax.inject; javax.enterprise.*; version=${osgi.version},
- org.jboss.webbeans.context; org.jboss.webbeans.ejb; org.jboss.webbeans.bean; org.jboss.webbeans.bean.proxy; org.jboss.webbeans.*.api.*; org.jboss.webbeans.*.spi.*; org.jboss.webbeans.conversation; org.jboss.webbeans; org.jboss.webbeans.bootstrap; org.jboss.webbeans.introspector; org.jboss.webbeans.servlet; version=${osgi.version},
- org.jboss.webbeans.el; version=${osgi.version},
- org.jboss.webbeans.jsf; include:="WebBeansPhaseListener"; version=${osgi.version},
+ <_exportcontents>javax.event; javax.context; javax.weld; javax.decorator; javax.inject; javax.enterprise.*; version=${osgi.version},
+ org.jboss.weld.context; org.jboss.weld.ejb; org.jboss.weld.bean; org.jboss.weld.bean.proxy; org.jboss.weld.*.api.*; org.jboss.weld.*.spi.*; org.jboss.weld.conversation; org.jboss.weld; org.jboss.weld.bootstrap; org.jboss.weld.introspector; org.jboss.weld.servlet; version=${osgi.version},
+ org.jboss.weld.el; version=${osgi.version},
+ org.jboss.weld.jsf; include:="WeldPhaseListener"; version=${osgi.version},
javassist.util.proxy;version="3.8.1.GA"
</_exportcontents>
<Import-Package>javax.annotation, javax.interceptor, *;resolution:=optional</Import-Package>
@@ -93,31 +93,31 @@
</build>
<dependencies>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
+ <groupId>org.jboss.weld</groupId>
<artifactId>jsr299-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-api</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-spi</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-spi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-core</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-logging</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-logging</artifactId>
<version>${project.version}</version>
</dependency>
Modified: ri/trunk/parent/pom.xml
===================================================================
--- ri/trunk/parent/pom.xml 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/parent/pom.xml 2009-10-08 04:41:34 UTC (rev 3886)
@@ -1,22 +1,22 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-parent</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-parent</artifactId>
<packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version>
<parent>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-version-matrix</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-version-matrix</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../version-matrix</relativePath>
</parent>
- <name>Web Beans, the reference implementation of JSR-299</name>
- <url>http://www.seamframework.org/WebBeans</url>
+ <name>Weld, the reference implementation of JSR-299</name>
+ <url>http://www.seamframework.org/Weld</url>
<description>
- The reference implementation of JSR 299: Web Beans
+ The reference implementation of JSR 299: Weld
</description>
<developers>
@@ -68,7 +68,7 @@
<artifactId>maven-release-plugin</artifactId>
<version>2.0-beta-8</version>
<configuration>
- <tagBase>https://svn.jboss.org/repos/webbeans/ri/tags</tagBase>
+ <tagBase>https://svn.jboss.org/repos/weld/ri/tags</tagBase>
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
@@ -211,7 +211,7 @@
<issueManagement>
<system>JIRA</system>
- <url>http://jira.jboss.org/browse/WBRI</url>
+ <url>http://jira.jboss.org/browse/WELD</url>
</issueManagement>
<inceptionYear>2008</inceptionYear>
@@ -228,21 +228,21 @@
</licenses>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/trunk/parent</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/trunk/parent</developerConnection>
- <url>http://fisheye.jboss.org/browse/WebBeans/ri</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/ri/trunk/parent</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/ri/trunk/parent</developerConnection>
+ <url>http://fisheye.jboss.org/browse/Weld/ri</url>
</scm>
<distributionManagement>
<repository>
- <id>repository.jboss.org</id>
- <name>JBoss Releases Repository</name>
- <url>dav:https://svn.jboss.org/repos/repository.jboss.org/maven2</url>
+ <id>oss.sonatype.org</id>
+ <name>Sonatype Nexus Maven Repository</name>
+ <url>dav:https://oss.sonatype.org/content/repositories/jboss-releases/</url>
</repository>
<snapshotRepository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshot Repository</name>
- <url>dav:https://snapshots.jboss.org/maven2</url>
+ <id>oss.sonatype.org</id>
+ <name>Sonatype Nexus Snapshot Repository</name>
+ <url>dav:https://oss.sonatype.org/content/repositories/jboss-snapshots/</url>
</snapshotRepository>
</distributionManagement>
@@ -258,7 +258,7 @@
</formats>
<instrumentation>
<ignores>
- <ignore>javax.webbeans.*</ignore>
+ <ignore>javax.weld.*</ignore>
</ignores>
</instrumentation>
</configuration>
Modified: ri/trunk/pom.xml
===================================================================
--- ri/trunk/pom.xml 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/pom.xml 2009-10-08 04:41:34 UTC (rev 3886)
@@ -1,29 +1,29 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-build-aggregator</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-build-aggregator</artifactId>
<packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version>
- <name>Web Beans Build Aggregator</name>
- <url>http://www.seamframework.org/WebBeans</url>
+ <name>Weld Build Aggregator</name>
+ <url>http://www.seamframework.org/Weld</url>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/WebBeans</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/ri/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/ri/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/Weld</url>
</scm>
<distributionManagement>
<repository>
- <id>repository.jboss.org</id>
- <name>JBoss Releases Repository</name>
- <url>dav:https://svn.jboss.org/repos/repository.jboss.org/maven2</url>
+ <id>oss.sonatype.org</id>
+ <name>Sonatype Nexus Maven Repository</name>
+ <url>dav:http://oss.sonatype.org/content/repositories/jboss-releases/</url>
</repository>
<snapshotRepository>
<id>snapshots.jboss.org</id>
- <name>JBoss Snapshot Repository</name>
- <url>dav:https://snapshots.jboss.org/maven2</url>
+ <name>Sonatype Nexus Snapshot Repository</name>
+ <url>dav:http://oss.sonatype.org/content/repositories/jboss-snapshots/</url>
</snapshotRepository>
</distributionManagement>
Modified: ri/trunk/porting-package/pom.xml
===================================================================
--- ri/trunk/porting-package/pom.xml 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/porting-package/pom.xml 2009-10-08 04:41:34 UTC (rev 3886)
@@ -1,24 +1,24 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>webbeans-parent</artifactId>
- <groupId>org.jboss.webbeans</groupId>
+ <artifactId>weld-parent</artifactId>
+ <groupId>org.jboss.weld</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-porting-package</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-porting-package</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <name>Web Beans Porting Package for JSR-299 TCK</name>
+ <name>Weld Porting Package for JSR-299 TCK</name>
<dependencies>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
+ <groupId>org.jboss.weld</groupId>
<artifactId>jsr299-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-core</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
</dependency>
<dependency>
@@ -35,8 +35,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-core-test</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-test</artifactId>
</dependency>
</dependencies>
Modified: ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/BeansImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/BeansImpl.java 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/BeansImpl.java 2009-10-08 04:41:34 UTC (rev 3886)
@@ -1,7 +1,7 @@
package org.jboss.weld.tck;
import org.jboss.jsr299.tck.spi.Beans;
-import org.jboss.webbeans.util.Proxies;
+import org.jboss.weld.util.Proxies;
/**
* Implements the Beans SPI for the TCK specifically for the JBoss RI.
Modified: ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ContextsImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ContextsImpl.java 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ContextsImpl.java 2009-10-08 04:41:34 UTC (rev 3886)
@@ -1,11 +1,11 @@
package org.jboss.weld.tck;
import org.jboss.jsr299.tck.spi.Contexts;
-import org.jboss.webbeans.Container;
-import org.jboss.webbeans.context.AbstractContext;
-import org.jboss.webbeans.context.AbstractMapContext;
-import org.jboss.webbeans.context.ContextLifecycle;
-import org.jboss.webbeans.context.RequestContext;
+import org.jboss.weld.Container;
+import org.jboss.weld.context.AbstractContext;
+import org.jboss.weld.context.AbstractMapContext;
+import org.jboss.weld.context.ContextLifecycle;
+import org.jboss.weld.context.RequestContext;
public class ContextsImpl implements Contexts<AbstractContext>
{
Modified: ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ELImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ELImpl.java 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ELImpl.java 2009-10-08 04:41:34 UTC (rev 3886)
@@ -5,8 +5,8 @@
import org.jboss.jsr299.tck.api.JSR299Configuration;
import org.jboss.testharness.api.Configurable;
import org.jboss.testharness.api.Configuration;
-import org.jboss.webbeans.BeanManagerImpl;
-import org.jboss.webbeans.mock.el.EL;
+import org.jboss.weld.BeanManagerImpl;
+import org.jboss.weld.mock.el.EL;
public class ELImpl implements org.jboss.jsr299.tck.spi.EL, Configurable
{
Modified: ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ManagersImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ManagersImpl.java 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ManagersImpl.java 2009-10-08 04:41:34 UTC (rev 3886)
@@ -6,10 +6,10 @@
import org.jboss.jsr299.tck.spi.Managers;
import org.jboss.testharness.impl.runner.servlet.ServletTestRunner;
-import org.jboss.webbeans.DefinitionException;
-import org.jboss.webbeans.DeploymentException;
-import org.jboss.webbeans.mock.MockServletContext;
-import org.jboss.webbeans.servlet.ServletHelper;
+import org.jboss.weld.DefinitionException;
+import org.jboss.weld.DeploymentException;
+import org.jboss.weld.mock.MockServletContext;
+import org.jboss.weld.servlet.ServletHelper;
public class ManagersImpl implements Managers
{
Modified: ri/trunk/spi/pom.xml
===================================================================
--- ri/trunk/spi/pom.xml 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/pom.xml 2009-10-08 04:41:34 UTC (rev 3886)
@@ -1,18 +1,18 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>webbeans-parent</artifactId>
- <groupId>org.jboss.webbeans</groupId>
+ <artifactId>weld-parent</artifactId>
+ <groupId>org.jboss.weld</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-spi</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-spi</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <name>Web Beans Service Provider Interfaces</name>
+ <name>Weld Service Provider Interfaces</name>
<dependencies>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
+ <groupId>org.jboss.weld</groupId>
<artifactId>jsr299-api</artifactId>
</dependency>
Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java 2009-10-08 04:41:34 UTC (rev 3886)
@@ -1,20 +1,20 @@
package org.jboss.webbeans.bootstrap.api.test;
-import org.jboss.webbeans.bootstrap.api.Bootstrap;
-import org.jboss.webbeans.bootstrap.api.Environments;
-import org.jboss.webbeans.bootstrap.api.ServiceRegistry;
-import org.jboss.webbeans.bootstrap.api.helpers.SimpleServiceRegistry;
import org.jboss.webbeans.bootstrap.api.test.MockDeployment.MockBeanDeploymentArchive;
-import org.jboss.webbeans.bootstrap.spi.Deployment;
-import org.jboss.webbeans.ejb.spi.EjbServices;
-import org.jboss.webbeans.injection.spi.EjbInjectionServices;
-import org.jboss.webbeans.injection.spi.JpaInjectionServices;
-import org.jboss.webbeans.injection.spi.ResourceInjectionServices;
-import org.jboss.webbeans.resources.spi.ResourceLoader;
-import org.jboss.webbeans.security.spi.SecurityServices;
-import org.jboss.webbeans.servlet.api.ServletServices;
-import org.jboss.webbeans.transaction.spi.TransactionServices;
-import org.jboss.webbeans.validation.spi.ValidationServices;
+import org.jboss.weld.bootstrap.api.Bootstrap;
+import org.jboss.weld.bootstrap.api.Environments;
+import org.jboss.weld.bootstrap.api.ServiceRegistry;
+import org.jboss.weld.bootstrap.api.helpers.SimpleServiceRegistry;
+import org.jboss.weld.bootstrap.spi.Deployment;
+import org.jboss.weld.ejb.spi.EjbServices;
+import org.jboss.weld.injection.spi.EjbInjectionServices;
+import org.jboss.weld.injection.spi.JpaInjectionServices;
+import org.jboss.weld.injection.spi.ResourceInjectionServices;
+import org.jboss.weld.resources.spi.ResourceLoader;
+import org.jboss.weld.security.spi.SecurityServices;
+import org.jboss.weld.servlet.api.ServletServices;
+import org.jboss.weld.transaction.spi.TransactionServices;
+import org.jboss.weld.validation.spi.ValidationServices;
import org.testng.annotations.Test;
public class BootstrapTest
Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockBootstrap.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockBootstrap.java 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockBootstrap.java 2009-10-08 04:41:34 UTC (rev 3886)
@@ -2,14 +2,14 @@
import java.util.Set;
-import org.jboss.webbeans.bootstrap.api.Bootstrap;
-import org.jboss.webbeans.bootstrap.api.Environment;
-import org.jboss.webbeans.bootstrap.api.Service;
-import org.jboss.webbeans.bootstrap.api.ServiceRegistry;
-import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.webbeans.bootstrap.spi.Deployment;
-import org.jboss.webbeans.context.api.BeanStore;
-import org.jboss.webbeans.manager.api.WebBeansManager;
+import org.jboss.weld.bootstrap.api.Bootstrap;
+import org.jboss.weld.bootstrap.api.Environment;
+import org.jboss.weld.bootstrap.api.Service;
+import org.jboss.weld.bootstrap.api.ServiceRegistry;
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.weld.bootstrap.spi.Deployment;
+import org.jboss.weld.context.api.BeanStore;
+import org.jboss.weld.manager.api.WebBeansManager;
public class MockBootstrap implements Bootstrap
{
Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockDeployment.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockDeployment.java 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockDeployment.java 2009-10-08 04:41:34 UTC (rev 3886)
@@ -21,10 +21,10 @@
import java.util.Collections;
import java.util.List;
-import org.jboss.webbeans.bootstrap.api.ServiceRegistry;
-import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.webbeans.bootstrap.spi.Deployment;
-import org.jboss.webbeans.ejb.spi.EjbDescriptor;
+import org.jboss.weld.bootstrap.api.ServiceRegistry;
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.weld.bootstrap.spi.Deployment;
+import org.jboss.weld.ejb.spi.EjbDescriptor;
/**
* @author pmuir
Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbInjectionServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbInjectionServices.java 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbInjectionServices.java 2009-10-08 04:41:34 UTC (rev 3886)
@@ -18,7 +18,7 @@
import javax.enterprise.inject.spi.InjectionPoint;
-import org.jboss.webbeans.injection.spi.EjbInjectionServices;
+import org.jboss.weld.injection.spi.EjbInjectionServices;
/**
* @author pmuir
Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbServices.java 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbServices.java 2009-10-08 04:41:34 UTC (rev 3886)
@@ -2,10 +2,10 @@
import javax.enterprise.inject.spi.InjectionPoint;
-import org.jboss.webbeans.ejb.api.SessionObjectReference;
-import org.jboss.webbeans.ejb.spi.EjbDescriptor;
-import org.jboss.webbeans.ejb.spi.EjbServices;
-import org.jboss.webbeans.ejb.spi.InterceptorBindings;
+import org.jboss.weld.ejb.api.SessionObjectReference;
+import org.jboss.weld.ejb.spi.EjbDescriptor;
+import org.jboss.weld.ejb.spi.EjbServices;
+import org.jboss.weld.ejb.spi.InterceptorBindings;
public class MockEjbServices extends MockService implements EjbServices
{
Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJpaServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJpaServices.java 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJpaServices.java 2009-10-08 04:41:34 UTC (rev 3886)
@@ -6,7 +6,7 @@
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
-import org.jboss.webbeans.injection.spi.JpaInjectionServices;
+import org.jboss.weld.injection.spi.JpaInjectionServices;
public class MockJpaServices extends MockService implements JpaInjectionServices
{
Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceLoader.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceLoader.java 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceLoader.java 2009-10-08 04:41:34 UTC (rev 3886)
@@ -3,7 +3,7 @@
import java.net.URL;
import java.util.Collection;
-import org.jboss.webbeans.resources.spi.ResourceLoader;
+import org.jboss.weld.resources.spi.ResourceLoader;
public class MockResourceLoader extends MockService implements ResourceLoader
{
Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceServices.java 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceServices.java 2009-10-08 04:41:34 UTC (rev 3886)
@@ -2,7 +2,7 @@
import javax.enterprise.inject.spi.InjectionPoint;
-import org.jboss.webbeans.injection.spi.ResourceInjectionServices;
+import org.jboss.weld.injection.spi.ResourceInjectionServices;
public class MockResourceServices extends MockService implements ResourceInjectionServices
{
Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockSecurityServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockSecurityServices.java 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockSecurityServices.java 2009-10-08 04:41:34 UTC (rev 3886)
@@ -18,7 +18,7 @@
import java.security.Principal;
-import org.jboss.webbeans.security.spi.SecurityServices;
+import org.jboss.weld.security.spi.SecurityServices;
/**
* @author pmuir
Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockService.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockService.java 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockService.java 2009-10-08 04:41:34 UTC (rev 3886)
@@ -16,7 +16,7 @@
*/
package org.jboss.webbeans.bootstrap.api.test;
-import org.jboss.webbeans.bootstrap.api.Service;
+import org.jboss.weld.bootstrap.api.Service;
/**
* @author pmuir
Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockServletServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockServletServices.java 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockServletServices.java 2009-10-08 04:41:34 UTC (rev 3886)
@@ -18,8 +18,8 @@
import javax.servlet.ServletContext;
-import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.webbeans.servlet.api.ServletServices;
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.weld.servlet.api.ServletServices;
/**
* @author pmuir
Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockTransactionServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockTransactionServices.java 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockTransactionServices.java 2009-10-08 04:41:34 UTC (rev 3886)
@@ -3,7 +3,7 @@
import javax.transaction.Synchronization;
import javax.transaction.UserTransaction;
-import org.jboss.webbeans.transaction.spi.TransactionServices;
+import org.jboss.weld.transaction.spi.TransactionServices;
public class MockTransactionServices extends MockService implements TransactionServices
{
Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockValidationServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockValidationServices.java 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockValidationServices.java 2009-10-08 04:41:34 UTC (rev 3886)
@@ -18,7 +18,7 @@
import javax.validation.ValidatorFactory;
-import org.jboss.webbeans.validation.spi.ValidationServices;
+import org.jboss.weld.validation.spi.ValidationServices;
/**
* @author pmuir
Modified: ri/trunk/tests/pom.xml
===================================================================
--- ri/trunk/tests/pom.xml 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/tests/pom.xml 2009-10-08 04:41:34 UTC (rev 3886)
@@ -1,14 +1,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>webbeans-parent</artifactId>
- <groupId>org.jboss.webbeans</groupId>
+ <artifactId>weld-parent</artifactId>
+ <groupId>org.jboss.weld</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-core-test</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-test</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <name>Web Beans Core Tests</name>
+ <name>Weld Core Tests</name>
<dependencies>
<dependency>
@@ -50,13 +50,13 @@
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-core</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-spi</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-spi</artifactId>
</dependency>
<dependency>
Modified: ri/trunk/version-matrix/pom.xml
===================================================================
--- ri/trunk/version-matrix/pom.xml 2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/version-matrix/pom.xml 2009-10-08 04:41:34 UTC (rev 3886)
@@ -1,15 +1,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-version-matrix</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-version-matrix</artifactId>
<packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version>
- <name>Web Beans Version Matrix</name>
- <url>http://www.seamframework.org/WebBeans</url>
+ <name>Weld Version Matrix</name>
+ <url>http://www.seamframework.org/Weld</url>
<description>
- A version matrix for a Web Beans projects
+ A version matrix for Weld projects
</description>
<repositories>
@@ -36,6 +36,17 @@
<updatePolicy>never</updatePolicy>
</snapshots>
</repository>
+ <repository>
+ <id>oss.sonatype.org</id>
+ <name>Sonatype Nexus Snapshots Repository</name>
+ <url>http://oss.sonatype.org/content/repositories/jboss-snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
<pluginRepositories>
@@ -48,10 +59,10 @@
<properties>
<jsr299.tck.version>1.0.0-SNAPSHOT</jsr299.tck.version>
- <webbeans.version>1.0.0-SNAPSHOT</webbeans.version>
- <webbeans.servlet.version>1.0.0-SNAPSHOT</webbeans.servlet.version>
- <webbeans.se.version>1.0.0-SNAPSHOT</webbeans.se.version>
- <webbeans.wicket.version>1.0.0-SNAPSHOT</webbeans.wicket.version>
+ <weld.version>1.0.0-SNAPSHOT</weld.version>
+ <weld.servlet.version>1.0.0-SNAPSHOT</weld.servlet.version>
+ <weld.se.version>1.0.0-SNAPSHOT</weld.se.version>
+ <weld.wicket.version>1.0.0-SNAPSHOT</weld.wicket.version>
<jboss.test.harness.version>1.0.0-SNAPSHOT</jboss.test.harness.version>
<jetty.version>6.1.21</jetty.version>
<wicket.version>1.4.1</wicket.version>
@@ -294,69 +305,69 @@
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
+ <groupId>org.jboss.weld</groupId>
<artifactId>jsr299-api</artifactId>
- <version>${webbeans.version}</version>
+ <version>${weld.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-api</artifactId>
- <version>${webbeans.version}</version>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-api</artifactId>
+ <version>${weld.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-core</artifactId>
- <version>${webbeans.version}</version>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ <version>${weld.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-spi</artifactId>
- <version>${webbeans.version}</version>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-spi</artifactId>
+ <version>${weld.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-porting-package</artifactId>
- <version>${webbeans.version}</version>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-porting-package</artifactId>
+ <version>${weld.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-logging</artifactId>
- <version>${webbeans.version}</version>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-logging</artifactId>
+ <version>${weld.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-core-test</artifactId>
- <version>${webbeans.version}</version>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-test</artifactId>
+ <version>${weld.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-se</artifactId>
- <version>${webbeans.se.version}</version>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-se</artifactId>
+ <version>${weld.se.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans.servlet</groupId>
- <artifactId>webbeans-servlet-int</artifactId>
- <version>${webbeans.servlet.version}</version>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet-int</artifactId>
+ <version>${weld.servlet.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans.servlet</groupId>
- <artifactId>webbeans-servlet</artifactId>
- <version>${webbeans.servlet.version}</version>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet</artifactId>
+ <version>${weld.servlet.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-wicket</artifactId>
- <version>${webbeans.wicket.version}</version>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-wicket</artifactId>
+ <version>${weld.wicket.version}</version>
</dependency>
<dependency>
@@ -621,21 +632,21 @@
<distributionManagement>
<repository>
- <id>repository.jboss.org</id>
- <name>JBoss Releases Repository</name>
- <url>dav:https://svn.jboss.org/repos/repository.jboss.org/maven2</url>
+ <id>oss.sonatype.org</id>
+ <name>Sonatype Nexus Releases Repository</name>
+ <url>dav:http://oss.sonatype.org/content/repositories/jboss-releases/</url>
</repository>
<snapshotRepository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshot Repository</name>
- <url>dav:https://snapshots.jboss.org/maven2</url>
+ <id>oss.sonatype.org</id>
+ <name>Sonatype Nexus Snapshots Repository</name>
+ <url>dav:https://oss.sonatype.org/content/repositories/jboss-snapshots/</url>
</snapshotRepository>
</distributionManagement>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/trunk/version-matrix</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/trunk/version-matrix</developerConnection>
- <url>http://fisheye.jboss.org/browse/WebBeans/ri</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/ri/trunk/version-matrix</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/ri/trunk/version-matrix</developerConnection>
+ <url>http://fisheye.jboss.org/browse/Weld/ri</url>
</scm>
</project>
14 years, 7 months
- 1
- 0
Weld SVN: r3885 - in ri/trunk/jboss-tck-runner: src/main/resources/META-INF and 1 other directories.
by weld-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-10-08 00:30:52 -0400 (Thu, 08 Oct 2009)
New Revision: 3885
Added:
ri/trunk/jboss-tck-runner/src/test/java/org/jboss/weld/tck/jbossas/WeldProfileServiceDeploymentExceptionTransformer.java
Removed:
ri/trunk/jboss-tck-runner/src/test/java/org/jboss/weld/tck/jbossas/WebBeansProfileServiceDeploymentExceptionTransformer.java
Modified:
ri/trunk/jboss-tck-runner/pom.xml
ri/trunk/jboss-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties
Log:
class name changes
Modified: ri/trunk/jboss-tck-runner/pom.xml
===================================================================
--- ri/trunk/jboss-tck-runner/pom.xml 2009-10-08 04:21:46 UTC (rev 3884)
+++ ri/trunk/jboss-tck-runner/pom.xml 2009-10-08 04:30:52 UTC (rev 3885)
@@ -1,31 +1,31 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>webbeans-parent</artifactId>
- <groupId>org.jboss.webbeans</groupId>
+ <artifactId>weld-parent</artifactId>
+ <groupId>org.jboss.weld</groupId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-jboss-tck-runner</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-jboss-tck-runner</artifactId>
<name>JSR-299 TCK runner for JBoss AS</name>
<description>Aggregates dependencies and run's the JSR-299 TCK on JBoss AS</description>
<dependencies>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
+ <groupId>org.jboss.weld</groupId>
<artifactId>jsr299-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-core</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-porting-package</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-porting-package</artifactId>
</dependency>
<dependency>
@@ -65,14 +65,14 @@
<overWrite>true</overWrite>
</artifactItem>
<artifactItem>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-porting-package</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-porting-package</artifactId>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-core-test</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-test</artifactId>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
Modified: ri/trunk/jboss-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties
===================================================================
--- ri/trunk/jboss-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties 2009-10-08 04:21:46 UTC (rev 3884)
+++ ri/trunk/jboss-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties 2009-10-08 04:30:52 UTC (rev 3885)
@@ -1,2 +1,2 @@
org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher
-org.jboss.testharness.container.deploymentExceptionTransformer=org.jboss.webbeans.tck.jbossas.WebBeansProfileServiceDeploymentExceptionTransformer
+org.jboss.testharness.container.deploymentExceptionTransformer=org.jboss.weld.tck.jbossas.WeldProfileServiceDeploymentExceptionTransformer
Deleted: ri/trunk/jboss-tck-runner/src/test/java/org/jboss/weld/tck/jbossas/WebBeansProfileServiceDeploymentExceptionTransformer.java
===================================================================
--- ri/trunk/jboss-tck-runner/src/test/java/org/jboss/weld/tck/jbossas/WebBeansProfileServiceDeploymentExceptionTransformer.java 2009-10-08 04:21:46 UTC (rev 3884)
+++ ri/trunk/jboss-tck-runner/src/test/java/org/jboss/weld/tck/jbossas/WebBeansProfileServiceDeploymentExceptionTransformer.java 2009-10-08 04:30:52 UTC (rev 3885)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.weld.tck.jbossas;
-
-import java.util.Map.Entry;
-
-import org.jboss.deployers.client.spi.IncompleteDeploymentException;
-import org.jboss.testharness.api.DeploymentException;
-import org.jboss.testharness.api.DeploymentExceptionTransformer;
-
-/**
- * An implementation which can transform deployment exceptions from JBoss AS
- * reported via the Profile Service.
- *
- * Please note that if the deployment fails for a secondary reason, such as a NullPointerException in the init() method
- * of a filter, to provide an example, then this translator will not be made aware of the bootstrap exception.
- *
- * @author Pete Muir
- */
-public class WebBeansProfileServiceDeploymentExceptionTransformer implements DeploymentExceptionTransformer
-{
-
- public DeploymentException transform(DeploymentException exception)
- {
- Throwable failure = exception.getCause().getCause();
- if (failure instanceof IncompleteDeploymentException)
- {
- IncompleteDeploymentException incompleteDeploymentException = (IncompleteDeploymentException) failure;
- for (Entry<String, Throwable> entry : incompleteDeploymentException.getIncompleteDeployments().getContextsInError().entrySet())
- {
- if (entry.getKey().endsWith(exception.getName() + "/_WebBeansBootstrapBean"))
- {
- return new DeploymentException(exception, entry.getValue());
- }
- }
- }
- return exception;
- }
-
-}
Copied: ri/trunk/jboss-tck-runner/src/test/java/org/jboss/weld/tck/jbossas/WeldProfileServiceDeploymentExceptionTransformer.java (from rev 3884, ri/trunk/jboss-tck-runner/src/test/java/org/jboss/weld/tck/jbossas/WebBeansProfileServiceDeploymentExceptionTransformer.java)
===================================================================
--- ri/trunk/jboss-tck-runner/src/test/java/org/jboss/weld/tck/jbossas/WeldProfileServiceDeploymentExceptionTransformer.java (rev 0)
+++ ri/trunk/jboss-tck-runner/src/test/java/org/jboss/weld/tck/jbossas/WeldProfileServiceDeploymentExceptionTransformer.java 2009-10-08 04:30:52 UTC (rev 3885)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.tck.jbossas;
+
+import java.util.Map.Entry;
+
+import org.jboss.deployers.client.spi.IncompleteDeploymentException;
+import org.jboss.testharness.api.DeploymentException;
+import org.jboss.testharness.api.DeploymentExceptionTransformer;
+
+/**
+ * An implementation which can transform deployment exceptions from JBoss AS
+ * reported via the Profile Service.
+ *
+ * Please note that if the deployment fails for a secondary reason, such as a NullPointerException in the init() method
+ * of a filter, to provide an example, then this translator will not be made aware of the bootstrap exception.
+ *
+ * @author Pete Muir
+ */
+public class WeldProfileServiceDeploymentExceptionTransformer implements DeploymentExceptionTransformer
+{
+
+ public DeploymentException transform(DeploymentException exception)
+ {
+ Throwable failure = exception.getCause().getCause();
+ if (failure instanceof IncompleteDeploymentException)
+ {
+ IncompleteDeploymentException incompleteDeploymentException = (IncompleteDeploymentException) failure;
+ for (Entry<String, Throwable> entry : incompleteDeploymentException.getIncompleteDeployments().getContextsInError().entrySet())
+ {
+ if (entry.getKey().endsWith(exception.getName() + "/_WeldBootstrapBean"))
+ {
+ return new DeploymentException(exception, entry.getValue());
+ }
+ }
+ }
+ return exception;
+ }
+
+}
14 years, 7 months
- 1
- 0
Weld SVN: r3884 - in ri/trunk/jboss-tck-runner/src/test/java/org/jboss: weld and 2 other directories.
by weld-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-10-08 00:21:46 -0400 (Thu, 08 Oct 2009)
New Revision: 3884
Added:
ri/trunk/jboss-tck-runner/src/test/java/org/jboss/weld/
ri/trunk/jboss-tck-runner/src/test/java/org/jboss/weld/tck/
ri/trunk/jboss-tck-runner/src/test/java/org/jboss/weld/tck/jbossas/
Removed:
ri/trunk/jboss-tck-runner/src/test/java/org/jboss/webbeans/
Modified:
ri/trunk/jboss-tck-runner/src/test/java/org/jboss/weld/tck/jbossas/WebBeansProfileServiceDeploymentExceptionTransformer.java
Log:
refactored jboss-tck-runner packages
Copied: ri/trunk/jboss-tck-runner/src/test/java/org/jboss/weld/tck/jbossas (from rev 3872, ri/trunk/jboss-tck-runner/src/test/java/org/jboss/webbeans/tck/jbossas)
Modified: ri/trunk/jboss-tck-runner/src/test/java/org/jboss/weld/tck/jbossas/WebBeansProfileServiceDeploymentExceptionTransformer.java
===================================================================
--- ri/trunk/jboss-tck-runner/src/test/java/org/jboss/webbeans/tck/jbossas/WebBeansProfileServiceDeploymentExceptionTransformer.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/jboss-tck-runner/src/test/java/org/jboss/weld/tck/jbossas/WebBeansProfileServiceDeploymentExceptionTransformer.java 2009-10-08 04:21:46 UTC (rev 3884)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.tck.jbossas;
+package org.jboss.weld.tck.jbossas;
import java.util.Map.Entry;
14 years, 7 months
- 1
- 0
Weld SVN: r3883 - in ri/trunk/tests/src/test/java/org/jboss: weld and 49 other directories.
by weld-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-10-08 00:13:04 -0400 (Thu, 08 Oct 2009)
New Revision: 3883
Added:
ri/trunk/tests/src/test/java/org/jboss/weld/
ri/trunk/tests/src/test/java/org/jboss/weld/test/
ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Cow.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Dummy.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Field.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Fox.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/NightTime.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Tame.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Bean.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Child.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/DeclaringTypeTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/ExampleTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Parent.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/Bar.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/CheckableInjectionServices.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/DiscoverFailsBootstrapTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/Foo.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/InjectionServicesTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/WBStartupTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleSimple/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/NewEnterpriseBeanTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBean.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBeanLocal.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/BowlerHatException.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/EnterpriseBeanTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Fedora.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/FedoraImpl.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Hat.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/HatRemote.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Foo.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/NormalScopedBean.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/SimpleEventTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Updated.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/newsimple/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/Foo.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/ProxyTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Bar.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Baz.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Foo.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooBase.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooProducer.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupFoo.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupInstanceTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Special.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Wbri256Test.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri293/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/security/
Removed:
ri/trunk/tests/src/test/java/org/jboss/webbeans/
Modified:
ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/ExampleTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/Game.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/Generator.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/MockExampleTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/MockSentenceTranslator.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/Random.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/SentenceParser.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/SentenceTranslator.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/TextTranslator.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/Translator.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/BeanWithInjection.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/MyBean.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SameBeanTypeInChildActivityTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SpecialBindingType.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Cow.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Donkey.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Dummy.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Dusk.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/ELCurrentActivityTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/EventCurrentActivityTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Field.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Horse.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InactiveScopeTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InjectedManagerCurrentActivityTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InstanceCurrentActivityTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/JndiManagerCurrentActivityTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/NightTime.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/NonNormalScope.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/NonNormalScopeTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Tame.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/AnnotatedTypeDecoratorTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/Foo.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotated.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedCallable.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedConstructor.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedField.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedMember.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedMethod.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedParameter.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedType.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/NotAnnotated.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/BootstrapTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Elephant.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/ElephantLocal.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Hound.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/HoundLocal.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Panther.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/PantherLocal.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Synchronous.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Tame.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Tiger.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/TigerLocal.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Animal.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/BootstrapTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Elephant.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/ElephantLocal.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Hound.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/HoundLocal.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Panther.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/PantherLocal.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Salmon.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/ScottishFish.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/SeaBass.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Sole.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Synchronous.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Tame.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Tiger.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/TigerLocal.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Tuna.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Whitefish.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Animal.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/BootstrapTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Salmon.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/ScottishFish.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/SeaBass.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Sole.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Tuna.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Whitefish.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/BootstrapTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/Hound.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/HoundLocal.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/Tame.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Animal.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/BootstrapTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/DeadlyAnimal.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/DeadlySpider.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/DefangedTarantula.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Spider.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Tame.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Tarantula.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/TarantulaProducer.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleSimple/BootstrapTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleSimple/Tuna.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/Fodder.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/Foo.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/Horse.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/NaiveClusterTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/Stable.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/SwitchableContainerTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ApplicationScopedTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ApplictionScopedObject.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ContextTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ParameterizedTypeScoped.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ParameterizedTypeScopedTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/PassivatingContextTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/StringHolder.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleBean.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleBeanImpl.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator1.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator2.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecoratorTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/Animal.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/AnimalOrderStereotype.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/AnimalStereotype.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/Beer.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/BeerProducer.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/ELResolverTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/Order.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/RequestScopedAnimalStereotype.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/StereotypesTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/AccessibleManagerResolutionTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Cat.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Chicken.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Cow.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Horse.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Pig.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Animal.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/DeadlyAnimal.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/DeadlySpider.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/DefangedTarantula.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Hound.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/HoundLocal.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Salmon.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/ScottishFish.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/SeaBass.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/ServletEnvironmentTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/ServletLifecycleTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Sole.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Spider.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Tame.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Tarantula.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/TarantulaProducer.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Tuna.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Whitefish.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Animal.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Antelope.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Order.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Random.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/AlteStadt.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/BeanImpl.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/BeanLocal.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/DirectOrderProcessor.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/FrankfurtAmMain.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/GeschichtslosStadt.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Giessen.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/GrossStadt.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/GutenbergMuseum.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/IndirectOrderProcessor.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Kassel.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/KleinStadt.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/LandgraffenSchloss.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Mainz.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Marburg.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/MockCreationalContext.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/NeueStadt.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/OrderProcessor.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/OrderProcessorLocal.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/RoemerPassage.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Schloss.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/SchoeneStadt.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/UniStadt.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/AbstractHtmlUnitTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/Foo.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/TxEventTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/Updated.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/ExceptionHandlingTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/FooException.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/Large.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/Lorry_Broken.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/Ship.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/ShipProducer_Broken.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named/Important.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named/NamedBeanWithBinding.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named/NamedBeanWithBindingTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/newsimple/NewSimpleBeanTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/newsimple/WrappedSimpleBean.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/IntegerCollectionInjection.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ListInstance.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ListStringInstance.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedCollectionInjection.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedListInjection.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedProducer.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedProducerTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/Target.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Car.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/CarFactory.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/DisposalMethodOnOtherBeanNotResolvedTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Foo.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/FooDisposer.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/FooProducer.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Government.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Important.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/IntInjection.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/ManagerProducer.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/ManagerProducerTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducer.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducerTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducerWithBinding.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducerWithBindingTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NullProducerTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise/EnterpriseBeanProxyTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise/Mouse.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise/MouseLocal.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Ball.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/BallImpl.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Defender.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/EnterpriseBeanInterceptionTests.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Goalkeeper.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Pass.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Shot.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Ball.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Defender.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Ejb3InterceptionModelTests.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Goalkeeper.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/PrimaryInterceptionBinding.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SecondaryInterceptionBinding.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleBean.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleBeanImpl.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleBeanWithStereotype.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleDecorator.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptor.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptorStereotype.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptorTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/TwoBindingsInterceptor.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Bar.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/CircularDependencyTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/DependentLooping.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/DependentLoopingProducer.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/DependentSelfConsumingDependentProducer.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Farm.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Fish.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Foo.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/NormalLooping.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/NormalLoopingProducer.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/SelfConsumingDependent.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Violation.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Water.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/AbstractFactory.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/DummyParent.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/IntFactory.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/IntegerFactory.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/SomeBean.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/Wbri279Test.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri293/ContextualReferenceTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri293/Sheep.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/Cat.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/CatLocal.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/EjbDescriptorLookupTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/Foo.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/ManagerTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/ExampleTest.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/External.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/Random.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/WebBean.java
ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/security/SecurityTest.java
Log:
refactored test packages
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/examples (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/ExampleTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/ExampleTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/ExampleTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,7 +1,7 @@
-package org.jboss.webbeans.test.examples;
+package org.jboss.weld.test.examples;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/Game.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Game.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/Game.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.examples;
+package org.jboss.weld.test.examples;
import javax.inject.Inject;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/Generator.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Generator.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/Generator.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.examples;
+package org.jboss.weld.test.examples;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/MockExampleTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/MockExampleTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/MockExampleTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,8 +1,8 @@
-package org.jboss.webbeans.test.examples;
+package org.jboss.weld.test.examples;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/MockSentenceTranslator.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/MockSentenceTranslator.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/MockSentenceTranslator.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.examples;
+package org.jboss.weld.test.examples;
import javax.enterprise.inject.Alternative;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/Random.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Random.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/Random.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.examples;
+package org.jboss.weld.test.examples;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/SentenceParser.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/SentenceParser.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/SentenceParser.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.examples;
+package org.jboss.weld.test.examples;
import java.util.Arrays;
import java.util.List;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/SentenceTranslator.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/SentenceTranslator.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/SentenceTranslator.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.examples;
+package org.jboss.weld.test.examples;
public class SentenceTranslator implements Translator {
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/TextTranslator.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/TextTranslator.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/TextTranslator.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.examples;
+package org.jboss.weld.test.examples;
import javax.inject.Inject;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/Translator.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/examples/Translator.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/examples/Translator.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.examples;
+package org.jboss.weld.test.examples;
import javax.ejb.Local;
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/ActivitiesTest.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,301 @@
+package org.jboss.weld.test.unit.activities;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Member;
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.context.Dependent;
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.context.spi.Contextual;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.UnsatisfiedResolutionException;
+import javax.enterprise.inject.spi.Annotated;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionPoint;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.bean.ForwardingBean;
+import org.jboss.weld.literal.DefaultLiteral;
+import org.jboss.weld.test.AbstractWebBeansTest;
+import org.testng.annotations.Test;
+
+
+/**
+ *
+ * Spec version: 20090519
+ *
+ */
+@Artifact
+public class ActivitiesTest extends AbstractWebBeansTest
+{
+
+ private static final Set<Annotation> DEFAULT_BINDINGS = new HashSet<Annotation>();
+
+ static
+ {
+ DEFAULT_BINDINGS.add(new DefaultLiteral());
+ }
+
+ private Bean<?> createDummyBean(BeanManager beanManager, final Type injectionPointType)
+ {
+ final Set<InjectionPoint> injectionPoints = new HashSet<InjectionPoint>();
+ final Set<Type> types = new HashSet<Type>();
+ final Set<Annotation> bindings = new HashSet<Annotation>();
+ bindings.add(new AnnotationLiteral<Tame>() {});
+ types.add(Object.class);
+ final Bean<?> bean = new Bean<Object>()
+ {
+
+ public Set<Annotation> getQualifiers()
+ {
+ return bindings;
+ }
+
+ public Set<InjectionPoint> getInjectionPoints()
+ {
+ return injectionPoints;
+ }
+
+ public String getName()
+ {
+ return null;
+ }
+
+ public Class<? extends Annotation> getScope()
+ {
+ return Dependent.class;
+ }
+
+ public Set<Type> getTypes()
+ {
+ return types;
+ }
+
+ public boolean isNullable()
+ {
+ return false;
+ }
+
+ public Object create(CreationalContext<Object> creationalContext)
+ {
+ return null;
+ }
+
+ public void destroy(Object instance, CreationalContext<Object> creationalContext)
+ {
+
+ }
+
+ public Class<?> getBeanClass()
+ {
+ return Object.class;
+ }
+
+ public boolean isAlternative()
+ {
+ return false;
+ }
+
+ public Set<Class<? extends Annotation>> getStereotypes()
+ {
+ return Collections.emptySet();
+ }
+
+ };
+ InjectionPoint injectionPoint = new InjectionPoint()
+ {
+
+ public Bean<?> getBean()
+ {
+ return bean;
+ }
+
+ public Set<Annotation> getQualifiers()
+ {
+ return DEFAULT_BINDINGS;
+ }
+
+ public Member getMember()
+ {
+ return null;
+ }
+
+ public Type getType()
+ {
+ return injectionPointType;
+ }
+
+ public Annotated getAnnotated()
+ {
+ return null;
+ }
+
+ public boolean isDelegate()
+ {
+ return false;
+ }
+
+ public boolean isTransient()
+ {
+ return false;
+ }
+
+ };
+ injectionPoints.add(injectionPoint);
+ return bean;
+ }
+
+ private static class DummyContext implements Context
+ {
+
+ public <T> T get(Contextual<T> contextual)
+ {
+ return null;
+ }
+
+ public <T> T get(Contextual<T> contextual, CreationalContext<T> creationalContext)
+ {
+ return null;
+ }
+
+ public Class<? extends Annotation> getScope()
+ {
+ return Dummy.class;
+ }
+
+ public boolean isActive()
+ {
+ return false;
+ }
+
+ }
+
+ @Test
+ public void testBeanBelongingToParentActivityBelongsToChildActivity()
+ {
+ assert getBeans(Cow.class).size() == 1;
+ Contextual<?> bean = getBeans(Cow.class).iterator().next();
+ BeanManager childActivity = getCurrentManager().createActivity();
+ assert childActivity.getBeans(Cow.class).size() == 1;
+ assert childActivity.getBeans(Cow.class).iterator().next().equals(bean);
+ }
+
+ @Test
+ public void testBeanBelongingToParentActivityCanBeInjectedIntoChildActivityBean()
+ {
+ assert getBeans(Cow.class).size() == 1;
+ Contextual<?> bean = getBeans(Cow.class).iterator().next();
+ BeanManager childActivity = getCurrentManager().createActivity();
+ Bean<?> dummyBean = createDummyBean(childActivity, Cow.class);
+ childActivity.addBean(dummyBean);
+ assert childActivity.getInjectableReference(dummyBean.getInjectionPoints().iterator().next(), childActivity.createCreationalContext(dummyBean)) != null;
+ }
+
+// @Test
+// public void testObserverBelongingToParentActivityBelongsToChildActivity()
+// {
+// assert getCurrentManager().resolveObservers(new NightTime()).size() == 1;
+// Observer<?> observer = getCurrentManager().resolveObservers(new NightTime()).iterator().next();
+// BeanManager childActivity = getCurrentManager().createActivity();
+// assert childActivity.resolveObservers(new NightTime()).size() == 1;
+// assert childActivity.resolveObservers(new NightTime()).iterator().next().equals(observer);
+// }
+
+ @Test
+ public void testObserverBelongingToParentFiresForChildActivity()
+ {
+ Fox.setObserved(false);
+ BeanManager childActivity = getCurrentManager().createActivity();
+ childActivity.fireEvent(new NightTime());
+ assert Fox.isObserved();
+ }
+
+ @Test
+ public void testContextObjectBelongingToParentBelongsToChild()
+ {
+ Context context = new DummyContext()
+ {
+
+ @Override
+ public boolean isActive()
+ {
+ return true;
+ }
+
+ };
+ getCurrentManager().addContext(context);
+ BeanManager childActivity = getCurrentManager().createActivity();
+ assert childActivity.getContext(Dummy.class) != null;
+ }
+
+ @Test
+ public void testBeanBelongingToChildActivityCannotBeInjectedIntoParentActivityBean()
+ {
+ assert getBeans(Cow.class).size() == 1;
+ BeanManager childActivity = getCurrentManager().createActivity();
+ Bean<?> dummyBean = createDummyBean(childActivity, Cow.class);
+ childActivity.addBean(dummyBean);
+ assert getBeans(Object.class, new AnnotationLiteral<Tame>() {}).size() == 0;
+ }
+
+ @Test(expectedExceptions=UnsatisfiedResolutionException.class)
+ public void testInstanceProcessedByParentActivity()
+ {
+ Context dummyContext = new DummyContext();
+ getCurrentManager().addContext(dummyContext);
+ assert getBeans(Cow.class).size() == 1;
+ final Bean<Cow> bean = getBeans(Cow.class).iterator().next();
+ BeanManager childActivity = getCurrentManager().createActivity();
+ final Set<Annotation> bindingTypes = new HashSet<Annotation>();
+ bindingTypes.add(new AnnotationLiteral<Tame>() {});
+ childActivity.addBean(new ForwardingBean<Cow>()
+ {
+
+ @Override
+ protected Bean<Cow> delegate()
+ {
+ return bean;
+ }
+
+ @Override
+ public Set<Annotation> getQualifiers()
+ {
+ return bindingTypes;
+ }
+
+ @Override
+ public Set<Class<? extends Annotation>> getStereotypes()
+ {
+ return Collections.emptySet();
+ }
+
+ });
+ createContextualInstance(Field.class).get();
+ }
+
+ @Test
+ public void testObserverBelongingToChildDoesNotFireForParentActivity()
+ {
+
+// BeanManager childActivity = getCurrentManager().createActivity();
+// ObserverMethod<NightTime> observer = new Observer<NightTime>()
+// {
+//
+// public boolean notify(NightTime event)
+// {
+// assert false;
+// return false;
+// }
+//
+// };
+// //TODO Fix this test to use an observer method in a child activity
+//// childActivity.addObserver(observer);
+// getCurrentManager().fireEvent(new NightTime());
+ }
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Cow.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Cow.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Cow.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Cow.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,6 @@
+package org.jboss.weld.test.unit.activities;
+
+class Cow
+{
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Dummy.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Dummy.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Dummy.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Dummy.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,23 @@
+/**
+ *
+ */
+package org.jboss.weld.test.unit.activities;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Scope;
+
+@Target( { TYPE, METHOD, FIELD })
+@Retention(RUNTIME)
+@Documented
+@Scope
+@Inherited
+@interface Dummy {}
\ No newline at end of file
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Field.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Field.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Field.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Field.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,16 @@
+package org.jboss.weld.test.unit.activities;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+
+class Field
+{
+
+ @Inject @Tame Instance<Cow> instance;
+
+ public Cow get()
+ {
+ return instance.get();
+ }
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Fox.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Fox.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Fox.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Fox.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,25 @@
+package org.jboss.weld.test.unit.activities;
+
+import javax.enterprise.event.Observes;
+
+class Fox
+{
+
+ private static boolean observed = false;
+
+ public void observe(@Observes NightTime nighttime)
+ {
+ observed = true;
+ }
+
+ public static boolean isObserved()
+ {
+ return observed;
+ }
+
+ public static void setObserved(boolean observed)
+ {
+ Fox.observed = observed;
+ }
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/NightTime.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/NightTime.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/NightTime.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/NightTime.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,6 @@
+package org.jboss.weld.test.unit.activities;
+
+class NightTime
+{
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Tame.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Tame.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Tame.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Tame.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,22 @@
+package org.jboss.weld.test.unit.activities;
+
+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 static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@Qualifier
+@interface Tame
+{
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/BeanWithInjection.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/BeanWithInjection.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/BeanWithInjection.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.activities.child;
+package org.jboss.weld.test.unit.activities.child;
class BeanWithInjection
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/MyBean.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/MyBean.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/MyBean.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.activities.child;
+package org.jboss.weld.test.unit.activities.child;
@SpecialBindingType
class MyBean
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SameBeanTypeInChildActivityTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/SameBeanTypeInChildActivityTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SameBeanTypeInChildActivityTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.activities.child;
+package org.jboss.weld.test.unit.activities.child;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
@@ -15,9 +15,9 @@
import javax.enterprise.inject.spi.InjectionPoint;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.literal.DefaultLiteral;
-import org.jboss.webbeans.manager.api.WebBeansManager;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.literal.DefaultLiteral;
+import org.jboss.weld.manager.api.WebBeansManager;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
/**
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SpecialBindingType.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/SpecialBindingType.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SpecialBindingType.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.activities.child;
+package org.jboss.weld.test.unit.activities.child;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Cow.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Cow.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Cow.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.activities.current;
+package org.jboss.weld.test.unit.activities.current;
class Cow
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Donkey.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Donkey.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Donkey.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.activities.current;
+package org.jboss.weld.test.unit.activities.current;
import javax.enterprise.inject.spi.BeanManager;
import javax.naming.InitialContext;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Dummy.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Dummy.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Dummy.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,7 +1,7 @@
/**
*
*/
-package org.jboss.webbeans.test.unit.activities.current;
+package org.jboss.weld.test.unit.activities.current;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Dusk.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Dusk.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Dusk.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.activities.current;
+package org.jboss.weld.test.unit.activities.current;
import javax.enterprise.event.Event;
import javax.enterprise.inject.Any;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/ELCurrentActivityTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/ELCurrentActivityTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/ELCurrentActivityTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.activities.current;
+package org.jboss.weld.test.unit.activities.current;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
@@ -16,8 +16,8 @@
import javax.enterprise.inject.spi.InjectionPoint;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.manager.api.WebBeansManager;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.manager.api.WebBeansManager;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
/**
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/EventCurrentActivityTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/EventCurrentActivityTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/EventCurrentActivityTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.activities.current;
+package org.jboss.weld.test.unit.activities.current;
import java.lang.annotation.Annotation;
@@ -7,7 +7,7 @@
import javax.enterprise.context.spi.CreationalContext;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
/**
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Field.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Field.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Field.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.activities.current;
+package org.jboss.weld.test.unit.activities.current;
import javax.enterprise.inject.Instance;
import javax.inject.Inject;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Horse.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Horse.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Horse.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.activities.current;
+package org.jboss.weld.test.unit.activities.current;
import javax.enterprise.inject.spi.BeanManager;
import javax.inject.Inject;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InactiveScopeTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InactiveScopeTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InactiveScopeTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.activities.current;
+package org.jboss.weld.test.unit.activities.current;
import java.lang.annotation.Annotation;
@@ -8,8 +8,8 @@
import javax.enterprise.context.spi.CreationalContext;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.manager.api.WebBeansManager;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.manager.api.WebBeansManager;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
/**
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InjectedManagerCurrentActivityTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InjectedManagerCurrentActivityTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InjectedManagerCurrentActivityTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.activities.current;
+package org.jboss.weld.test.unit.activities.current;
import java.lang.annotation.Annotation;
@@ -7,8 +7,8 @@
import javax.enterprise.context.spi.CreationalContext;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.manager.api.WebBeansManager;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.manager.api.WebBeansManager;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
/**
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InstanceCurrentActivityTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InstanceCurrentActivityTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InstanceCurrentActivityTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.activities.current;
+package org.jboss.weld.test.unit.activities.current;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
@@ -16,8 +16,8 @@
import javax.enterprise.inject.spi.InjectionPoint;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.manager.api.WebBeansManager;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.manager.api.WebBeansManager;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
/**
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/JndiManagerCurrentActivityTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/JndiManagerCurrentActivityTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/JndiManagerCurrentActivityTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.activities.current;
+package org.jboss.weld.test.unit.activities.current;
import java.lang.annotation.Annotation;
@@ -8,8 +8,8 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.IntegrationTest;
-import org.jboss.webbeans.manager.api.WebBeansManager;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.manager.api.WebBeansManager;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
/**
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/NightTime.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/NightTime.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/NightTime.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.activities.current;
+package org.jboss.weld.test.unit.activities.current;
class NightTime
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/NonNormalScope.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/NonNormalScope.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/NonNormalScope.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,7 +1,7 @@
/**
*
*/
-package org.jboss.webbeans.test.unit.activities.current;
+package org.jboss.weld.test.unit.activities.current;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/NonNormalScopeTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/NonNormalScopeTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/NonNormalScopeTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.activities.current;
+package org.jboss.weld.test.unit.activities.current;
import java.lang.annotation.Annotation;
@@ -7,8 +7,8 @@
import javax.enterprise.context.spi.CreationalContext;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.manager.api.WebBeansManager;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.manager.api.WebBeansManager;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Tame.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Tame.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Tame.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.activities.current;
+package org.jboss.weld.test.unit.activities.current;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Bean.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/Bean.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Bean.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Bean.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,43 @@
+/*
+* 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.weld.test.unit.annotated;
+
+
+/**
+ *
+ * @author <a href="kabir.khan(a)jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class Bean
+{
+ int field;
+
+ public Bean(int i)
+ {
+
+ }
+
+ public void method(int i)
+ {
+
+ }
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Child.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/Child.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Child.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Child.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,6 @@
+package org.jboss.weld.test.unit.annotated;
+
+
+public class Child extends Parent
+ {
+ }
\ No newline at end of file
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/DeclaringTypeTest.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/DeclaringTypeTest.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/DeclaringTypeTest.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/DeclaringTypeTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.test.unit.annotated;
+
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.AnnotatedMethod;
+import javax.enterprise.inject.spi.AnnotatedType;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWebBeansTest;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author kkahn
+ *
+ */
+@Artifact
+public class DeclaringTypeTest extends AbstractWebBeansTest
+{
+
+ @Test
+ public void testInheritance()
+ {
+ AnnotatedType<Child> type = getCurrentManager().createAnnotatedType(Child.class);
+ assert type.getConstructors().size() == 1;
+ assert type.getFields().size() == 1;
+ for (AnnotatedField<? super Child> field : type.getFields())
+ {
+ if (field.getJavaMember().getName().equals("parent"))
+ {
+ Assert.assertEquals(Parent.class, field.getJavaMember().getDeclaringClass()); // OK
+ // -
+ // Returns
+ // Parent
+ Assert.assertEquals(Parent.class, field.getDeclaringType().getJavaClass()); // FAIL
+ // -
+ // Returns
+ // Child
+ }
+ else
+ {
+ Assert.fail("Unknown field " + field.getJavaMember());
+ }
+ }
+
+ assert type.getMethods().size() == 1;
+ for (AnnotatedMethod<? super Child> method : type.getMethods())
+ {
+ if (method.getJavaMember().getName().equals("parentMethod"))
+ {
+ Assert.assertEquals(Parent.class, method.getJavaMember().getDeclaringClass()); // OK
+ // -
+ // /Returns
+ // Parent
+ Assert.assertEquals(Parent.class, method.getDeclaringType().getJavaClass()); // FAIL
+ // -
+ // Returns
+ // Child
+ }
+ else
+ {
+ Assert.fail("Unknown method " + method.getJavaMember());
+ }
+ }
+ }
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/ExampleTest.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/ExampleTest.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/ExampleTest.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/ExampleTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,63 @@
+package org.jboss.weld.test.unit.annotated;
+
+import javax.enterprise.inject.spi.Annotated;
+import javax.enterprise.inject.spi.AnnotatedConstructor;
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.AnnotatedMethod;
+import javax.enterprise.inject.spi.AnnotatedParameter;
+import javax.enterprise.inject.spi.AnnotatedType;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWebBeansTest;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author <a href="kabir.khan(a)jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+@Artifact
+public class ExampleTest extends AbstractWebBeansTest
+{
+ @Test
+ public void testAnnotatedCallableGetParameters() throws Exception
+ {
+ AnnotatedType<Bean> type = getCurrentManager().createAnnotatedType(Bean.class);
+
+ assertNoAnnotations(type);
+
+ Assert.assertEquals(1, type.getConstructors().size());
+ for (AnnotatedConstructor<Bean> ctor : type.getConstructors())
+ {
+ assertNoAnnotations(ctor);
+
+ for (AnnotatedParameter<Bean> param : ctor.getParameters())
+ {
+ assertNoAnnotations(param);
+ }
+ }
+
+ Assert.assertEquals(1, type.getMethods().size());
+ for (AnnotatedMethod<? super Bean> method : type.getMethods())
+ {
+ assertNoAnnotations(method);
+
+ for (AnnotatedParameter<? super Bean> param : method.getParameters())
+ {
+ assertNoAnnotations(param);
+ }
+ }
+
+ Assert.assertEquals(1, type.getFields().size());
+ for (AnnotatedField<? super Bean> field : type.getFields())
+ {
+ assertNoAnnotations(field);
+ }
+ }
+
+ private void assertNoAnnotations(Annotated annotated)
+ {
+ Assert.assertEquals(0, annotated.getAnnotations().size());
+ }
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Parent.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/Parent.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Parent.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Parent.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,11 @@
+package org.jboss.weld.test.unit.annotated;
+public class Parent
+{
+ int parent;
+
+ void parentMethod()
+ {
+
+ }
+}
+
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/AnnotatedTypeDecoratorTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/AnnotatedTypeDecoratorTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/AnnotatedTypeDecoratorTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.annotated.decoration;
+package org.jboss.weld.test.unit.annotated.decoration;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
@@ -13,7 +13,7 @@
import javax.inject.Inject;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
/**
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/Foo.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/Foo.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/Foo.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.annotated.decoration;
+package org.jboss.weld.test.unit.annotated.decoration;
/**
* @author pmuir
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotated.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/MockAnnotated.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotated.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -19,7 +19,7 @@
* 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.webbeans.test.unit.annotated.decoration;
+package org.jboss.weld.test.unit.annotated.decoration;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
@@ -29,7 +29,7 @@
import javax.enterprise.inject.spi.Annotated;
import javax.inject.Inject;
-import org.jboss.webbeans.literal.InjectLiteral;
+import org.jboss.weld.literal.InjectLiteral;
/**
*
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedCallable.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/MockAnnotatedCallable.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedCallable.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -19,7 +19,7 @@
* 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.webbeans.test.unit.annotated.decoration;
+package org.jboss.weld.test.unit.annotated.decoration;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedConstructor.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/MockAnnotatedConstructor.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedConstructor.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -19,7 +19,7 @@
* 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.webbeans.test.unit.annotated.decoration;
+package org.jboss.weld.test.unit.annotated.decoration;
import java.lang.reflect.Constructor;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedField.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/MockAnnotatedField.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedField.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -19,7 +19,7 @@
* 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.webbeans.test.unit.annotated.decoration;
+package org.jboss.weld.test.unit.annotated.decoration;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedMember.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/MockAnnotatedMember.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedMember.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -19,7 +19,7 @@
* 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.webbeans.test.unit.annotated.decoration;
+package org.jboss.weld.test.unit.annotated.decoration;
import javax.enterprise.inject.spi.Annotated;
import javax.enterprise.inject.spi.AnnotatedMember;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedMethod.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/MockAnnotatedMethod.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedMethod.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -19,7 +19,7 @@
* 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.webbeans.test.unit.annotated.decoration;
+package org.jboss.weld.test.unit.annotated.decoration;
import java.lang.reflect.Method;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedParameter.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/MockAnnotatedParameter.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedParameter.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -19,7 +19,7 @@
* 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.webbeans.test.unit.annotated.decoration;
+package org.jboss.weld.test.unit.annotated.decoration;
import javax.enterprise.inject.spi.Annotated;
import javax.enterprise.inject.spi.AnnotatedCallable;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedType.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/MockAnnotatedType.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedType.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -19,7 +19,7 @@
* 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.webbeans.test.unit.annotated.decoration;
+package org.jboss.weld.test.unit.annotated.decoration;
import java.util.HashSet;
import java.util.Set;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/NotAnnotated.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/annotated/decoration/NotAnnotated.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/NotAnnotated.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -19,7 +19,7 @@
* 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.webbeans.test.unit.annotated.decoration;
+package org.jboss.weld.test.unit.annotated.decoration;
/**
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/Bar.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Bar.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/Bar.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/Bar.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.test.unit.bootstrap;
+
+/**
+ * @author pmuir
+ *
+ */
+public class Bar
+{
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/CheckableInjectionServices.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/CheckableInjectionServices.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/CheckableInjectionServices.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/CheckableInjectionServices.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,84 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.test.unit.bootstrap;
+
+import org.jboss.weld.injection.spi.InjectionContext;
+import org.jboss.weld.injection.spi.InjectionServices;
+
+/**
+ * @author pmuir
+ *
+ */
+public class CheckableInjectionServices implements InjectionServices
+{
+
+ private boolean before = false;
+ private boolean after = false;
+ private boolean injectedAfter = false;
+ private boolean injectionTargetCorrect = false;
+
+ public <T> void aroundInject(InjectionContext<T> injectionContext)
+ {
+ before = true;
+ if (injectionContext.getTarget() instanceof Foo)
+ {
+ ((Foo) injectionContext.getTarget()).message = "hi!";
+ if (injectionContext.getInjectionTarget().getInjectionPoints().size() == 1)
+ {
+ injectionTargetCorrect = injectionContext.getInjectionTarget().getInjectionPoints().iterator().next().getType().equals(Bar.class);
+ }
+ }
+ injectionContext.proceed();
+ after = true;
+ if (injectionContext.getTarget() instanceof Foo)
+ {
+ Foo foo = (Foo) injectionContext.getTarget();
+ injectedAfter = foo.getBar() instanceof Bar && foo.getMessage().equals("hi!");
+ }
+ }
+
+ public void reset()
+ {
+ before = false;
+ after = false;
+ injectedAfter = false;
+ injectionTargetCorrect = false;
+ }
+
+ public boolean isBefore()
+ {
+ return before;
+ }
+
+ public boolean isAfter()
+ {
+ return after;
+ }
+
+ public boolean isInjectedAfter()
+ {
+ return injectedAfter;
+ }
+
+ public boolean isInjectionTargetCorrect()
+ {
+ return injectionTargetCorrect;
+ }
+
+ public void cleanup() {}
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/DiscoverFailsBootstrapTest.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/DiscoverFailsBootstrapTest.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/DiscoverFailsBootstrapTest.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/DiscoverFailsBootstrapTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,19 @@
+package org.jboss.weld.test.unit.bootstrap;
+
+import org.jboss.weld.bootstrap.WebBeansBootstrap;
+import org.jboss.weld.bootstrap.api.Bootstrap;
+import org.jboss.weld.bootstrap.api.Environments;
+import org.jboss.weld.context.api.helpers.ConcurrentHashMapBeanStore;
+import org.testng.annotations.Test;
+
+public class DiscoverFailsBootstrapTest
+{
+
+ @Test(groups="bootstrap", expectedExceptions=IllegalArgumentException.class)
+ public void testDiscoverFails()
+ {
+ Bootstrap bootstrap = new WebBeansBootstrap();
+ bootstrap.startContainer(Environments.SE, null, new ConcurrentHashMapBeanStore());
+ }
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/Foo.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Foo.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/Foo.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/Foo.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.test.unit.bootstrap;
+
+import javax.inject.Inject;
+
+/**
+ * @author pmuir
+ *
+ */
+public class Foo
+{
+
+ @Inject
+ private Bar bar;
+
+ public String message;
+
+ /**
+ * @return the bar
+ */
+ public Bar getBar()
+ {
+ return bar;
+ }
+
+ /**
+ * @return the message
+ */
+ public String getMessage()
+ {
+ return message;
+ }
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/InjectionServicesTest.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/InjectionServicesTest.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/InjectionServicesTest.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/InjectionServicesTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,43 @@
+package org.jboss.weld.test.unit.bootstrap;
+
+import java.util.Arrays;
+
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+
+import org.jboss.weld.injection.spi.InjectionServices;
+import org.jboss.weld.mock.MockEELifecycle;
+import org.jboss.weld.mock.TestContainer;
+import org.testng.annotations.Test;
+
+public class InjectionServicesTest
+{
+
+ @Test
+ public void testInjectionOfTarget()
+ {
+ TestContainer container = new TestContainer(new MockEELifecycle(), Arrays.asList(Foo.class, Bar.class), null);
+ CheckableInjectionServices ijs = new CheckableInjectionServices();
+ container.getDeployment().getArchive().getServices().add(InjectionServices.class, ijs);
+ container.startContainer();
+ container.ensureRequestActive();
+
+ BeanManager manager = container.getBeanManager();
+
+ Bean<? extends Object> bean = manager.resolve(manager.getBeans(Foo.class));
+ ijs.reset();
+ Foo foo = (Foo) manager.getReference(bean, Foo.class, manager.createCreationalContext(bean));
+
+ assert ijs.isBefore();
+ assert ijs.isAfter();
+ assert ijs.isInjectedAfter();
+ assert ijs.isInjectionTargetCorrect();
+
+ assert foo.getBar() != null;
+ assert foo.getMessage().equals("hi!");
+
+
+ container.stopContainer();
+ }
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/WBStartupTest.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/WBStartupTest.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/WBStartupTest.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/WBStartupTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.test.unit.bootstrap;
+
+import java.util.Arrays;
+
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+
+import org.jboss.weld.mock.MockEELifecycle;
+import org.jboss.weld.mock.TestContainer;
+import org.testng.annotations.Test;
+
+/**
+ * @author pmuir
+ *
+ */
+public class WBStartupTest
+{
+
+ @Test
+ public void test()
+ {
+ TestContainer container = new TestContainer(new MockEELifecycle(), Arrays.asList(Foo.class, Bar.class), null);
+ container.startContainer();
+ container.ensureRequestActive();
+
+ BeanManager manager = container.getBeanManager();
+
+ Bean<? extends Object> bean = manager.resolve(manager.getBeans(Foo.class));
+ Foo foo = (Foo) manager.getReference(bean, Foo.class, manager.createCreationalContext(bean));
+
+ assert foo != null;
+ assert foo.getBar() != null;
+
+ container.stopContainer();
+ }
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/BootstrapTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/BootstrapTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/BootstrapTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterprise;
import java.util.HashMap;
import java.util.List;
@@ -9,9 +9,9 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.webbeans.bean.SessionBean;
-import org.jboss.webbeans.bean.RIBean;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.bean.RIBean;
+import org.jboss.weld.bean.SessionBean;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Elephant.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Elephant.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Elephant.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterprise;
import javax.ejb.Remove;
import javax.ejb.Stateful;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/ElephantLocal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/ElephantLocal.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/ElephantLocal.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterprise;
import javax.ejb.Local;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Hound.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Hound.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Hound.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterprise;
import javax.ejb.Remove;
import javax.ejb.Stateful;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/HoundLocal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/HoundLocal.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/HoundLocal.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterprise;
import javax.ejb.Local;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Panther.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Panther.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Panther.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterprise;
import javax.ejb.Remove;
import javax.ejb.Stateful;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/PantherLocal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/PantherLocal.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/PantherLocal.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterprise;
public interface PantherLocal
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Synchronous.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Synchronous.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Synchronous.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterprise;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Tame.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Tame.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Tame.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterprise;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Tiger.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/Tiger.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Tiger.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterprise;
import javax.ejb.Remove;
import javax.ejb.Stateful;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/TigerLocal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterprise/TigerLocal.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/TigerLocal.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterprise;
import javax.ejb.Local;
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Animal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Animal.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Animal.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
interface Animal
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/BootstrapTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/BootstrapTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/BootstrapTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
import java.util.HashMap;
import java.util.List;
@@ -9,10 +9,10 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.webbeans.bean.SessionBean;
-import org.jboss.webbeans.bean.RIBean;
-import org.jboss.webbeans.bean.ManagedBean;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.bean.ManagedBean;
+import org.jboss.weld.bean.RIBean;
+import org.jboss.weld.bean.SessionBean;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Elephant.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Elephant.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Elephant.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
import javax.ejb.Remove;
import javax.ejb.Stateful;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/ElephantLocal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/ElephantLocal.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/ElephantLocal.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
import javax.ejb.Local;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Hound.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Hound.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Hound.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
import javax.ejb.Remove;
import javax.ejb.Stateful;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/HoundLocal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/HoundLocal.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/HoundLocal.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
import javax.ejb.Local;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Panther.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Panther.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Panther.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
import javax.ejb.Remove;
import javax.ejb.Stateful;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/PantherLocal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/PantherLocal.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/PantherLocal.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
public interface PantherLocal
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Salmon.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Salmon.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Salmon.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
import javax.inject.Named;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/ScottishFish.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/ScottishFish.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/ScottishFish.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
interface ScottishFish extends Animal
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/SeaBass.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/SeaBass.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/SeaBass.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
import javax.enterprise.context.RequestScoped;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Sole.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Sole.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Sole.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
import javax.inject.Named;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Synchronous.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Synchronous.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Synchronous.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Tame.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tame.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Tame.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Tiger.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tiger.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Tiger.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
import javax.ejb.Remove;
import javax.ejb.Stateful;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/TigerLocal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/TigerLocal.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/TigerLocal.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
import javax.ejb.Local;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Tuna.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Tuna.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Tuna.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
import javax.enterprise.context.RequestScoped;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Whitefish.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleEnterpriseAndSimple/Whitefish.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Whitefish.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Animal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Animal.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Animal.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleSimple;
interface Animal
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/BootstrapTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/BootstrapTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/BootstrapTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleSimple;
import java.util.HashMap;
import java.util.List;
@@ -7,9 +7,9 @@
import javax.enterprise.inject.spi.Bean;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.bean.RIBean;
-import org.jboss.webbeans.bean.ManagedBean;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.bean.ManagedBean;
+import org.jboss.weld.bean.RIBean;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Salmon.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Salmon.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Salmon.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleSimple;
import javax.inject.Named;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/ScottishFish.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/ScottishFish.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/ScottishFish.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleSimple;
interface ScottishFish extends Animal
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/SeaBass.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/SeaBass.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/SeaBass.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleSimple;
import javax.enterprise.context.RequestScoped;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Sole.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Sole.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Sole.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleSimple;
import javax.inject.Named;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Tuna.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Tuna.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Tuna.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleSimple;
import javax.enterprise.context.RequestScoped;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Whitefish.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/multipleSimple/Whitefish.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Whitefish.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.multipleSimple;
+package org.jboss.weld.test.unit.bootstrap.multipleSimple;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/BootstrapTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/BootstrapTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/BootstrapTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.singleEnterprise;
+package org.jboss.weld.test.unit.bootstrap.singleEnterprise;
import java.util.HashMap;
import java.util.List;
@@ -9,8 +9,8 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.webbeans.bean.RIBean;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.bean.RIBean;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/Hound.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Hound.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/Hound.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.singleEnterprise;
+package org.jboss.weld.test.unit.bootstrap.singleEnterprise;
import javax.ejb.Remove;
import javax.ejb.Stateful;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/HoundLocal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/HoundLocal.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/HoundLocal.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.singleEnterprise;
+package org.jboss.weld.test.unit.bootstrap.singleEnterprise;
import javax.ejb.Local;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/Tame.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleEnterprise/Tame.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/Tame.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.singleEnterprise;
+package org.jboss.weld.test.unit.bootstrap.singleEnterprise;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Animal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/Animal.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Animal.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.singleProducerMethod;
+package org.jboss.weld.test.unit.bootstrap.singleProducerMethod;
interface Animal
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/BootstrapTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/BootstrapTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/BootstrapTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.singleProducerMethod;
+package org.jboss.weld.test.unit.bootstrap.singleProducerMethod;
import java.util.HashMap;
import java.util.List;
@@ -9,10 +9,10 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.webbeans.bean.ManagedBean;
-import org.jboss.webbeans.bean.ProducerMethod;
-import org.jboss.webbeans.bean.RIBean;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.bean.ManagedBean;
+import org.jboss.weld.bean.ProducerMethod;
+import org.jboss.weld.bean.RIBean;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/DeadlyAnimal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/DeadlyAnimal.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/DeadlyAnimal.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.singleProducerMethod;
+package org.jboss.weld.test.unit.bootstrap.singleProducerMethod;
interface DeadlyAnimal
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/DeadlySpider.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/DeadlySpider.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/DeadlySpider.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.singleProducerMethod;
+package org.jboss.weld.test.unit.bootstrap.singleProducerMethod;
interface DeadlySpider extends DeadlyAnimal
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/DefangedTarantula.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/DefangedTarantula.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/DefangedTarantula.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.singleProducerMethod;
+package org.jboss.weld.test.unit.bootstrap.singleProducerMethod;
class DefangedTarantula extends Tarantula
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Spider.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/Spider.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Spider.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.singleProducerMethod;
+package org.jboss.weld.test.unit.bootstrap.singleProducerMethod;
class Spider implements Animal
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Tame.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/Tame.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Tame.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.singleProducerMethod;
+package org.jboss.weld.test.unit.bootstrap.singleProducerMethod;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Tarantula.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/Tarantula.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Tarantula.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.singleProducerMethod;
+package org.jboss.weld.test.unit.bootstrap.singleProducerMethod;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/TarantulaProducer.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleProducerMethod/TarantulaProducer.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/TarantulaProducer.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.singleProducerMethod;
+package org.jboss.weld.test.unit.bootstrap.singleProducerMethod;
import javax.enterprise.inject.Produces;
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleSimple (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleSimple/BootstrapTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple/BootstrapTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleSimple/BootstrapTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.singleSimple;
+package org.jboss.weld.test.unit.bootstrap.singleSimple;
import java.util.HashMap;
import java.util.List;
@@ -7,8 +7,8 @@
import javax.enterprise.inject.spi.Bean;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.bean.RIBean;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.bean.RIBean;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleSimple/Tuna.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/singleSimple/Tuna.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleSimple/Tuna.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.bootstrap.singleSimple;
+package org.jboss.weld.test.unit.bootstrap.singleSimple;
import javax.enterprise.context.RequestScoped;
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/cluster)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/Fodder.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/cluster/Fodder.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/Fodder.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.cluster;
+package org.jboss.weld.test.unit.cluster;
import java.io.Serializable;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/Foo.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/cluster/Foo.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/Foo.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.cluster;
+package org.jboss.weld.test.unit.cluster;
import java.io.Serializable;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/Horse.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/cluster/Horse.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/Horse.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.cluster;
+package org.jboss.weld.test.unit.cluster;
import java.io.Serializable;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/NaiveClusterTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/cluster/NaiveClusterTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/NaiveClusterTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,13 +1,13 @@
-package org.jboss.webbeans.test.unit.cluster;
+package org.jboss.weld.test.unit.cluster;
import java.util.Arrays;
import java.util.Collection;
import javax.enterprise.inject.spi.Bean;
-import org.jboss.webbeans.BeanManagerImpl;
-import org.jboss.webbeans.mock.TestContainer;
-import org.jboss.webbeans.mock.cluster.AbstractClusterTest;
+import org.jboss.weld.BeanManagerImpl;
+import org.jboss.weld.mock.TestContainer;
+import org.jboss.weld.mock.cluster.AbstractClusterTest;
import org.testng.annotations.Test;
public class NaiveClusterTest extends AbstractClusterTest
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/Stable.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/cluster/Stable.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/Stable.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.cluster;
+package org.jboss.weld.test.unit.cluster;
import java.io.Serializable;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/SwitchableContainerTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/cluster/SwitchableContainerTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/cluster/SwitchableContainerTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,14 +1,14 @@
-package org.jboss.webbeans.test.unit.cluster;
+package org.jboss.weld.test.unit.cluster;
import java.util.Arrays;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
-import org.jboss.webbeans.bootstrap.api.SingletonProvider;
-import org.jboss.webbeans.mock.MockEELifecycle;
-import org.jboss.webbeans.mock.TestContainer;
-import org.jboss.webbeans.mock.cluster.SwitchableSingletonProvider;
+import org.jboss.weld.bootstrap.api.SingletonProvider;
+import org.jboss.weld.mock.MockEELifecycle;
+import org.jboss.weld.mock.TestContainer;
+import org.jboss.weld.mock.cluster.SwitchableSingletonProvider;
import org.testng.annotations.Test;
public class SwitchableContainerTest
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ApplicationScopedTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ApplicationScopedTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ApplicationScopedTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,9 +1,9 @@
-package org.jboss.webbeans.test.unit.context;
+package org.jboss.weld.test.unit.context;
import java.util.concurrent.CountDownLatch;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ApplictionScopedObject.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ApplictionScopedObject.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ApplictionScopedObject.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.context;
+package org.jboss.weld.test.unit.context;
import java.util.concurrent.atomic.AtomicInteger;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ContextTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ContextTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ContextTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,8 +1,8 @@
-package org.jboss.webbeans.test.unit.context;
+package org.jboss.weld.test.unit.context;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.IntegrationTest;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ParameterizedTypeScoped.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ParameterizedTypeScoped.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ParameterizedTypeScoped.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.context;
+package org.jboss.weld.test.unit.context;
import java.util.Arrays;
import java.util.List;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ParameterizedTypeScopedTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/ParameterizedTypeScopedTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ParameterizedTypeScopedTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,9 +1,9 @@
-package org.jboss.webbeans.test.unit.context;
+package org.jboss.weld.test.unit.context;
import java.util.List;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/PassivatingContextTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/PassivatingContextTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/PassivatingContextTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.context;
+package org.jboss.weld.test.unit.context;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.ConversationScoped;
@@ -6,11 +6,11 @@
import javax.enterprise.context.SessionScoped;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.metadata.cache.MetaAnnotationStore;
+import org.jboss.weld.metadata.cache.MetaAnnotationStore;
import org.testng.annotations.Test;
@Artifact
-public class PassivatingContextTest extends org.jboss.webbeans.test.AbstractWebBeansTest
+public class PassivatingContextTest extends org.jboss.weld.test.AbstractWebBeansTest
{
/**
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/StringHolder.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/context/StringHolder.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/StringHolder.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.context;
+package org.jboss.weld.test.unit.context;
import java.util.List;
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleBean.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleBean.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleBean.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -19,7 +19,7 @@
* 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.webbeans.test.unit.decorator.simple;
+package org.jboss.weld.test.unit.decorator.simple;
/**
*
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleBeanImpl.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleBeanImpl.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleBeanImpl.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -19,7 +19,7 @@
* 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.webbeans.test.unit.decorator.simple;
+package org.jboss.weld.test.unit.decorator.simple;
/**
*
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator1.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator1.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator1.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -19,7 +19,7 @@
* 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.webbeans.test.unit.decorator.simple;
+package org.jboss.weld.test.unit.decorator.simple;
import javax.decorator.Decorates;
import javax.decorator.Decorator;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator2.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator2.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator2.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -19,7 +19,7 @@
* 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.webbeans.test.unit.decorator.simple;
+package org.jboss.weld.test.unit.decorator.simple;
import javax.decorator.Decorates;
import javax.decorator.Decorator;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecoratorTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecoratorTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecoratorTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,8 +1,8 @@
-package org.jboss.webbeans.test.unit.decorator.simple;
+package org.jboss.weld.test.unit.decorator.simple;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
/**
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/Animal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Animal.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/Animal.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.definition;
+package org.jboss.weld.test.unit.definition;
interface Animal
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/AnimalOrderStereotype.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalOrderStereotype.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/AnimalOrderStereotype.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.definition;
+package org.jboss.weld.test.unit.definition;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/AnimalStereotype.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/AnimalStereotype.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/AnimalStereotype.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.definition;
+package org.jboss.weld.test.unit.definition;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/Beer.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Beer.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/Beer.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.definition;
+package org.jboss.weld.test.unit.definition;
import javax.inject.Named;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/BeerProducer.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/BeerProducer.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/BeerProducer.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.definition;
+package org.jboss.weld.test.unit.definition;
import javax.enterprise.inject.Produces;
import javax.inject.Named;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/ELResolverTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/ELResolverTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/ELResolverTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.definition;
+package org.jboss.weld.test.unit.definition;
import static org.testng.Assert.assertEquals;
@@ -6,8 +6,8 @@
import javax.el.ExpressionFactory;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.mock.el.EL;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.mock.el.EL;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
/**
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/Order.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/Order.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/Order.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.definition;
+package org.jboss.weld.test.unit.definition;
class Order
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/RequestScopedAnimalStereotype.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/RequestScopedAnimalStereotype.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/RequestScopedAnimalStereotype.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.definition;
+package org.jboss.weld.test.unit.definition;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/StereotypesTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/StereotypesTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/StereotypesTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,12 +1,12 @@
-package org.jboss.webbeans.test.unit.definition;
+package org.jboss.weld.test.unit.definition;
import javax.enterprise.context.RequestScoped;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.metadata.TypeStore;
-import org.jboss.webbeans.metadata.cache.StereotypeModel;
-import org.jboss.webbeans.resources.ClassTransformer;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.metadata.TypeStore;
+import org.jboss.weld.metadata.cache.StereotypeModel;
+import org.jboss.weld.resources.ClassTransformer;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/deployment/structure)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/AccessibleManagerResolutionTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/deployment/structure/AccessibleManagerResolutionTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/AccessibleManagerResolutionTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,22 +1,22 @@
-package org.jboss.webbeans.test.unit.deployment.structure;
+package org.jboss.weld.test.unit.deployment.structure;
import java.util.Set;
import javax.enterprise.inject.spi.Bean;
-import org.jboss.webbeans.BeanManagerImpl;
-import org.jboss.webbeans.ContextualStore;
-import org.jboss.webbeans.bean.ManagedBean;
-import org.jboss.webbeans.bean.RIBean;
-import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
-import org.jboss.webbeans.bootstrap.api.ServiceRegistry;
-import org.jboss.webbeans.bootstrap.api.helpers.SimpleServiceRegistry;
-import org.jboss.webbeans.ejb.EjbDescriptors;
-import org.jboss.webbeans.introspector.WBClass;
-import org.jboss.webbeans.introspector.jlr.WBClassImpl;
-import org.jboss.webbeans.metadata.TypeStore;
-import org.jboss.webbeans.metadata.cache.MetaAnnotationStore;
-import org.jboss.webbeans.resources.ClassTransformer;
+import org.jboss.weld.BeanManagerImpl;
+import org.jboss.weld.ContextualStore;
+import org.jboss.weld.bean.ManagedBean;
+import org.jboss.weld.bean.RIBean;
+import org.jboss.weld.bootstrap.BeanDeployerEnvironment;
+import org.jboss.weld.bootstrap.api.ServiceRegistry;
+import org.jboss.weld.bootstrap.api.helpers.SimpleServiceRegistry;
+import org.jboss.weld.ejb.EjbDescriptors;
+import org.jboss.weld.introspector.WBClass;
+import org.jboss.weld.introspector.jlr.WBClassImpl;
+import org.jboss.weld.metadata.TypeStore;
+import org.jboss.weld.metadata.cache.MetaAnnotationStore;
+import org.jboss.weld.resources.ClassTransformer;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Cat.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/deployment/structure/Cat.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Cat.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.deployment.structure;
+package org.jboss.weld.test.unit.deployment.structure;
/**
* @author pmuir
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Chicken.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/deployment/structure/Chicken.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Chicken.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.deployment.structure;
+package org.jboss.weld.test.unit.deployment.structure;
/**
* @author pmuir
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Cow.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/deployment/structure/Cow.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Cow.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.deployment.structure;
+package org.jboss.weld.test.unit.deployment.structure;
/**
* @author pmuir
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Horse.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/deployment/structure/Horse.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Horse.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.deployment.structure;
+package org.jboss.weld.test.unit.deployment.structure;
/**
* @author pmuir
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Pig.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/deployment/structure/Pig.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/Pig.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.deployment.structure;
+package org.jboss.weld.test.unit.deployment.structure;
/**
* @author pmuir
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Animal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Animal.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Animal.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.environments.servlet;
+package org.jboss.weld.test.unit.environments.servlet;
interface Animal
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/DeadlyAnimal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/DeadlyAnimal.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/DeadlyAnimal.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.environments.servlet;
+package org.jboss.weld.test.unit.environments.servlet;
interface DeadlyAnimal
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/DeadlySpider.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/DeadlySpider.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/DeadlySpider.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.environments.servlet;
+package org.jboss.weld.test.unit.environments.servlet;
interface DeadlySpider extends DeadlyAnimal
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/DefangedTarantula.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/DefangedTarantula.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/DefangedTarantula.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.environments.servlet;
+package org.jboss.weld.test.unit.environments.servlet;
class DefangedTarantula extends Tarantula
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Hound.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Hound.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Hound.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.environments.servlet;
+package org.jboss.weld.test.unit.environments.servlet;
import javax.ejb.Remove;
import javax.ejb.Stateful;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/HoundLocal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/HoundLocal.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/HoundLocal.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.environments.servlet;
+package org.jboss.weld.test.unit.environments.servlet;
import javax.ejb.Local;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Salmon.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Salmon.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Salmon.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.environments.servlet;
+package org.jboss.weld.test.unit.environments.servlet;
import javax.inject.Named;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/ScottishFish.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/ScottishFish.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/ScottishFish.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.environments.servlet;
+package org.jboss.weld.test.unit.environments.servlet;
interface ScottishFish extends Animal
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/SeaBass.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/SeaBass.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/SeaBass.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.environments.servlet;
+package org.jboss.weld.test.unit.environments.servlet;
import javax.enterprise.context.RequestScoped;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/ServletEnvironmentTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/ServletEnvironmentTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/ServletEnvironmentTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.environments.servlet;
+package org.jboss.weld.test.unit.environments.servlet;
import java.util.Arrays;
import java.util.HashMap;
@@ -8,11 +8,11 @@
import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.Bean;
-import org.jboss.webbeans.BeanManagerImpl;
-import org.jboss.webbeans.bean.ManagedBean;
-import org.jboss.webbeans.bean.RIBean;
-import org.jboss.webbeans.mock.MockServletLifecycle;
-import org.jboss.webbeans.mock.TestContainer;
+import org.jboss.weld.BeanManagerImpl;
+import org.jboss.weld.bean.ManagedBean;
+import org.jboss.weld.bean.RIBean;
+import org.jboss.weld.mock.MockServletLifecycle;
+import org.jboss.weld.mock.TestContainer;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/ServletLifecycleTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/ServletLifecycleTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/ServletLifecycleTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,7 +1,7 @@
-package org.jboss.webbeans.test.unit.environments.servlet;
+package org.jboss.weld.test.unit.environments.servlet;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Sole.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Sole.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Sole.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.environments.servlet;
+package org.jboss.weld.test.unit.environments.servlet;
import javax.ejb.EJB;
import javax.inject.Named;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Spider.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Spider.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Spider.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.environments.servlet;
+package org.jboss.weld.test.unit.environments.servlet;
class Spider implements Animal
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Tame.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Tame.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Tame.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.environments.servlet;
+package org.jboss.weld.test.unit.environments.servlet;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Tarantula.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Tarantula.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Tarantula.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.environments.servlet;
+package org.jboss.weld.test.unit.environments.servlet;
class Tarantula extends Spider implements DeadlySpider
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/TarantulaProducer.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/TarantulaProducer.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/TarantulaProducer.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.environments.servlet;
+package org.jboss.weld.test.unit.environments.servlet;
import javax.enterprise.inject.Produces;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Tuna.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Tuna.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Tuna.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.environments.servlet;
+package org.jboss.weld.test.unit.environments.servlet;
import javax.enterprise.context.RequestScoped;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Whitefish.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/environments/servlet/Whitefish.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/Whitefish.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.environments.servlet;
+package org.jboss.weld.test.unit.environments.servlet;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/NewEnterpriseBeanTest.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/NewEnterpriseBeanTest.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/NewEnterpriseBeanTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,72 @@
+package org.jboss.weld.test.unit.implementation;
+
+import java.util.Set;
+
+import javax.enterprise.inject.New;
+import javax.enterprise.inject.spi.Bean;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.weld.bean.NewSessionBean;
+import org.jboss.weld.bean.SessionBean;
+import org.jboss.weld.introspector.WBAnnotated;
+import org.jboss.weld.literal.NewLiteral;
+import org.jboss.weld.test.AbstractWebBeansTest;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)Packaging(PackagingType.EAR)
+public class NewEnterpriseBeanTest extends AbstractWebBeansTest
+{
+
+ private static final New NEW_LITERAL = new NewLiteral()
+ {
+
+ public java.lang.Class<?> value()
+ {
+ return WrappedEnterpriseBean.class;
+ }
+
+ };
+
+ private SessionBean<WrappedEnterpriseBeanLocal> wrappedEnterpriseBean;
+ private NewSessionBean<WrappedEnterpriseBeanLocal> newEnterpriseBean;
+
+ public void initNewBean()
+ {
+ Set<Bean<?>> beans = getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class);
+ assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class).size() == 1;
+ assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class).iterator().next() instanceof SessionBean;
+ wrappedEnterpriseBean = (SessionBean<WrappedEnterpriseBeanLocal>) getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class).iterator().next();
+
+ assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).size() == 1;
+ assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).iterator().next() instanceof NewSessionBean;
+ newEnterpriseBean = (NewSessionBean<WrappedEnterpriseBeanLocal>) getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).iterator().next();
+
+ }
+
+ @Test(groups = { "new", "broken" })
+ public void testNewBeanHasImplementationClassOfInjectionPointType()
+ {
+ initNewBean();
+ assert newEnterpriseBean.getType().equals(WrappedEnterpriseBean.class);
+ }
+
+ @Test(groups = { "new" })
+ public void testNewBeanHasSameInitializerMethodsAsWrappedBean()
+ {
+ initNewBean();
+ assert newEnterpriseBean.getInitializerMethods().equals(wrappedEnterpriseBean.getInitializerMethods());
+ }
+
+ @Test(groups = { "new" })
+ public void testNewBeanHasSameInjectedFieldsAsWrappedBean()
+ {
+ initNewBean();
+ Set<? extends WBAnnotated<?, ?>> wrappedBeanInjectionPoints = wrappedEnterpriseBean.getAnnotatedInjectionPoints();
+ Set<? extends WBAnnotated<?, ?>> newBeanInjectionPoints = newEnterpriseBean.getAnnotatedInjectionPoints();
+ assert wrappedBeanInjectionPoints.equals(newBeanInjectionPoints);
+ }
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBean.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedEnterpriseBean.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBean.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBean.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,14 @@
+package org.jboss.weld.test.unit.implementation;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.enterprise.context.SessionScoped;
+
+@SessionScoped
+@Stateful
+class WrappedEnterpriseBean implements WrappedEnterpriseBeanLocal
+{
+ @Remove
+ public void bye() {
+ }
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBeanLocal.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/WrappedEnterpriseBeanLocal.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBeanLocal.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBeanLocal.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,9 @@
+package org.jboss.weld.test.unit.implementation;
+
+import javax.ejb.Local;
+
+@Local
+public interface WrappedEnterpriseBeanLocal
+{
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Animal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Animal.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Animal.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.annotatedItem;
+package org.jboss.weld.test.unit.implementation.annotatedItem;
interface Animal
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Antelope.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Antelope.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Antelope.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.annotatedItem;
+package org.jboss.weld.test.unit.implementation.annotatedItem;
class Antelope implements Animal
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.annotatedItem;
+package org.jboss.weld.test.unit.implementation.annotatedItem;
import java.lang.annotation.Annotation;
import java.util.Iterator;
@@ -8,11 +8,11 @@
import javax.inject.Qualifier;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.introspector.WBClass;
-import org.jboss.webbeans.introspector.jlr.WBClassImpl;
-import org.jboss.webbeans.metadata.TypeStore;
-import org.jboss.webbeans.resources.ClassTransformer;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.introspector.WBClass;
+import org.jboss.weld.introspector.jlr.WBClassImpl;
+import org.jboss.weld.metadata.TypeStore;
+import org.jboss.weld.resources.ClassTransformer;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Order.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Order.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Order.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.annotatedItem;
+package org.jboss.weld.test.unit.implementation.annotatedItem;
@Random
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Random.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/Random.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Random.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.annotatedItem;
+package org.jboss.weld.test.unit.implementation.annotatedItem;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/BowlerHatException.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/BowlerHatException.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/BowlerHatException.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/BowlerHatException.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,26 @@
+package org.jboss.weld.test.unit.implementation.enterprise;
+
+public class BowlerHatException extends RuntimeException
+{
+
+ public BowlerHatException()
+ {
+ super();
+ }
+
+ public BowlerHatException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+
+ public BowlerHatException(String message)
+ {
+ super(message);
+ }
+
+ public BowlerHatException(Throwable cause)
+ {
+ super(cause);
+ }
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/EnterpriseBeanTest.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/EnterpriseBeanTest.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/EnterpriseBeanTest.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/EnterpriseBeanTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,40 @@
+package org.jboss.weld.test.unit.implementation.enterprise;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.weld.test.AbstractWebBeansTest;
+import org.testng.annotations.Test;
+
+@Artifact
+@IntegrationTest
+(a)Packaging(PackagingType.EAR)
+public class EnterpriseBeanTest extends AbstractWebBeansTest
+{
+
+ @Test(description="WBRI-179")
+ public void testSFSBWithOnlyRemoteInterfacesDeploys()
+ {
+
+ }
+
+ @Test(description="WBRI-275")
+ public void testSLSBBusinessMethodThrowsRuntimeException()
+ {
+ try
+ {
+ getCurrentManager().getInstanceByType(Fedora.class).causeRuntimeException();
+ }
+ catch (Throwable t)
+ {
+ if (isExceptionInHierarchy(t, BowlerHatException.class))
+ {
+ return;
+ }
+ }
+ assert false : "Expected a BowlerHatException to be in the cause stack";
+ }
+
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Fedora.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/Fedora.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Fedora.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Fedora.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,12 @@
+package org.jboss.weld.test.unit.implementation.enterprise;
+
+import javax.ejb.Local;
+
+@Local
+public interface Fedora
+{
+
+ public void causeRuntimeException();
+
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/FedoraImpl.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/FedoraImpl.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/FedoraImpl.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/FedoraImpl.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,14 @@
+package org.jboss.weld.test.unit.implementation.enterprise;
+
+import javax.ejb.Stateless;
+
+@Stateless
+public class FedoraImpl implements Fedora
+{
+
+ public void causeRuntimeException()
+ {
+ throw new BowlerHatException();
+ }
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Hat.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/Hat.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Hat.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Hat.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,9 @@
+package org.jboss.weld.test.unit.implementation.enterprise;
+
+import javax.ejb.Stateful;
+
+@Stateful
+public class Hat implements HatRemote
+{
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/HatRemote.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/HatRemote.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/HatRemote.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/HatRemote.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,9 @@
+package org.jboss.weld.test.unit.implementation.enterprise;
+
+import javax.ejb.Remote;
+
+@Remote
+public interface HatRemote
+{
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/AlteStadt.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/AlteStadt.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/AlteStadt.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
import javax.ejb.Local;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/BeanImpl.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/BeanImpl.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/BeanImpl.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
import javax.ejb.Stateless;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/BeanLocal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/BeanLocal.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/BeanLocal.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
public interface BeanLocal
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/DirectOrderProcessor.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/DirectOrderProcessor.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/DirectOrderProcessor.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
import javax.ejb.Stateful;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
import javax.ejb.Local;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
import java.util.Arrays;
import java.util.HashSet;
@@ -14,7 +14,7 @@
import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
/**
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/FrankfurtAmMain.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/FrankfurtAmMain.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/FrankfurtAmMain.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
import javax.ejb.Remove;
import javax.ejb.Stateful;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/GeschichtslosStadt.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/GeschichtslosStadt.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/GeschichtslosStadt.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
import javax.ejb.Local;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Giessen.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Giessen.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Giessen.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
public class Giessen implements NeueStadt, GeschichtslosStadt
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/GrossStadt.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/GrossStadt.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/GrossStadt.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
import javax.ejb.Local;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/GutenbergMuseum.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/GutenbergMuseum.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/GutenbergMuseum.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
public class GutenbergMuseum
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/IndirectOrderProcessor.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/IndirectOrderProcessor.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/IndirectOrderProcessor.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
import javax.ejb.Stateful;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
class IntermediateOrderProcessor extends OrderProcessor
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Kassel.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Kassel.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Kassel.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/KleinStadt.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/KleinStadt.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/KleinStadt.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
import javax.ejb.Local;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/LandgraffenSchloss.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/LandgraffenSchloss.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/LandgraffenSchloss.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
import javax.annotation.PreDestroy;
import javax.ejb.Remove;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Mainz.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Mainz.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Mainz.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
import javax.annotation.PostConstruct;
import javax.ejb.Stateless;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Marburg.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Marburg.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Marburg.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
import javax.ejb.Remove;
import javax.ejb.Stateful;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/MockCreationalContext.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/MockCreationalContext.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/MockCreationalContext.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
import javax.enterprise.context.spi.CreationalContext;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/NeueStadt.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/NeueStadt.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/NeueStadt.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
import javax.ejb.Local;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/OrderProcessor.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/OrderProcessor.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/OrderProcessor.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/OrderProcessorLocal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/OrderProcessorLocal.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/OrderProcessorLocal.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
import javax.ejb.Local;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/RoemerPassage.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/RoemerPassage.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/RoemerPassage.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
class RoemerPassage
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Schloss.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Schloss.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Schloss.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
import javax.ejb.Local;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/SchoeneStadt.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/SchoeneStadt.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/SchoeneStadt.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
import javax.ejb.Local;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/UniStadt.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/UniStadt.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/UniStadt.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
import javax.ejb.Local;
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Foo.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/Foo.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Foo.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Foo.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,6 @@
+package org.jboss.weld.test.unit.implementation.event;
+
+public class Foo
+{
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/NormalScopedBean.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/NormalScopedBean.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/NormalScopedBean.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/NormalScopedBean.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,16 @@
+
+package org.jboss.weld.test.unit.implementation.event;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.event.Event;
+import javax.enterprise.inject.Any;
+
+@SessionScoped
+public class NormalScopedBean implements Serializable
+{
+
+ @Any Event<Foo> event;
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/SimpleEventTest.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/SimpleEventTest.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/SimpleEventTest.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/SimpleEventTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,141 @@
+package org.jboss.weld.test.unit.implementation.event;
+
+import javax.enterprise.event.Event;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.Any;
+import javax.inject.Inject;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.BeanManagerImpl;
+import org.jboss.weld.test.AbstractWebBeansTest;
+import org.testng.annotations.Test;
+
+@Artifact
+public class SimpleEventTest extends AbstractWebBeansTest
+{
+ private static boolean RECEIVE_1_OBSERVED;
+ private static boolean RECEIVE_2_OBSERVED;
+ private static boolean RECEIVE_3_OBSERVED;
+
+ private static void initFlags() {
+ RECEIVE_1_OBSERVED = false;
+ RECEIVE_2_OBSERVED = false;
+ RECEIVE_3_OBSERVED = false;
+ }
+
+ @Test
+ public void testFireEventOnManager()
+ {
+ BeanManagerImpl manager = getCurrentManager();
+
+ initFlags();
+
+ manager.fireEvent("Fired using Manager Interface with AnnotationLiteral.", new AnnotationLiteral<Updated>(){});
+
+ assert RECEIVE_2_OBSERVED == true;
+ assert RECEIVE_1_OBSERVED == true;
+ assert RECEIVE_3_OBSERVED == false;
+
+ initFlags();
+
+ manager.fireEvent("Fired using Manager Interface.");
+
+ assert RECEIVE_2_OBSERVED == true;
+ assert RECEIVE_1_OBSERVED == false; // not called
+ assert RECEIVE_3_OBSERVED == true;
+ }
+
+ @Test
+ public void testFireEventOnEvent()
+ {
+ BeanManagerImpl manager = getCurrentManager();
+
+ App app = createContextualInstance(App.class);
+
+ initFlags();
+
+ app.fireEventByBindingDeclaredAtInjectionPoint();
+
+ assert RECEIVE_1_OBSERVED == true;
+ assert RECEIVE_2_OBSERVED == true;
+ assert RECEIVE_3_OBSERVED == false;
+
+ initFlags();
+
+ app.fireEventByAnnotationLiteral();
+
+ assert RECEIVE_2_OBSERVED == true;
+ assert RECEIVE_1_OBSERVED == true;
+ assert RECEIVE_3_OBSERVED == false;
+
+ initFlags();
+
+ app.fireEventViaAny();
+
+ assert RECEIVE_2_OBSERVED == true;
+ assert RECEIVE_1_OBSERVED == false; // not called
+ assert RECEIVE_3_OBSERVED == false;
+
+ initFlags();
+
+ app.fireEventViaCurrent();
+
+ assert RECEIVE_2_OBSERVED == true;
+ assert RECEIVE_1_OBSERVED == false; // not called
+ assert RECEIVE_3_OBSERVED == true;
+ }
+
+ public static class App
+ {
+ @Inject @Any
+ Event<String> event1;
+
+ @Inject @Updated
+ Event<String> event2;
+
+ @Inject @Any
+ Event<String> event3;
+
+ @Inject
+ Event<String> event4;
+
+ public void fireEventByAnnotationLiteral()
+ {
+ event1.select(new AnnotationLiteral<Updated>(){}).fire("Fired using Event Interface with AnnotationLiteral.");
+ }
+
+ public void fireEventByBindingDeclaredAtInjectionPoint()
+ {
+ event2.fire("Fired using Event Interface with Binding Declared.");
+ }
+
+ public void fireEventViaAny()
+ {
+ event3.fire("Fired using Event Interface with Non-BindingType.");
+ }
+
+ public void fireEventViaCurrent()
+ {
+ event4.fire("Fired using Event Interface with @Current");
+ }
+ }
+
+ public static class Receiver
+ {
+ public void receive1(@Observes @Updated String s)
+ {
+ RECEIVE_1_OBSERVED = true;
+ }
+
+ public void receive2(@Any @Observes String s)
+ {
+ RECEIVE_2_OBSERVED = true;
+ }
+
+ public void receive3(@Observes String s)
+ {
+ RECEIVE_3_OBSERVED = true;
+ }
+ }
+}
\ No newline at end of file
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Updated.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/Updated.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Updated.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Updated.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,22 @@
+package org.jboss.weld.test.unit.implementation.event;
+
+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 static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+@Qualifier
+@Retention(RUNTIME)
+@Target( { TYPE, METHOD, FIELD, PARAMETER })
+@Documented
+@interface Updated
+{
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/tx)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/AbstractHtmlUnitTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/tx/AbstractHtmlUnitTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/AbstractHtmlUnitTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,9 +1,9 @@
-package org.jboss.webbeans.test.unit.implementation.event.tx;
+package org.jboss.weld.test.unit.implementation.event.tx;
import java.util.HashSet;
import java.util.Set;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/Foo.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/tx/Foo.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/Foo.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.event.tx;
+package org.jboss.weld.test.unit.implementation.event.tx;
import java.io.Serializable;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/TxEventTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/tx/TxEventTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/TxEventTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.event.tx;
+package org.jboss.weld.test.unit.implementation.event.tx;
import org.jboss.testharness.impl.packaging.Artifact;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/Updated.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/tx/Updated.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/Updated.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.event.tx;
+package org.jboss.weld.test.unit.implementation.event.tx;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/ExceptionHandlingTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/ExceptionHandlingTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/ExceptionHandlingTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,10 +1,10 @@
-package org.jboss.webbeans.test.unit.implementation.exceptions;
+package org.jboss.weld.test.unit.implementation.exceptions;
import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.CreationException;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/FooException.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/FooException.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/FooException.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.exceptions;
+package org.jboss.weld.test.unit.implementation.exceptions;
public class FooException extends Exception
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/Large.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/Large.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/Large.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.exceptions;
+package org.jboss.weld.test.unit.implementation.exceptions;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/Lorry_Broken.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/Lorry_Broken.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/Lorry_Broken.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.exceptions;
+package org.jboss.weld.test.unit.implementation.exceptions;
class Lorry_Broken
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/Ship.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/Ship.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/Ship.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.exceptions;
+package org.jboss.weld.test.unit.implementation.exceptions;
class Ship
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/ShipProducer_Broken.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/exceptions/ShipProducer_Broken.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/ShipProducer_Broken.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.exceptions;
+package org.jboss.weld.test.unit.implementation.exceptions;
import javax.enterprise.inject.Produces;
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/named)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named/Important.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/named/Important.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named/Important.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.named;
+package org.jboss.weld.test.unit.implementation.named;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named/NamedBeanWithBinding.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/named/NamedBeanWithBinding.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named/NamedBeanWithBinding.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.named;
+package org.jboss.weld.test.unit.implementation.named;
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named/NamedBeanWithBindingTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/named/NamedBeanWithBindingTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named/NamedBeanWithBindingTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,9 +1,9 @@
-package org.jboss.webbeans.test.unit.implementation.named;
+package org.jboss.weld.test.unit.implementation.named;
import javax.enterprise.inject.spi.Bean;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
/**
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/newsimple (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/newsimple/NewSimpleBeanTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/NewSimpleBeanTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/newsimple/NewSimpleBeanTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,15 +1,15 @@
-package org.jboss.webbeans.test.unit.implementation.newsimple;
+package org.jboss.weld.test.unit.implementation.newsimple;
import java.util.Set;
import javax.enterprise.inject.New;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.bean.NewManagedBean;
-import org.jboss.webbeans.bean.ManagedBean;
-import org.jboss.webbeans.introspector.WBAnnotated;
-import org.jboss.webbeans.literal.NewLiteral;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.bean.ManagedBean;
+import org.jboss.weld.bean.NewManagedBean;
+import org.jboss.weld.introspector.WBAnnotated;
+import org.jboss.weld.literal.NewLiteral;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/newsimple/WrappedSimpleBean.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/WrappedSimpleBean.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/newsimple/WrappedSimpleBean.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.newsimple;
+package org.jboss.weld.test.unit.implementation.newsimple;
import java.io.Serializable;
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/IntegerCollectionInjection.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/IntegerCollectionInjection.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/IntegerCollectionInjection.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.producer.field;
+package org.jboss.weld.test.unit.implementation.producer.field;
import java.util.Collection;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ListInstance.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListInstance.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ListInstance.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.producer.field;
+package org.jboss.weld.test.unit.implementation.producer.field;
import java.util.List;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ListStringInstance.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListStringInstance.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ListStringInstance.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.producer.field;
+package org.jboss.weld.test.unit.implementation.producer.field;
import java.util.List;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedCollectionInjection.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedCollectionInjection.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedCollectionInjection.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.producer.field;
+package org.jboss.weld.test.unit.implementation.producer.field;
import java.util.Collection;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedListInjection.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedListInjection.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedListInjection.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.producer.field;
+package org.jboss.weld.test.unit.implementation.producer.field;
import java.util.List;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedProducer.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducer.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedProducer.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.producer.field;
+package org.jboss.weld.test.unit.implementation.producer.field;
import java.util.ArrayList;
import java.util.Arrays;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedProducerTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducerTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedProducerTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,10 +1,10 @@
-package org.jboss.webbeans.test.unit.implementation.producer.field;
+package org.jboss.weld.test.unit.implementation.producer.field;
import java.util.Collection;
import java.util.List;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/Target.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/Target.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/Target.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.producer.field;
+package org.jboss.weld.test.unit.implementation.producer.field;
import java.util.Collection;
import java.util.List;
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Car.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/Car.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Car.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.producer.method;
+package org.jboss.weld.test.unit.implementation.producer.method;
import java.io.Serializable;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/CarFactory.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/CarFactory.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/CarFactory.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.producer.method;
+package org.jboss.weld.test.unit.implementation.producer.method;
import javax.enterprise.inject.Produces;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/DisposalMethodOnOtherBeanNotResolvedTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/DisposalMethodOnOtherBeanNotResolvedTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/DisposalMethodOnOtherBeanNotResolvedTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,10 +1,10 @@
-package org.jboss.webbeans.test.unit.implementation.producer.method;
+package org.jboss.weld.test.unit.implementation.producer.method;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Bean;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Foo.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/Foo.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Foo.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.implementation.producer.method;
+package org.jboss.weld.test.unit.implementation.producer.method;
/**
* @author pmuir
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/FooDisposer.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/FooDisposer.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/FooDisposer.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.implementation.producer.method;
+package org.jboss.weld.test.unit.implementation.producer.method;
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Disposes;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/FooProducer.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/FooProducer.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/FooProducer.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.implementation.producer.method;
+package org.jboss.weld.test.unit.implementation.producer.method;
import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Government.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/Government.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Government.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.producer.method;
+package org.jboss.weld.test.unit.implementation.producer.method;
import java.io.Serializable;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Important.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/Important.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Important.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.producer.method;
+package org.jboss.weld.test.unit.implementation.producer.method;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/IntInjection.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/IntInjection.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.producer.method;
+package org.jboss.weld.test.unit.implementation.producer.method;
import javax.inject.Inject;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/ManagerProducer.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/ManagerProducer.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.producer.method;
+package org.jboss.weld.test.unit.implementation.producer.method;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.BeanManager;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/ManagerProducerTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducerTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/ManagerProducerTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,7 +1,7 @@
-package org.jboss.webbeans.test.unit.implementation.producer.method;
+package org.jboss.weld.test.unit.implementation.producer.method;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducer.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducer.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducer.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.producer.method;
+package org.jboss.weld.test.unit.implementation.producer.method;
import javax.enterprise.inject.Produces;
import javax.inject.Named;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducerTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducerTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducerTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,9 +1,9 @@
-package org.jboss.webbeans.test.unit.implementation.producer.method;
+package org.jboss.weld.test.unit.implementation.producer.method;
import javax.enterprise.inject.spi.Bean;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducerWithBinding.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducerWithBinding.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducerWithBinding.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.producer.method;
+package org.jboss.weld.test.unit.implementation.producer.method;
import java.util.Date;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducerWithBindingTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NamedProducerWithBindingTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducerWithBindingTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.producer.method;
+package org.jboss.weld.test.unit.implementation.producer.method;
import static org.testng.Assert.assertNotNull;
@@ -7,7 +7,7 @@
import javax.enterprise.inject.spi.Bean;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
/**
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NullProducerTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/NullProducerTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NullProducerTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,7 +1,7 @@
-package org.jboss.webbeans.test.unit.implementation.producer.method;
+package org.jboss.weld.test.unit.implementation.producer.method;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/Foo.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/Foo.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/Foo.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/Foo.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,18 @@
+package org.jboss.weld.test.unit.implementation.proxy;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
+
+@Named
+@RequestScoped
+class Foo implements Serializable
+{
+
+ public String getMsg()
+ {
+ return "Hi";
+ }
+
+}
\ No newline at end of file
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/ProxyTest.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/ProxyTest.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/ProxyTest.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/ProxyTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,20 @@
+package org.jboss.weld.test.unit.implementation.proxy;
+
+import javax.enterprise.inject.spi.Bean;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWebBeansTest;
+import org.testng.annotations.Test;
+
+@Artifact
+public class ProxyTest extends AbstractWebBeansTest
+{
+
+ @Test(description="WBRI-122")
+ public void testImplementationClassImplementsSerializable()
+ {
+ Bean<?> bean = getCurrentManager().resolve(getCurrentManager().getBeans("foo"));
+ getCurrentManager().getReference(bean, Object.class, getCurrentManager().createCreationalContext(bean));
+ }
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/enterprise)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise/EnterpriseBeanProxyTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/enterprise/EnterpriseBeanProxyTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise/EnterpriseBeanProxyTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,11 +1,11 @@
-package org.jboss.webbeans.test.unit.implementation.proxy.enterprise;
+package org.jboss.weld.test.unit.implementation.proxy.enterprise;
import javassist.util.proxy.ProxyObject;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise/Mouse.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/enterprise/Mouse.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise/Mouse.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.proxy.enterprise;
+package org.jboss.weld.test.unit.implementation.proxy.enterprise;
import javax.ejb.Stateless;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise/MouseLocal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/enterprise/MouseLocal.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise/MouseLocal.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.implementation.proxy.enterprise;
+package org.jboss.weld.test.unit.implementation.proxy.enterprise;
import javax.ejb.Local;
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Ball.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb/Ball.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Ball.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.interceptor.ejb;
+package org.jboss.weld.test.unit.interceptor.ejb;
import javax.ejb.Local;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/BallImpl.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb/BallImpl.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/BallImpl.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.interceptor.ejb;
+package org.jboss.weld.test.unit.interceptor.ejb;
import javax.ejb.Stateless;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Defender.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb/Defender.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Defender.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.interceptor.ejb;
+package org.jboss.weld.test.unit.interceptor.ejb;
import javax.interceptor.Interceptor;
import javax.interceptor.AroundInvoke;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/EnterpriseBeanInterceptionTests.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb/EnterpriseBeanInterceptionTests.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/EnterpriseBeanInterceptionTests.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.interceptor.ejb;
+package org.jboss.weld.test.unit.interceptor.ejb;
import java.util.ArrayList;
import java.util.List;
@@ -11,8 +11,8 @@
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.jboss.webbeans.bean.SessionBean;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.bean.SessionBean;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Goalkeeper.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb/Goalkeeper.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Goalkeeper.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.interceptor.ejb;
+package org.jboss.weld.test.unit.interceptor.ejb;
import javax.interceptor.Interceptor;
import javax.interceptor.AroundInvoke;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Pass.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb/Pass.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Pass.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.interceptor.ejb;
+package org.jboss.weld.test.unit.interceptor.ejb;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Shot.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb/Shot.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Shot.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.interceptor.ejb;
+package org.jboss.weld.test.unit.interceptor.ejb;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb3model)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Ball.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb3model/Ball.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Ball.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.interceptor.ejb3model;
+package org.jboss.weld.test.unit.interceptor.ejb3model;
import javax.interceptor.Interceptors;
import javax.interceptor.ExcludeClassInterceptors;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Defender.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb3model/Defender.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Defender.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.interceptor.ejb3model;
+package org.jboss.weld.test.unit.interceptor.ejb3model;
import javax.interceptor.Interceptor;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
-import org.jboss.webbeans.test.unit.interceptor.ejb.Pass;
+import org.jboss.weld.test.unit.interceptor.ejb.Pass;
/**
* @author <a href="mailto:mariusb@redhat.com">Marius Bogoevici</a>
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Ejb3InterceptionModelTests.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb3model/Ejb3InterceptionModelTests.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Ejb3InterceptionModelTests.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.interceptor.ejb3model;
+package org.jboss.weld.test.unit.interceptor.ejb3model;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.context.spi.CreationalContext;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeTest;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Goalkeeper.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/ejb3model/Goalkeeper.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Goalkeeper.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.interceptor.ejb3model;
+package org.jboss.weld.test.unit.interceptor.ejb3model;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/simple)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/PrimaryInterceptionBinding.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/simple/PrimaryInterceptionBinding.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/PrimaryInterceptionBinding.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.interceptor.simple;
+package org.jboss.weld.test.unit.interceptor.simple;
import javax.interceptor.InterceptorBinding;
import java.lang.annotation.*;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SecondaryInterceptionBinding.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/simple/SecondaryInterceptionBinding.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SecondaryInterceptionBinding.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.interceptor.simple;
+package org.jboss.weld.test.unit.interceptor.simple;
import javax.interceptor.InterceptorBinding;
import java.lang.annotation.Documented;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleBean.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/simple/SimpleBean.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleBean.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.interceptor.simple;
+package org.jboss.weld.test.unit.interceptor.simple;
/**
* @author <a href="mailto:mariusb@redhat.com">Marius Bogoevici</a>
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleBeanImpl.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/simple/SimpleBeanImpl.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleBeanImpl.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.interceptor.simple;
+package org.jboss.weld.test.unit.interceptor.simple;
import javax.annotation.PostConstruct;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleBeanWithStereotype.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/simple/SimpleBeanWithStereotype.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleBeanWithStereotype.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.interceptor.simple;
+package org.jboss.weld.test.unit.interceptor.simple;
import javax.annotation.PostConstruct;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleDecorator.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/simple/SimpleDecorator.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleDecorator.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.interceptor.simple;
+package org.jboss.weld.test.unit.interceptor.simple;
-import org.jboss.webbeans.test.unit.interceptor.simple.SimpleBean;
+import org.jboss.weld.test.unit.interceptor.simple.SimpleBean;
import javax.decorator.Decorates;
import javax.decorator.Decorator;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptor.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/simple/SimpleInterceptor.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptor.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.interceptor.simple;
+package org.jboss.weld.test.unit.interceptor.simple;
import javax.interceptor.Interceptor;
import javax.interceptor.AroundInvoke;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptorStereotype.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/simple/SimpleInterceptorStereotype.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptorStereotype.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.interceptor.simple;
+package org.jboss.weld.test.unit.interceptor.simple;
import javax.enterprise.inject.stereotype.Stereotype;
import static java.lang.annotation.ElementType.TYPE;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptorTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/simple/SimpleInterceptorTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptorTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.interceptor.simple;
+package org.jboss.weld.test.unit.interceptor.simple;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
-import org.jboss.webbeans.metadata.cache.InterceptorBindingModel;
-import org.jboss.webbeans.metadata.TypeStore;
-import org.jboss.webbeans.resources.ClassTransformer;
+import org.jboss.weld.metadata.TypeStore;
+import org.jboss.weld.metadata.cache.InterceptorBindingModel;
+import org.jboss.weld.resources.ClassTransformer;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/TwoBindingsInterceptor.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/interceptor/simple/TwoBindingsInterceptor.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/TwoBindingsInterceptor.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.interceptor.simple;
+package org.jboss.weld.test.unit.interceptor.simple;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Bar.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/Bar.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Bar.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Bar.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,6 @@
+package org.jboss.weld.test.unit.lookup;
+
+public class Bar
+{
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Baz.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/Baz.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Baz.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Baz.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,6 @@
+package org.jboss.weld.test.unit.lookup;
+
+public class Baz
+{
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Foo.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/Foo.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Foo.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Foo.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,11 @@
+package org.jboss.weld.test.unit.lookup;
+
+public class Foo extends FooBase<Bar>
+{
+
+ public String getName()
+ {
+ return "foo";
+ }
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooBase.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/FooBase.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooBase.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooBase.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,11 @@
+package org.jboss.weld.test.unit.lookup;
+
+public class FooBase<T>
+{
+
+ public String getName()
+ {
+ return "foobase";
+ }
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooProducer.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/FooProducer.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooProducer.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooProducer.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,14 @@
+package org.jboss.weld.test.unit.lookup;
+
+import javax.enterprise.inject.Produces;
+
+public class FooProducer
+{
+
+ @Produces @Special
+ public FooBase<Baz> produce()
+ {
+ return new FooBase<Baz>();
+ }
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupFoo.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/LookupFoo.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupFoo.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupFoo.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,22 @@
+package org.jboss.weld.test.unit.lookup;
+
+import javax.inject.Inject;
+
+public class LookupFoo
+{
+
+ @Inject Foo foo;
+
+ @Inject @Special FooBase<Baz> foobaz;
+
+ public Foo getFoo()
+ {
+ return foo;
+ }
+
+ public FooBase<Baz> getFoobaz()
+ {
+ return foobaz;
+ }
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupInstanceTest.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/LookupInstanceTest.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupInstanceTest.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupInstanceTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,24 @@
+package org.jboss.weld.test.unit.lookup;
+
+import java.util.List;
+
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.TypeLiteral;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.literal.DefaultLiteral;
+import org.jboss.weld.test.AbstractWebBeansTest;
+import org.testng.annotations.Test;
+
+@Artifact
+public class LookupInstanceTest extends AbstractWebBeansTest
+{
+
+
+ @Test
+ public void testLookupInstance() throws Exception
+ {
+ assert createContextualInstance(new TypeLiteral<Instance<List<?>>>(){}.getRawType(), new DefaultLiteral()) == null;
+ }
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Special.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/Special.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Special.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Special.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,20 @@
+package org.jboss.weld.test.unit.lookup;
+
+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;
+
+@Qualifier
+(a)Retention(RetentionPolicy.RUNTIME)
+@Target({FIELD, METHOD, TYPE, PARAMETER})
+public @interface Special
+{
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Wbri256Test.java (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/Wbri256Test.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Wbri256Test.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Wbri256Test.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -0,0 +1,19 @@
+package org.jboss.weld.test.unit.lookup;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWebBeansTest;
+import org.testng.annotations.Test;
+
+@Artifact
+public class Wbri256Test extends AbstractWebBeansTest
+{
+
+ @Test
+ public void testParameterizedInjection()
+ {
+ LookupFoo lookupFoo = getCurrentManager().getInstanceByType(LookupFoo.class);
+ assert lookupFoo.getFoo().getName().equals("foo");
+ assert lookupFoo.getFoobaz().getName().equals("foobase");
+ }
+
+}
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Bar.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Bar.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Bar.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.lookup.circular;
+package org.jboss.weld.test.unit.lookup.circular;
import javax.annotation.PostConstruct;
import javax.enterprise.context.ApplicationScoped;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/CircularDependencyTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/CircularDependencyTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/CircularDependencyTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,7 +1,7 @@
-package org.jboss.webbeans.test.unit.lookup.circular;
+package org.jboss.weld.test.unit.lookup.circular;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/DependentLooping.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentLooping.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/DependentLooping.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.lookup.circular;
+package org.jboss.weld.test.unit.lookup.circular;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/DependentLoopingProducer.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentLoopingProducer.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/DependentLoopingProducer.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.lookup.circular;
+package org.jboss.weld.test.unit.lookup.circular;
import javax.enterprise.inject.Produces;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/DependentSelfConsumingDependentProducer.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/DependentSelfConsumingDependentProducer.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/DependentSelfConsumingDependentProducer.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.lookup.circular;
+package org.jboss.weld.test.unit.lookup.circular;
import javax.enterprise.inject.Produces;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Farm.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Farm.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Farm.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.lookup.circular;
+package org.jboss.weld.test.unit.lookup.circular;
import javax.inject.Inject;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Fish.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Fish.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Fish.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.lookup.circular;
+package org.jboss.weld.test.unit.lookup.circular;
import javax.inject.Inject;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Foo.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Foo.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Foo.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.lookup.circular;
+package org.jboss.weld.test.unit.lookup.circular;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/NormalLooping.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalLooping.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/NormalLooping.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.lookup.circular;
+package org.jboss.weld.test.unit.lookup.circular;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/NormalLoopingProducer.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/NormalLoopingProducer.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/NormalLoopingProducer.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.lookup.circular;
+package org.jboss.weld.test.unit.lookup.circular;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/SelfConsumingDependent.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/SelfConsumingDependent.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/SelfConsumingDependent.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.lookup.circular;
+package org.jboss.weld.test.unit.lookup.circular;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Violation.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Violation.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Violation.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.lookup.circular;
+package org.jboss.weld.test.unit.lookup.circular;
import java.io.Serializable;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Water.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/circular/Water.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Water.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.lookup.circular;
+package org.jboss.weld.test.unit.lookup.circular;
import javax.inject.Inject;
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279 (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/AbstractFactory.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/AbstractFactory.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/AbstractFactory.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.lookup.wbri279;
+package org.jboss.weld.test.unit.lookup.wbri279;
public abstract class AbstractFactory<T>
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/DummyParent.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/DummyParent.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/DummyParent.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.lookup.wbri279;
+package org.jboss.weld.test.unit.lookup.wbri279;
public class DummyParent
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/IntFactory.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/IntFactory.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/IntFactory.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.lookup.wbri279;
+package org.jboss.weld.test.unit.lookup.wbri279;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/IntegerFactory.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/IntegerFactory.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/IntegerFactory.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.lookup.wbri279;
+package org.jboss.weld.test.unit.lookup.wbri279;
@IntFactory
public class IntegerFactory extends AbstractFactory<Integer>
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/SomeBean.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/SomeBean.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/SomeBean.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.lookup.wbri279;
+package org.jboss.weld.test.unit.lookup.wbri279;
import javax.inject.Inject;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/Wbri279Test.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/Wbri279Test.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/Wbri279Test.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.lookup.wbri279;
+package org.jboss.weld.test.unit.lookup.wbri279;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
/**
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri293 (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri293)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri293/ContextualReferenceTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri293/ContextualReferenceTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri293/ContextualReferenceTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.lookup.wbri293;
+package org.jboss.weld.test.unit.lookup.wbri293;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
/**
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri293/Sheep.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri293/Sheep.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri293/Sheep.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.lookup.wbri293;
+package org.jboss.weld.test.unit.lookup.wbri293;
import javax.enterprise.context.RequestScoped;
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/Cat.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/Cat.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/Cat.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.manager;
+package org.jboss.weld.test.unit.manager;
import javax.ejb.Stateful;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/CatLocal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/CatLocal.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/CatLocal.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.manager;
+package org.jboss.weld.test.unit.manager;
import javax.ejb.Local;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/EjbDescriptorLookupTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/EjbDescriptorLookupTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/EjbDescriptorLookupTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.manager;
+package org.jboss.weld.test.unit.manager;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.InjectionTarget;
@@ -22,10 +22,10 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.webbeans.bean.SessionBean;
-import org.jboss.webbeans.ejb.InternalEjbDescriptor;
-import org.jboss.webbeans.ejb.spi.EjbDescriptor;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.bean.SessionBean;
+import org.jboss.weld.ejb.InternalEjbDescriptor;
+import org.jboss.weld.ejb.spi.EjbDescriptor;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
/**
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/Foo.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/Foo.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/Foo.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.manager;
+package org.jboss.weld.test.unit.manager;
public class Foo
{
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/ManagerTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/ManagerTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/ManagerTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.manager;
+package org.jboss.weld.test.unit.manager;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
@@ -13,9 +13,9 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.Packaging;
-import org.jboss.webbeans.BeanManagerImpl;
-import org.jboss.webbeans.literal.DefaultLiteral;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.BeanManagerImpl;
+import org.jboss.weld.literal.DefaultLiteral;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.annotations.Test;
@Artifact
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/ExampleTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/ExampleTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/ExampleTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.noncontextual;
+package org.jboss.weld.test.unit.noncontextual;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.AnnotatedType;
@@ -8,7 +8,7 @@
import org.jboss.metadata.validation.ValidationException;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.weld.test.AbstractWebBeansTest;
import org.testng.Assert;
import org.testng.annotations.Test;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/External.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/External.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/External.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -19,7 +19,7 @@
* 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.webbeans.test.unit.noncontextual;
+package org.jboss.weld.test.unit.noncontextual;
import javax.inject.Inject;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/Random.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/Random.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/Random.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.noncontextual;
+package org.jboss.weld.test.unit.noncontextual;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/WebBean.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/WebBean.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/WebBean.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.unit.noncontextual;
+package org.jboss.weld.test.unit.noncontextual;
public class WebBean
{
Copied: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/security (from rev 3872, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/security)
Modified: ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/security/SecurityTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/security/SecurityTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/test/java/org/jboss/weld/test/unit/security/SecurityTest.java 2009-10-08 04:13:04 UTC (rev 3883)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.test.unit.security;
+package org.jboss.weld.test.unit.security;
import java.lang.reflect.Field;
14 years, 7 months
- 1
- 0
Weld SVN: r3882 - in ri/trunk/tests/src/main/java/org/jboss: weld and 5 other directories.
by weld-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-10-07 23:57:13 -0400 (Wed, 07 Oct 2009)
New Revision: 3882
Added:
ri/trunk/tests/src/main/java/org/jboss/weld/
ri/trunk/tests/src/main/java/org/jboss/weld/mock/
ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockBeanDeploymentArchive.java
ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockDeployment.java
ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockEELifecycle.java
ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockEjBServices.java
ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockEjbDescriptor.java
ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockEjbInjectionServices.java
ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockHttpSession.java
ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockJpaServices.java
ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockLifecycle.java
ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockResourceLoader.java
ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockResourceServices.java
ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockSecurityServices.java
ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockServletContext.java
ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockServletLifecycle.java
ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockServletServices.java
ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockTransactionServices.java
ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockValidationServices.java
ri/trunk/tests/src/main/java/org/jboss/weld/mock/TestContainer.java
ri/trunk/tests/src/main/java/org/jboss/weld/mock/cluster/
ri/trunk/tests/src/main/java/org/jboss/weld/mock/el/
ri/trunk/tests/src/main/java/org/jboss/weld/test/
ri/trunk/tests/src/main/java/org/jboss/weld/test/AbstractWebBeansTest.java
ri/trunk/tests/src/main/java/org/jboss/weld/test/harness/
Removed:
ri/trunk/tests/src/main/java/org/jboss/webbeans/
Modified:
ri/trunk/tests/src/main/java/org/jboss/weld/mock/cluster/AbstractClusterTest.java
ri/trunk/tests/src/main/java/org/jboss/weld/mock/cluster/SwitchableMockEELifecycle.java
ri/trunk/tests/src/main/java/org/jboss/weld/mock/cluster/SwitchableSingletonProvider.java
ri/trunk/tests/src/main/java/org/jboss/weld/mock/el/EL.java
ri/trunk/tests/src/main/java/org/jboss/weld/test/harness/AbstractStandaloneContainersImpl.java
ri/trunk/tests/src/main/java/org/jboss/weld/test/harness/ServletLifecycleContainersImpl.java
ri/trunk/tests/src/main/java/org/jboss/weld/test/harness/StandaloneContainersImpl.java
Log:
refactored core tests packages
Copied: ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockBeanDeploymentArchive.java (from rev 3872, ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockBeanDeploymentArchive.java)
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockBeanDeploymentArchive.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockBeanDeploymentArchive.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -0,0 +1,115 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.mock;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.ejb.MessageDriven;
+import javax.ejb.Singleton;
+import javax.ejb.Stateful;
+import javax.ejb.Stateless;
+
+import org.jboss.weld.bootstrap.api.ServiceRegistry;
+import org.jboss.weld.bootstrap.api.helpers.SimpleServiceRegistry;
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.weld.ejb.spi.EjbDescriptor;
+
+/**
+ * @author pmuir
+ *
+ */
+public class MockBeanDeploymentArchive implements BeanDeploymentArchive
+{
+
+
+ private Collection<Class<?>> beanClasses;
+ private Collection<URL> beansXmlFiles;
+ private List<EjbDescriptor<?>> ejbs;
+ private final ServiceRegistry services;
+
+ public MockBeanDeploymentArchive()
+ {
+ this.services = new SimpleServiceRegistry();
+ this.beanClasses = new HashSet<Class<?>>();
+ this.beansXmlFiles = new HashSet<URL>();
+ }
+
+ public Collection<Class<?>> getBeanClasses()
+ {
+ return beanClasses;
+ }
+
+ public void setBeanClasses(Collection<Class<?>> beanClasses)
+ {
+ this.beanClasses = beanClasses;
+ ejbs = new ArrayList<EjbDescriptor<?>>();
+ for (Class<?> ejbClass : discoverEjbs(getBeanClasses()))
+ {
+ ejbs.add(MockEjbDescriptor.of(ejbClass));
+ }
+ }
+
+ public Collection<URL> getBeansXml()
+ {
+ return beansXmlFiles;
+ }
+
+ public void setBeansXmlFiles(Collection<URL> beansXmlFiles)
+ {
+ this.beansXmlFiles = beansXmlFiles;
+ }
+
+ public List<BeanDeploymentArchive> getBeanDeploymentArchives()
+ {
+ return Collections.emptyList();
+ }
+
+ public Collection<EjbDescriptor<?>> getEjbs()
+ {
+ return ejbs;
+ }
+
+ protected static Iterable<Class<?>> discoverEjbs(Iterable<Class<?>> webBeanClasses)
+ {
+ Set<Class<?>> ejbs = new HashSet<Class<?>>();
+ for (Class<?> clazz : webBeanClasses)
+ {
+ if (clazz.isAnnotationPresent(Stateless.class) || clazz.isAnnotationPresent(Stateful.class) || clazz.isAnnotationPresent(MessageDriven.class) || clazz.isAnnotationPresent(Singleton.class))
+ {
+ ejbs.add(clazz);
+ }
+ }
+ return ejbs;
+ }
+
+ public ServiceRegistry getServices()
+ {
+ return services;
+ }
+
+ public String getId()
+ {
+ return "test";
+ }
+
+}
Copied: ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockDeployment.java (from rev 3872, ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockDeployment.java)
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockDeployment.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockDeployment.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.mock;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.weld.bootstrap.api.ServiceRegistry;
+import org.jboss.weld.bootstrap.api.helpers.SimpleServiceRegistry;
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.weld.bootstrap.spi.Deployment;
+
+public class MockDeployment implements Deployment
+{
+
+ private final MockBeanDeploymentArchive archive;
+ private final List<BeanDeploymentArchive> beanDeploymentArchives;
+ private final ServiceRegistry services;
+
+ public MockDeployment()
+ {
+ this.archive = new MockBeanDeploymentArchive();
+ this.services = new SimpleServiceRegistry();
+ this.beanDeploymentArchives = new ArrayList<BeanDeploymentArchive>();
+ this.beanDeploymentArchives.add(archive);
+ }
+
+ public List<BeanDeploymentArchive> getBeanDeploymentArchives()
+ {
+ return beanDeploymentArchives;
+ }
+
+ public BeanDeploymentArchive loadBeanDeploymentArchive(Class<?> beanClass)
+ {
+ return archive;
+ }
+
+ public MockBeanDeploymentArchive getArchive()
+ {
+ return archive;
+ }
+
+ public ServiceRegistry getServices()
+ {
+ return services;
+ }
+
+}
Copied: ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockEELifecycle.java (from rev 3872, ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEELifecycle.java)
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockEELifecycle.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockEELifecycle.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.mock;
+
+import org.jboss.weld.bootstrap.api.Environment;
+import org.jboss.weld.bootstrap.api.Environments;
+import org.jboss.weld.ejb.spi.EjbServices;
+import org.jboss.weld.injection.spi.EjbInjectionServices;
+import org.jboss.weld.injection.spi.JpaInjectionServices;
+import org.jboss.weld.injection.spi.ResourceInjectionServices;
+import org.jboss.weld.security.spi.SecurityServices;
+import org.jboss.weld.transaction.spi.TransactionServices;
+import org.jboss.weld.validation.spi.ValidationServices;
+
+public class MockEELifecycle extends MockServletLifecycle
+{
+
+ private static final TransactionServices MOCK_TRANSACTION_SERVICES = new MockTransactionServices();
+
+ public MockEELifecycle()
+ {
+ super();
+ getDeployment().getServices().add(TransactionServices.class, MOCK_TRANSACTION_SERVICES);
+ getDeployment().getServices().add(SecurityServices.class, new MockSecurityServices());
+ getDeployment().getServices().add(ValidationServices.class, new MockValidationServices());
+ getDeployment().getServices().add(EjbServices.class, new MockEjBServices());
+ getDeployment().getArchive().getServices().add(EjbInjectionServices.class, new MockEjbInjectionServices());
+ getDeployment().getArchive().getServices().add(JpaInjectionServices.class, new MockJpaServices(getDeployment()));
+ getDeployment().getArchive().getServices().add(ResourceInjectionServices.class, new MockResourceServices());
+ }
+
+ public Environment getEnvironment()
+ {
+ return Environments.EE_INJECT;
+ }
+
+}
Copied: ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockEjBServices.java (from rev 3872, ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEjBServices.java)
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockEjBServices.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockEjBServices.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -0,0 +1,51 @@
+/**
+ *
+ */
+package org.jboss.weld.mock;
+
+import org.jboss.weld.ejb.api.SessionObjectReference;
+import org.jboss.weld.ejb.spi.EjbDescriptor;
+import org.jboss.weld.ejb.spi.EjbServices;
+import org.jboss.weld.ejb.spi.InterceptorBindings;
+
+public class MockEjBServices implements EjbServices
+{
+
+
+
+ public SessionObjectReference resolveEjb(EjbDescriptor<?> ejbDescriptor)
+ {
+ return new SessionObjectReference()
+ {
+
+ private static final long serialVersionUID = 1L;
+
+ public <S> S getBusinessObject(Class<S> businessInterfaceType)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void remove()
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public boolean isRemoved()
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ };
+ }
+
+ public void registerInterceptors(EjbDescriptor<?> ejbDescriptor, InterceptorBindings interceptorBindings)
+ {
+ // do nothing
+ }
+
+ public void cleanup() {}
+
+}
Copied: ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockEjbDescriptor.java (from rev 3872, ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEjbDescriptor.java)
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockEjbDescriptor.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockEjbDescriptor.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -0,0 +1,201 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.mock;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+
+import javax.ejb.Local;
+import javax.ejb.MessageDriven;
+import javax.ejb.Remove;
+import javax.ejb.Singleton;
+import javax.ejb.Stateful;
+import javax.ejb.Stateless;
+
+import org.jboss.weld.ejb.spi.BusinessInterfaceDescriptor;
+import org.jboss.weld.ejb.spi.EjbDescriptor;
+
+public class MockEjbDescriptor<T> implements EjbDescriptor<T>
+{
+ private final Class<T> beanClass;
+ private final String ejbName;
+ private final List<BusinessInterfaceDescriptor<?>> localInterfaces;
+ private final HashSet<Method> removeMethods;
+
+ public static <T> MockEjbDescriptor<T> of(Class<T> type)
+ {
+ return new MockEjbDescriptor<T>(type);
+ }
+
+ private MockEjbDescriptor(final Class<T> type)
+ {
+ this.beanClass = type;
+ this.ejbName = type.getSimpleName();
+ this.localInterfaces = new ArrayList<BusinessInterfaceDescriptor<?>>();
+
+ Local localAnnotation = type.getAnnotation(Local.class);
+ if (localAnnotation != null)
+ {
+ for (final Class<?> clazz : localAnnotation.value())
+ {
+ localInterfaces.add(createBusinessInterfaceDescriptor(clazz));
+ }
+ }
+
+ for (final Class<?> clazz : type.getInterfaces())
+ {
+ if (clazz.isAnnotationPresent(Local.class))
+ {
+ localInterfaces.add(createBusinessInterfaceDescriptor(clazz));
+ }
+ }
+ // cope with EJB 3.1 style no-interface views
+ if (localInterfaces.size() == 0)
+ {
+ localInterfaces.add(createBusinessInterfaceDescriptor(type));
+ }
+ this.removeMethods = new HashSet<Method>();
+ for (final Method method : type.getMethods())
+ {
+ if (method.isAnnotationPresent(Remove.class))
+ {
+ removeMethods.add(method);
+ }
+ }
+ }
+
+ private BusinessInterfaceDescriptor<Object> createBusinessInterfaceDescriptor(final Class<?> clazz)
+ {
+ return new BusinessInterfaceDescriptor<Object>()
+ {
+
+ @SuppressWarnings("unchecked")
+ public Class<Object> getInterface()
+ {
+ return (Class<Object>) clazz;
+ }
+
+ public String getJndiName()
+ {
+ return clazz.getSimpleName() + "/local";
+ }
+
+ };
+ }
+
+ public String getEjbName()
+ {
+ return ejbName;
+ }
+
+ public Collection<BusinessInterfaceDescriptor<?>> getLocalBusinessInterfaces()
+ {
+ return localInterfaces;
+ }
+
+ public Iterable<BusinessInterfaceDescriptor<?>> getRemoteBusinessInterfaces()
+ {
+ return Collections.emptyList();
+ }
+
+ public Collection<Method> getRemoveMethods()
+ {
+
+ return removeMethods;
+ }
+
+ public Class<T> getBeanClass()
+ {
+ return beanClass;
+ }
+
+ public boolean isMessageDriven()
+ {
+ return beanClass.isAnnotationPresent(MessageDriven.class);
+ }
+
+ public boolean isSingleton()
+ {
+ return beanClass.isAnnotationPresent(Singleton.class);
+ }
+
+ public boolean isStateful()
+ {
+ return beanClass.isAnnotationPresent(Stateful.class);
+ }
+
+ public boolean isStateless()
+ {
+ return beanClass.isAnnotationPresent(Stateless.class);
+ }
+
+ public String getLocalJndiName()
+ {
+ return beanClass.getSimpleName() + "/local";
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder builder = new StringBuilder();
+ builder.append(getEjbName());
+ if (isStateful())
+ {
+ builder.append(" (SFSB)");
+ }
+ if (isStateless())
+ {
+ builder.append(" (SLSB)");
+ }
+ if (isSingleton())
+ {
+ builder.append(" (Singleton)");
+ }
+ if (isMessageDriven())
+ {
+ builder.append(" (MDB)");
+ }
+ builder.append("remove methods; " + removeMethods + "; ");
+ builder.append("; BeanClass: " + getBeanClass() + "; Local Business Interfaces: " + getLocalBusinessInterfaces());
+ return builder.toString();
+ }
+
+// @Override
+// public boolean equals(Object other)
+// {
+// if (other instanceof EjbDescriptor)
+// {
+// EjbDescriptor<T> that = (EjbDescriptor<T>) other;
+// return this.getBeanClass().equals(that.getBeanClass());
+// }
+// else
+// {
+// return false;
+// }
+// }
+//
+// @Override
+// public int hashCode()
+// {
+// return getEjbName().hashCode();
+// }
+
+}
Copied: ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockEjbInjectionServices.java (from rev 3872, ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEjbInjectionServices.java)
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockEjbInjectionServices.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockEjbInjectionServices.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.mock;
+
+import javax.enterprise.inject.spi.InjectionPoint;
+
+import org.jboss.weld.injection.spi.EjbInjectionServices;
+
+/**
+ * @author pmuir
+ *
+ */
+public class MockEjbInjectionServices implements EjbInjectionServices
+{
+
+ public Object resolveEjb(InjectionPoint injectionPoint)
+ {
+ return null;
+ }
+
+ public void cleanup() {}
+
+}
Copied: ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockHttpSession.java (from rev 3872, ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockHttpSession.java)
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockHttpSession.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockHttpSession.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -0,0 +1,161 @@
+package org.jboss.weld.mock;
+
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionContext;
+
+/**
+ * A mock implementation of the HttpSession interface for tests.
+ *
+ * @author Dan Allen
+ */
+public class MockHttpSession implements HttpSession
+{
+ private String id;
+
+ private ServletContext servletContext;
+
+ private Map<String, Object> attributes = new HashMap<String, Object>();
+
+ private boolean invalid = false;
+
+ private int maxInactiveInterval = 60;
+
+ private int lastAccessedTime = -1;
+
+ public MockHttpSession() {}
+
+ public MockHttpSession(String id)
+ {
+ this.id = id;
+ }
+
+ public MockHttpSession(String id, ServletContext servletContext)
+ {
+ this(id);
+ this.servletContext = servletContext;
+ }
+
+ public Object getAttribute(String name)
+ {
+ return attributes.get(name);
+ }
+
+ public Enumeration<String> getAttributeNames()
+ {
+ final Iterator<String> nameIterator = attributes.keySet().iterator();
+ return new Enumeration<String>()
+ {
+
+ public boolean hasMoreElements()
+ {
+ return nameIterator.hasNext();
+ }
+
+ public String nextElement()
+ {
+ return nameIterator.next();
+ }
+ };
+ }
+
+ public long getCreationTime()
+ {
+ return 0;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+
+ public long getLastAccessedTime()
+ {
+ return lastAccessedTime;
+ }
+
+ public int getMaxInactiveInterval()
+ {
+ return maxInactiveInterval;
+ }
+
+ public ServletContext getServletContext()
+ {
+ return servletContext;
+ }
+
+ @SuppressWarnings("deprecation")
+ public HttpSessionContext getSessionContext()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Object getValue(String name)
+ {
+ return getAttribute(name);
+ }
+
+ public String[] getValueNames()
+ {
+ return attributes.keySet().toArray(new String[0]);
+ }
+
+ public void invalidate()
+ {
+ attributes.clear();
+ invalid = true;
+ }
+
+ public boolean isNew()
+ {
+ return false;
+ }
+
+ public void putValue(String name, Object value)
+ {
+ setAttribute(name, value);
+ }
+
+ public void removeAttribute(String name)
+ {
+ attributes.remove(name);
+ }
+
+ public void removeValue(String name)
+ {
+ removeAttribute(name);
+ }
+
+ public void setAttribute(String name, Object value)
+ {
+ if (value == null)
+ {
+ removeAttribute(name);
+ }
+ else
+ {
+ attributes.put(name, value);
+ }
+ }
+
+ public void setMaxInactiveInterval(int seconds)
+ {
+ maxInactiveInterval = seconds;
+ }
+
+ public boolean isInvalid()
+ {
+ return invalid;
+ }
+
+ public void access()
+ {
+ lastAccessedTime = (int) System.currentTimeMillis();
+ }
+
+}
Copied: ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockJpaServices.java (from rev 3872, ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockJpaServices.java)
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockJpaServices.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockJpaServices.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -0,0 +1,66 @@
+/**
+ *
+ */
+package org.jboss.weld.mock;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.weld.bootstrap.spi.Deployment;
+import org.jboss.weld.injection.spi.JpaInjectionServices;
+
+public class MockJpaServices implements JpaInjectionServices
+{
+
+ private final Deployment deployment;
+
+ public MockJpaServices(Deployment deployment)
+ {
+ this.deployment = deployment;
+ }
+
+ public EntityManager resolvePersistenceContext(InjectionPoint injectionPoint)
+ {
+ return null;
+ }
+
+ public EntityManagerFactory resolvePersistenceUnit(InjectionPoint injectionPoint)
+ {
+ return null;
+ }
+
+ public Collection<Class<?>> discoverEntities()
+ {
+ Set<Class<?>> classes = new HashSet<Class<?>>();
+ for (BeanDeploymentArchive archive : deployment.getBeanDeploymentArchives())
+ {
+ discoverEntities(archive, classes);
+ }
+ return classes;
+ }
+
+ private void discoverEntities(BeanDeploymentArchive archive, Set<Class<?>> classes)
+ {
+ for (Class<?> clazz : archive.getBeanClasses())
+ {
+ if (clazz.isAnnotationPresent(Entity.class))
+ {
+ classes.add(clazz);
+ }
+ }
+ for (BeanDeploymentArchive child : archive.getBeanDeploymentArchives())
+ {
+ discoverEntities(child, classes);
+ }
+ }
+
+ public void cleanup() {}
+
+}
\ No newline at end of file
Copied: ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockLifecycle.java (from rev 3872, ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockLifecycle.java)
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockLifecycle.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockLifecycle.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -0,0 +1,24 @@
+package org.jboss.weld.mock;
+
+import org.jboss.weld.bootstrap.api.Lifecycle;
+
+public interface MockLifecycle extends Lifecycle
+{
+
+ public abstract void initialize();
+
+ public abstract void beginApplication();
+
+ public abstract void endApplication();
+
+ public abstract void resetContexts();
+
+ public abstract void beginRequest();
+
+ public abstract void endRequest();
+
+ public abstract void beginSession();
+
+ public abstract void endSession();
+
+}
\ No newline at end of file
Copied: ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockResourceLoader.java (from rev 3872, ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockResourceLoader.java)
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockResourceLoader.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockResourceLoader.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.mock;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Collection;
+
+import org.jboss.weld.resources.spi.ResourceLoader;
+import org.jboss.weld.resources.spi.ResourceLoadingException;
+import org.jboss.weld.util.collections.EnumerationList;
+
+public class MockResourceLoader implements ResourceLoader
+{
+
+ public Class<?> classForName(String name)
+ {
+ try
+ {
+ return Thread.currentThread().getContextClassLoader().loadClass(name);
+ }
+ catch (ClassNotFoundException e)
+ {
+ throw new ResourceLoadingException(e);
+ }
+ }
+
+ public URL getResource(String name)
+ {
+ return Thread.currentThread().getContextClassLoader().getResource(name);
+ }
+
+ public Collection<URL> getResources(String name)
+ {
+ try
+ {
+ return new EnumerationList<URL>(Thread.currentThread().getContextClassLoader().getResources(name));
+ }
+ catch (IOException e)
+ {
+ throw new ResourceLoadingException(e);
+ }
+ }
+
+ public void cleanup() {}
+
+}
Copied: ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockResourceServices.java (from rev 3872, ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockResourceServices.java)
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockResourceServices.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockResourceServices.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.mock;
+
+import javax.enterprise.inject.spi.InjectionPoint;
+
+import org.jboss.weld.injection.spi.ResourceInjectionServices;
+
+/**
+ * @author Pete Muir
+ *
+ */
+public class MockResourceServices implements ResourceInjectionServices
+{
+
+ public Object resolveResource(InjectionPoint injectionPoint)
+ {
+ return null;
+ }
+
+ public Object resolveResource(String jndiName, String mappedName)
+ {
+ return null;
+ }
+
+ public void cleanup() {}
+
+}
Copied: ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockSecurityServices.java (from rev 3872, ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockSecurityServices.java)
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockSecurityServices.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockSecurityServices.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.mock;
+
+import java.security.Principal;
+
+import org.jboss.weld.security.spi.SecurityServices;
+
+/**
+ * @author pmuir
+ *
+ */
+public class MockSecurityServices implements SecurityServices
+{
+
+ /* (non-Javadoc)
+ * @see org.jboss.webbeans.security.spi.SecurityServices#getPrincipal()
+ */
+ public Principal getPrincipal()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void cleanup() {}
+
+}
Copied: ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockServletContext.java (from rev 3872, ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockServletContext.java)
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockServletContext.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockServletContext.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -0,0 +1,558 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.mock;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+/**
+ * Mock implementation of the servlet context for testing purposes. This implementation supports all
+ * of the standard context methods except that request dispatching just indicates what is being
+ * dispatched to, rather than doing the actual dispatch.
+ * <p>
+ * The context can be configured with a path parameter that should point to an absolute directory
+ * location that represents the place where the contents of the WAR bundle are located. Setting this
+ * value allows all of the resource location functionality to work as in a fully functioning web
+ * application. This value is not set then not resource location functionality will work and instead
+ * null will always be returned.
+ *
+ * Adapted from Apache Wicket
+ *
+ * @author Chris Turner (Wicket)
+ */
+public class MockServletContext implements ServletContext
+{
+ private final Map<String, Object> attributes = new HashMap<String, Object>();
+
+ private final Map<String, String> initParameters = new HashMap<String, String>();
+
+ /** Map of mime types */
+ private final Map<String, String> mimeTypes = new HashMap<String, String>();
+
+ private File webappRoot;
+
+ /**
+ * Create the mock object. As part of the creation, the context sets the root directory where
+ * web application content is stored. This must be an ABSOLUTE directory relative to where the
+ * tests are being executed. For example: <code>System.getProperty("user.dir") +
+ * "/src/webapp"</code>
+ *
+ * @param application
+ * The application that this context is for
+ * @param path
+ * The path to the root of the web application
+ */
+ public MockServletContext(final String path)
+ {
+ webappRoot = null;
+ if (path != null)
+ {
+ webappRoot = new File(path);
+ if (!webappRoot.exists() || !webappRoot.isDirectory())
+ {
+ //log.warn("WARNING: The webapp root directory is invalid: " + path);
+ webappRoot = null;
+ }
+ }
+
+ // assume we're running in maven or an eclipse project created by maven,
+ // so the sessions directory will be created inside the target directory,
+ // and will be cleaned up with a mvn clean
+
+ File file = new File("target/work/");
+ file.mkdirs();
+ attributes.put("javax.servlet.context.tempdir", file);
+
+ mimeTypes.put("html", "text/html");
+ mimeTypes.put("htm", "text/html");
+ mimeTypes.put("css", "text/css");
+ mimeTypes.put("xml", "text/xml");
+ mimeTypes.put("js", "text/plain");
+ mimeTypes.put("gif", "image/gif");
+ mimeTypes.put("jpg", "image/jpeg");
+ mimeTypes.put("png", "image/png");
+ }
+
+ /**
+ * Add an init parameter.
+ *
+ * @param name
+ * The parameter name
+ * @param value
+ * The parameter value
+ */
+ public void addInitParameter(final String name, final String value)
+ {
+ initParameters.put(name, value);
+ }
+
+ // Configuration methods
+
+ /**
+ * Add a new recognized mime type.
+ *
+ * @param fileExtension
+ * The file extension (e.g. "jpg")
+ * @param mimeType
+ * The mime type (e.g. "image/jpeg")
+ */
+ public void addMimeType(final String fileExtension, final String mimeType)
+ {
+ mimeTypes.put(fileExtension, mimeType);
+ }
+
+ /**
+ * Get an attribute with the given name.
+ *
+ * @param name
+ * The attribute name
+ * @return The value, or null
+ */
+ public Object getAttribute(final String name)
+ {
+ return attributes.get(name);
+ }
+
+ /**
+ * Get all of the attribute names.
+ *
+ * @return The attribute names
+ */
+ public Enumeration<String> getAttributeNames()
+ {
+ return Collections.enumeration(attributes.keySet());
+ }
+
+ // ServletContext interface methods
+
+ /**
+ * Get the context for the given URL path
+ *
+ * @param name
+ * The url path
+ * @return Always returns this
+ */
+ public ServletContext getContext(String name)
+ {
+ return this;
+ }
+
+ /**
+ * Get the init parameter with the given name.
+ *
+ * @param name
+ * The name
+ * @return The parameter, or null if no such parameter
+ */
+ public String getInitParameter(final String name)
+ {
+ return initParameters.get(name);
+ }
+
+ /**
+ * Get the name of all of the init parameters.
+ *
+ * @return The init parameter names
+ */
+ public Enumeration<String> getInitParameterNames()
+ {
+ return Collections.enumeration(initParameters.keySet());
+ }
+
+ /**
+ * @return Always 2
+ */
+ public int getMajorVersion()
+ {
+ return 2;
+ }
+
+ /**
+ * Get the mime type for the given file. Uses a hardcoded map of mime types set at
+ * Initialization time.
+ *
+ * @param name
+ * The name to get the mime type for
+ * @return The mime type
+ */
+ public String getMimeType(final String name)
+ {
+ int index = name.lastIndexOf('.');
+ if (index == -1 || index == (name.length() - 1))
+ {
+ return null;
+ }
+ else
+ {
+ return mimeTypes.get(name.substring(index + 1));
+ }
+ }
+
+ /**
+ * @return Always 3
+ */
+ public int getMinorVersion()
+ {
+ return 3;
+ }
+
+ /**
+ * Wicket does not use the RequestDispatcher, so this implementation just returns a dummy value.
+ *
+ * @param name
+ * The name of the servlet or JSP
+ * @return The dispatcher
+ */
+ public RequestDispatcher getNamedDispatcher(final String name)
+ {
+ return getRequestDispatcher(name);
+ }
+
+ /**
+ * Get the real file path of the given resource name.
+ *
+ * @param name
+ * The name
+ * @return The real path or null
+ */
+ public String getRealPath(String name)
+ {
+ if (webappRoot == null)
+ {
+ return null;
+ }
+
+ if (name.startsWith("/"))
+ {
+ name = name.substring(1);
+ }
+
+ File f = new File(webappRoot, name);
+ if (!f.exists())
+ {
+ return null;
+ }
+ else
+ {
+ return f.getPath();
+ }
+ }
+
+ /**
+ * Wicket does not use the RequestDispatcher, so this implementation just returns a dummy value.
+ *
+ * @param name
+ * The name of the resource to get the dispatcher for
+ * @return The dispatcher
+ */
+ public RequestDispatcher getRequestDispatcher(final String name)
+ {
+ return new RequestDispatcher()
+ {
+ public void forward(ServletRequest servletRequest, ServletResponse servletResponse)
+ throws IOException
+ {
+ servletResponse.getWriter().write("FORWARD TO RESOURCE: " + name);
+ }
+
+ public void include(ServletRequest servletRequest, ServletResponse servletResponse)
+ throws IOException
+ {
+ servletResponse.getWriter().write("INCLUDE OF RESOURCE: " + name);
+ }
+ };
+ }
+
+ /**
+ * Get the URL for a particular resource that is relative to the web app root directory.
+ *
+ * @param name
+ * The name of the resource to get
+ * @return The resource, or null if resource not found
+ * @throws MalformedURLException
+ * If the URL is invalid
+ */
+ public URL getResource(String name) throws MalformedURLException
+ {
+ if (webappRoot == null)
+ {
+ return null;
+ }
+
+ if (name.startsWith("/"))
+ {
+ name = name.substring(1);
+ }
+
+ File f = new File(webappRoot, name);
+ if (!f.exists())
+ {
+ return null;
+ }
+ else
+ {
+ return f.toURI().toURL();
+ }
+ }
+
+ /**
+ * Get an input stream for a particular resource that is relative to the web app root directory.
+ *
+ * @param name
+ * The name of the resource to get
+ * @return The input stream for the resource, or null of resource is not found
+ */
+ public InputStream getResourceAsStream(String name)
+ {
+ if (webappRoot == null)
+ {
+ return null;
+ }
+
+ if (name.startsWith("/"))
+ {
+ name = name.substring(1);
+ }
+
+ File f = new File(webappRoot, name);
+ if (!f.exists())
+ {
+ return null;
+ }
+ else
+ {
+ try
+ {
+ return new FileInputStream(f);
+ }
+ catch (FileNotFoundException e)
+ {
+ e.printStackTrace();
+ return null;
+ }
+ }
+ }
+
+ /**
+ * Get the resource paths starting from the web app root directory and then relative to the the
+ * given name.
+ *
+ * @param name
+ * The starting name
+ * @return The set of resource paths at this location
+ */
+ public Set<String> getResourcePaths(String name)
+ {
+ if (webappRoot == null)
+ {
+ return new HashSet<String>();
+ }
+
+ if (name.startsWith("/"))
+ {
+ name = name.substring(1);
+ }
+ if (name.endsWith("/"))
+ {
+ name = name.substring(0, name.length() - 1);
+ }
+ String[] elements = null;
+ if (name.trim().length() == 0)
+ {
+ elements = new String[0];
+ }
+ else
+ {
+ elements = name.split("/");
+ }
+
+ File current = webappRoot;
+ for (int i = 0; i < elements.length; i++)
+ {
+ File[] files = current.listFiles();
+ boolean match = false;
+ for (int f = 0; f < files.length; f++)
+ {
+ if (files[f].getName().equals(elements[i]) && files[f].isDirectory())
+ {
+ current = files[f];
+ match = true;
+ break;
+ }
+ }
+ if (!match)
+ {
+ return null;
+ }
+ }
+
+ File[] files = current.listFiles();
+ Set<String> result = new HashSet<String>();
+ int stripLength = webappRoot.getPath().length();
+ for (int f = 0; f < files.length; f++)
+ {
+ String s = files[f].getPath().substring(stripLength).replace('\\', '/');
+ if (files[f].isDirectory())
+ {
+ s = s + "/";
+ }
+ result.add(s);
+ }
+ return result;
+ }
+
+ /**
+ * Get the server info.
+ *
+ * @return The server info
+ */
+ public String getServerInfo()
+ {
+ return "Wicket Mock Test Environment v1.0";
+ }
+
+ /**
+ * NOT USED - Servlet Spec requires that this always returns null.
+ *
+ * @param name
+ * Not used
+ * @return null
+ * @throws ServletException
+ * Not used
+ */
+ public Servlet getServlet(String name) throws ServletException
+ {
+ return null;
+ }
+
+ /**
+ * Return the name of the servlet context.
+ *
+ * @return The name
+ */
+ public String getServletContextName()
+ {
+ return "Mock";
+ }
+
+ /**
+ * NOT USED - Servlet spec requires that this always returns null.
+ *
+ * @return null
+ */
+ public Enumeration<String> getServletNames()
+ {
+ return null;
+ }
+
+ /**
+ * NOT USED - Servlet spec requires that this always returns null.
+ *
+ * @return null
+ */
+ public Enumeration<Servlet> getServlets()
+ {
+ return null;
+ }
+
+ /**
+ * As part of testing we always log to the console.
+ *
+ * @param e
+ * The exception to log
+ * @param msg
+ * The message to log
+ */
+ public void log(Exception e, String msg)
+ {
+ //log.error(msg, e);
+ }
+
+ /**
+ * As part of testing we always log to the console.
+ *
+ * @param msg
+ * The message to log
+ */
+ public void log(String msg)
+ {
+ //log.info(msg);
+ }
+
+ /**
+ * As part of testing we always log to the console.
+ *
+ * @param msg
+ * The message to log
+ * @param cause
+ * The cause exception
+ */
+ public void log(String msg, Throwable cause)
+ {
+ //log.error(msg, cause);
+ }
+
+ /**
+ * Remove an attribute with the given name.
+ *
+ * @param name
+ * The name
+ */
+ public void removeAttribute(final String name)
+ {
+ attributes.remove(name);
+ }
+
+ /**
+ * Set an attribute.
+ *
+ * @param name
+ * The name of the attribute
+ * @param o
+ * The value
+ */
+ public void setAttribute(final String name, final Object o)
+ {
+ attributes.put(name, o);
+ }
+
+ /**
+ * @return context path
+ */
+ public String getContextPath()
+ {
+ return "";
+ }
+}
Copied: ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockServletLifecycle.java (from rev 3872, ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockServletLifecycle.java)
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockServletLifecycle.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockServletLifecycle.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -0,0 +1,149 @@
+package org.jboss.weld.mock;
+
+import org.jboss.weld.bootstrap.WebBeansBootstrap;
+import org.jboss.weld.bootstrap.api.Environment;
+import org.jboss.weld.bootstrap.api.Environments;
+import org.jboss.weld.bootstrap.api.Lifecycle;
+import org.jboss.weld.bootstrap.api.helpers.ForwardingLifecycle;
+import org.jboss.weld.context.ContextLifecycle;
+import org.jboss.weld.context.api.BeanStore;
+import org.jboss.weld.context.api.helpers.ConcurrentHashMapBeanStore;
+import org.jboss.weld.resources.spi.ResourceLoader;
+import org.jboss.weld.servlet.api.ServletServices;
+
+public class MockServletLifecycle extends ForwardingLifecycle implements MockLifecycle
+{
+ private static final ResourceLoader MOCK_RESOURCE_LOADER = new MockResourceLoader();
+
+ private final WebBeansBootstrap bootstrap;
+ private final MockDeployment deployment;
+ private final BeanStore applicationBeanStore;
+ private final BeanStore sessionBeanStore;
+ private final BeanStore requestBeanStore;
+
+ private Lifecycle lifecycle;
+
+ public MockServletLifecycle()
+ {
+ this.deployment = new MockDeployment();
+ if (deployment == null)
+ {
+ throw new IllegalStateException("No WebBeanDiscovery is available");
+ }
+ this.bootstrap = new WebBeansBootstrap();
+ this.deployment.getServices().add(ResourceLoader.class, MOCK_RESOURCE_LOADER);
+ this.deployment.getServices().add(ServletServices.class, new MockServletServices(deployment.getArchive()));
+ this.applicationBeanStore = new ConcurrentHashMapBeanStore();
+ this.sessionBeanStore = new ConcurrentHashMapBeanStore();
+ this.requestBeanStore = new ConcurrentHashMapBeanStore();
+ }
+
+ protected BeanStore getSessionBeanStore()
+ {
+ return sessionBeanStore;
+ }
+
+ protected BeanStore getRequestBeanStore()
+ {
+ return requestBeanStore;
+ }
+
+ protected BeanStore getApplicationBeanStore()
+ {
+ return applicationBeanStore;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.webbeans.mock.MockLifecycle#initialize()
+ */
+ public void initialize()
+ {
+ try
+ {
+ bootstrap.startContainer(getEnvironment(), getDeployment(), getApplicationBeanStore());
+ }
+ finally
+ {
+ lifecycle = deployment.getServices().get(ContextLifecycle.class);
+ }
+ }
+
+ @Override
+ protected Lifecycle delegate()
+ {
+ return lifecycle;
+ }
+
+ protected MockDeployment getDeployment()
+ {
+ return deployment;
+ }
+
+ protected WebBeansBootstrap getBootstrap()
+ {
+ return bootstrap;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.webbeans.mock.MockLifecycle#beginApplication()
+ */
+ public void beginApplication()
+ {
+ bootstrap.startInitialization().deployBeans().validateBeans().endInitialization();
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.webbeans.mock.MockLifecycle#endApplication()
+ */
+ @Override
+ public void endApplication()
+ {
+ bootstrap.shutdown();
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.webbeans.mock.MockLifecycle#resetContexts()
+ */
+ public void resetContexts()
+ {
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.webbeans.mock.MockLifecycle#beginRequest()
+ */
+ public void beginRequest()
+ {
+ super.beginRequest("Mock", getRequestBeanStore());
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.webbeans.mock.MockLifecycle#endRequest()
+ */
+ public void endRequest()
+ {
+ super.endRequest("Mock", getRequestBeanStore());
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.webbeans.mock.MockLifecycle#beginSession()
+ */
+ public void beginSession()
+ {
+ super.restoreSession("Mock", getSessionBeanStore());
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.webbeans.mock.MockLifecycle#endSession()
+ */
+ public void endSession()
+ {
+ // TODO Conversation handling breaks this :-(
+ //super.endSession("Mock", sessionBeanStore);
+ }
+
+ protected Environment getEnvironment()
+ {
+ return Environments.SERVLET;
+ }
+}
Copied: ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockServletServices.java (from rev 3872, ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockServletServices.java)
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockServletServices.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockServletServices.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.mock;
+
+import javax.servlet.ServletContext;
+
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.weld.servlet.api.ServletServices;
+
+/**
+ * @author pmuir
+ *
+ */
+public class MockServletServices implements ServletServices
+{
+
+ private final BeanDeploymentArchive beanDeploymentArchive;
+
+ public MockServletServices(BeanDeploymentArchive beanDeploymentArchive)
+ {
+ this.beanDeploymentArchive = beanDeploymentArchive;
+ }
+
+ public BeanDeploymentArchive getBeanDeploymentArchive(ServletContext ctx)
+ {
+ if (ctx instanceof MockServletContext)
+ {
+ return beanDeploymentArchive;
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ public void cleanup() {}
+
+}
Copied: ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockTransactionServices.java (from rev 3872, ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockTransactionServices.java)
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockTransactionServices.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockTransactionServices.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.weld.mock;
+
+import javax.transaction.Synchronization;
+import javax.transaction.UserTransaction;
+
+import org.jboss.weld.transaction.spi.TransactionServices;
+
+/**
+ * A mock version of TransactionServices for RI unit tests. Since
+ * no JTA transaction can be active for these unit tests, all
+ * methods here are empty.
+ *
+ * @author David Allen
+ *
+ */
+public class MockTransactionServices implements TransactionServices
+{
+
+ public boolean isTransactionActive()
+ {
+ return false;
+ }
+
+ public void registerSynchronization(Synchronization synchronizedObserver)
+ {
+ }
+
+ public UserTransaction getUserTransaction()
+ {
+ return null;
+ }
+
+ public void cleanup() {}
+
+}
Copied: ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockValidationServices.java (from rev 3872, ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockValidationServices.java)
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockValidationServices.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockValidationServices.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.mock;
+
+import javax.validation.ValidatorFactory;
+
+import org.jboss.weld.validation.spi.ValidationServices;
+
+/**
+ * @author pmuir
+ *
+ */
+public class MockValidationServices implements ValidationServices
+{
+
+ public ValidatorFactory getDefaultValidatorFactory()
+ {
+ return null;
+ }
+
+ public void cleanup() {}
+
+}
Copied: ri/trunk/tests/src/main/java/org/jboss/weld/mock/TestContainer.java (from rev 3872, ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/TestContainer.java)
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/weld/mock/TestContainer.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/mock/TestContainer.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -0,0 +1,143 @@
+package org.jboss.weld.mock;
+
+import java.net.URL;
+import java.util.Collection;
+
+import org.jboss.weld.BeanManagerImpl;
+
+/**
+ * Control of the container, used for tests. Wraps up common operations.
+ *
+ * @author pmuir
+ *
+ */
+public class TestContainer
+{
+
+ public static class Status
+ {
+
+ private final Exception deploymentException;
+
+ public Status(Exception deploymentException)
+ {
+ this.deploymentException = deploymentException;
+ }
+
+ public Exception getDeploymentException()
+ {
+ return deploymentException;
+ }
+
+ public boolean isSuccess()
+ {
+ return deploymentException == null;
+ }
+
+ }
+
+ private final MockServletLifecycle lifecycle;
+ private final Collection<Class<?>> classes;
+ private final Collection<URL> beansXml;
+
+ /**
+ * Create a container, specifying the classes and beans.xml to deploy
+ *
+ * @param lifecycle
+ * @param classes
+ * @param beansXml
+ */
+ public TestContainer(MockServletLifecycle lifecycle, Collection<Class<?>> classes, Collection<URL> beansXml)
+ {
+ this.lifecycle = lifecycle;
+ this.classes = classes;
+ this.beansXml = beansXml;
+ }
+
+ /**
+ * Start the container, returning the container state
+ *
+ * @return
+ */
+ public Status startContainerAndReturnStatus()
+ {
+ try
+ {
+ startContainer();
+ }
+ catch (Exception e)
+ {
+ return new Status(e);
+ }
+ return new Status(null);
+ }
+
+ public void startContainer()
+ {
+ MockBeanDeploymentArchive archive = lifecycle.getDeployment().getArchive();
+ archive.setBeanClasses(classes);
+ if (beansXml != null)
+ {
+ archive.setBeansXmlFiles(beansXml);
+ }
+ lifecycle.initialize();
+ lifecycle.beginApplication();
+ }
+
+ /**
+ * Get the context lifecycle, allowing fine control over the contexts' state
+ *
+ * @return
+ */
+ public MockServletLifecycle getLifecycle()
+ {
+ return lifecycle;
+ }
+
+ public BeanManagerImpl getBeanManager()
+ {
+ return lifecycle.getBootstrap().getManager(getDeployment().getArchive());
+ }
+
+ public MockDeployment getDeployment()
+ {
+ return lifecycle.getDeployment();
+ }
+
+ /**
+ * Utility method which ensures a request is active and available for use
+ *
+ */
+ public void ensureRequestActive()
+ {
+ if (!lifecycle.isSessionActive())
+ {
+ lifecycle.beginSession();
+ }
+ if (!lifecycle.isRequestActive())
+ {
+ lifecycle.beginRequest();
+ }
+ }
+
+ /**
+ * Clean up the container, ending any active contexts
+ *
+ */
+ public void stopContainer()
+ {
+ if (lifecycle.isRequestActive())
+ {
+ lifecycle.endRequest();
+ }
+ if (lifecycle.isSessionActive())
+ {
+ lifecycle.endSession();
+ }
+ if (lifecycle.isApplicationActive())
+ {
+ lifecycle.endApplication();
+ }
+ }
+
+}
\ No newline at end of file
Copied: ri/trunk/tests/src/main/java/org/jboss/weld/mock/cluster (from rev 3872, ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/cluster)
Modified: ri/trunk/tests/src/main/java/org/jboss/weld/mock/cluster/AbstractClusterTest.java
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/cluster/AbstractClusterTest.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/mock/cluster/AbstractClusterTest.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.mock.cluster;
+package org.jboss.weld.mock.cluster;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -7,12 +7,12 @@
import java.io.ObjectOutputStream;
import java.util.Collection;
-import org.jboss.webbeans.BeanManagerImpl;
-import org.jboss.webbeans.bootstrap.api.SingletonProvider;
-import org.jboss.webbeans.context.ContextLifecycle;
-import org.jboss.webbeans.context.api.BeanStore;
-import org.jboss.webbeans.mock.MockEELifecycle;
-import org.jboss.webbeans.mock.TestContainer;
+import org.jboss.weld.BeanManagerImpl;
+import org.jboss.weld.bootstrap.api.SingletonProvider;
+import org.jboss.weld.context.ContextLifecycle;
+import org.jboss.weld.context.api.BeanStore;
+import org.jboss.weld.mock.MockEELifecycle;
+import org.jboss.weld.mock.TestContainer;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
Modified: ri/trunk/tests/src/main/java/org/jboss/weld/mock/cluster/SwitchableMockEELifecycle.java
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/cluster/SwitchableMockEELifecycle.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/mock/cluster/SwitchableMockEELifecycle.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -1,10 +1,10 @@
-package org.jboss.webbeans.mock.cluster;
+package org.jboss.weld.mock.cluster;
import java.util.HashMap;
import java.util.Map;
-import org.jboss.webbeans.context.api.BeanStore;
-import org.jboss.webbeans.mock.MockEELifecycle;
+import org.jboss.weld.context.api.BeanStore;
+import org.jboss.weld.mock.MockEELifecycle;
public class SwitchableMockEELifecycle extends MockEELifecycle
{
Modified: ri/trunk/tests/src/main/java/org/jboss/weld/mock/cluster/SwitchableSingletonProvider.java
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/cluster/SwitchableSingletonProvider.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/mock/cluster/SwitchableSingletonProvider.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -1,10 +1,10 @@
-package org.jboss.webbeans.mock.cluster;
+package org.jboss.weld.mock.cluster;
import java.util.Hashtable;
import java.util.Map;
-import org.jboss.webbeans.bootstrap.api.Singleton;
-import org.jboss.webbeans.bootstrap.api.SingletonProvider;
+import org.jboss.weld.bootstrap.api.Singleton;
+import org.jboss.weld.bootstrap.api.SingletonProvider;
public class SwitchableSingletonProvider extends SingletonProvider
{
Copied: ri/trunk/tests/src/main/java/org/jboss/weld/mock/el (from rev 3872, ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/el)
Modified: ri/trunk/tests/src/main/java/org/jboss/weld/mock/el/EL.java
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/el/EL.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/mock/el/EL.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.mock.el;
+package org.jboss.weld.mock.el;
import javax.el.ArrayELResolver;
import javax.el.BeanELResolver;
@@ -30,9 +30,9 @@
import javax.el.ResourceBundleELResolver;
import javax.el.VariableMapper;
-import org.jboss.webbeans.BeanManagerImpl;
-import org.jboss.webbeans.el.WebBeansELContextListener;
-import org.jboss.webbeans.el.WebBeansExpressionFactory;
+import org.jboss.weld.BeanManagerImpl;
+import org.jboss.weld.el.WebBeansELContextListener;
+import org.jboss.weld.el.WebBeansExpressionFactory;
import com.sun.el.ExpressionFactoryImpl;
import com.sun.el.lang.FunctionMapperImpl;
Copied: ri/trunk/tests/src/main/java/org/jboss/weld/test/AbstractWebBeansTest.java (from rev 3872, ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java)
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/weld/test/AbstractWebBeansTest.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/test/AbstractWebBeansTest.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -0,0 +1,204 @@
+package org.jboss.weld.test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+
+import javax.el.ELContext;
+import javax.enterprise.inject.TypeLiteral;
+import javax.enterprise.inject.spi.Bean;
+import javax.servlet.ServletContext;
+
+import org.jboss.testharness.AbstractTest;
+import org.jboss.testharness.impl.runner.servlet.ServletTestRunner;
+import org.jboss.weld.BeanManagerImpl;
+import org.jboss.weld.mock.MockServletContext;
+import org.jboss.weld.mock.el.EL;
+import org.jboss.weld.servlet.ServletHelper;
+import org.jboss.weld.util.collections.EnumerationList;
+import org.testng.ITestContext;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeSuite;
+
+public abstract class AbstractWebBeansTest extends AbstractTest
+{
+
+ private ServletContext servletContext;
+
+ @Override
+ @BeforeSuite
+ public void beforeSuite(ITestContext context) throws Exception
+ {
+ if (!isInContainer())
+ {
+ getCurrentConfiguration().getExtraPackages().add(AbstractWebBeansTest.class.getPackage().getName());
+ getCurrentConfiguration().getExtraPackages().add(EL.class.getPackage().getName());
+ //getCurrentConfiguration().getExtraPackages().add(MockServletContext.class.getPackage().getName());
+ }
+ super.beforeSuite(context);
+ }
+
+ @Override
+ @BeforeClass
+ public void beforeClass() throws Throwable
+ {
+ super.beforeClass();
+ if (isInContainer())
+ {
+ servletContext = ServletTestRunner.getCurrentServletContext();
+ }
+ else
+ {
+ servletContext = new MockServletContext("");
+ }
+
+ }
+
+ @Override
+ @AfterClass
+ public void afterClass() throws Exception
+ {
+ servletContext = null;
+ super.afterClass();
+ }
+
+ /**
+ * Checks if all annotations are in a given set of annotations
+ *
+ * @param annotations The annotation set
+ * @param annotationTypes The annotations to match
+ * @return True if match, false otherwise
+ */
+ public boolean annotationSetMatches(Set<? extends Annotation> annotations, Class<? extends Annotation>... annotationTypes)
+ {
+ List<Class<? extends Annotation>> annotationTypeList = new ArrayList<Class<? extends Annotation>>();
+ annotationTypeList.addAll(Arrays.asList(annotationTypes));
+ for (Annotation annotation : annotations)
+ {
+ if (annotationTypeList.contains(annotation.annotationType()))
+ {
+ annotationTypeList.remove(annotation.annotationType());
+ }
+ else
+ {
+ return false;
+ }
+ }
+ return annotationTypeList.size() == 0;
+ }
+
+ protected Iterable<URL> getResources(String name)
+ {
+ if (name.startsWith("/"))
+ {
+ name = name.substring(1);
+ }
+ else
+ {
+ name = getClass().getPackage().getName().replace(".", "/") + "/" + name;
+ }
+ try
+ {
+ return new EnumerationList<URL>(getClass().getClassLoader().getResources(name));
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException("Error loading resource from classloader" + name, e);
+ }
+ }
+
+ protected byte[] serialize(Object instance) throws IOException
+ {
+ ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+ ObjectOutputStream out = new ObjectOutputStream(bytes);
+ out.writeObject(instance);
+ return bytes.toByteArray();
+ }
+
+ protected Object deserialize(byte[] bytes) throws IOException, ClassNotFoundException
+ {
+ ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes));
+ return in.readObject();
+ }
+
+ protected BeanManagerImpl getCurrentManager()
+ {
+ return ServletHelper.getModuleBeanManager(servletContext);
+ }
+
+ public boolean isExceptionInHierarchy(Throwable exception, Class<? extends Throwable> expectedException )
+ {
+ while (exception != null)
+ {
+ if (exception.getClass().equals(expectedException))
+ {
+ return true;
+ }
+ exception = exception.getCause();
+ }
+ return false;
+ }
+
+ public <T> Bean<T> getBean(Type beanType, Annotation... bindings)
+ {
+ Set<Bean<?>> beans = getCurrentManager().getBeans(beanType, bindings);
+ if (beans.size() > 1)
+ {
+ throw new RuntimeException("More than one bean resolved to " + beanType + " with bindings " + Arrays.asList(bindings));
+ }
+ if (beans.size() == 0)
+ {
+ throw new RuntimeException("No beans resolved to " + beanType + " with bindings " + Arrays.asList(bindings));
+ }
+ @SuppressWarnings("unchecked")
+ Bean<T> bean = (Bean<T>) beans.iterator().next();
+ return bean;
+ }
+
+ @SuppressWarnings("unchecked")
+ public <T> Set<Bean<T>> getBeans(Class<T> type, Annotation... bindings)
+ {
+ return (Set) getCurrentManager().getBeans(type, bindings);
+ }
+
+ @SuppressWarnings("unchecked")
+ public <T> Set<Bean<T>> getBeans(TypeLiteral<T> type, Annotation... bindings)
+ {
+ return (Set)getCurrentManager().getBeans(type.getType(), bindings);
+ }
+
+ @SuppressWarnings("unchecked")
+ public <T> T createContextualInstance(Class<T> beanType, Annotation... bindings)
+ {
+ return (T) createContextualInstance((Type) beanType, bindings);
+ }
+
+ public Object createContextualInstance(Type beanType, Annotation... bindings)
+ {
+ Bean<?> bean = getBean(beanType, bindings);
+ return getCurrentManager().getReference(bean, beanType, getCurrentManager().createCreationalContext(bean));
+ }
+
+ @SuppressWarnings("unchecked")
+ public <T> T evaluateValueExpression(String expression, Class<T> expectedType)
+ {
+ ELContext elContext = EL.createELContext(getCurrentManager().getCurrent());
+ return (T) EL.EXPRESSION_FACTORY.createValueExpression(elContext, expression, expectedType).getValue(elContext);
+ }
+
+ protected String getPath(String viewId)
+ {
+ return getContextPath() + viewId;
+ }
+
+}
Copied: ri/trunk/tests/src/main/java/org/jboss/weld/test/harness (from rev 3872, ri/trunk/tests/src/main/java/org/jboss/webbeans/test/harness)
Modified: ri/trunk/tests/src/main/java/org/jboss/weld/test/harness/AbstractStandaloneContainersImpl.java
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/webbeans/test/harness/AbstractStandaloneContainersImpl.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/test/harness/AbstractStandaloneContainersImpl.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -1,13 +1,13 @@
-package org.jboss.webbeans.test.harness;
+package org.jboss.weld.test.harness;
import java.net.URL;
import java.util.Collection;
import org.jboss.testharness.api.DeploymentException;
import org.jboss.testharness.spi.StandaloneContainers;
-import org.jboss.webbeans.mock.MockServletLifecycle;
-import org.jboss.webbeans.mock.TestContainer;
-import org.jboss.webbeans.mock.TestContainer.Status;
+import org.jboss.weld.mock.MockServletLifecycle;
+import org.jboss.weld.mock.TestContainer;
+import org.jboss.weld.mock.TestContainer.Status;
public abstract class AbstractStandaloneContainersImpl implements StandaloneContainers
{
Modified: ri/trunk/tests/src/main/java/org/jboss/weld/test/harness/ServletLifecycleContainersImpl.java
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/webbeans/test/harness/ServletLifecycleContainersImpl.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/test/harness/ServletLifecycleContainersImpl.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -1,6 +1,6 @@
-package org.jboss.webbeans.test.harness;
+package org.jboss.weld.test.harness;
-import org.jboss.webbeans.mock.MockServletLifecycle;
+import org.jboss.weld.mock.MockServletLifecycle;
public class ServletLifecycleContainersImpl extends AbstractStandaloneContainersImpl
{
Modified: ri/trunk/tests/src/main/java/org/jboss/weld/test/harness/StandaloneContainersImpl.java
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/webbeans/test/harness/StandaloneContainersImpl.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/tests/src/main/java/org/jboss/weld/test/harness/StandaloneContainersImpl.java 2009-10-08 03:57:13 UTC (rev 3882)
@@ -1,8 +1,8 @@
-package org.jboss.webbeans.test.harness;
+package org.jboss.weld.test.harness;
import org.jboss.testharness.spi.StandaloneContainers;
-import org.jboss.webbeans.mock.MockEELifecycle;
-import org.jboss.webbeans.mock.MockServletLifecycle;
+import org.jboss.weld.mock.MockEELifecycle;
+import org.jboss.weld.mock.MockServletLifecycle;
public class StandaloneContainersImpl extends AbstractStandaloneContainersImpl implements StandaloneContainers
{
14 years, 7 months
- 1
- 0
Weld SVN: r3881 - in ri/trunk/porting-package/src/main/java/org/jboss: weld and 1 other directories.
by weld-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-10-07 23:49:36 -0400 (Wed, 07 Oct 2009)
New Revision: 3881
Added:
ri/trunk/porting-package/src/main/java/org/jboss/weld/
ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/
Removed:
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/
Modified:
ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/BeansImpl.java
ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ContextsImpl.java
ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ELImpl.java
ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ManagersImpl.java
Log:
refactored porting package packages
Copied: ri/trunk/porting-package/src/main/java/org/jboss/weld/tck (from rev 3872, ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck)
Modified: ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/BeansImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/BeansImpl.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/BeansImpl.java 2009-10-08 03:49:36 UTC (rev 3881)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck;
+package org.jboss.weld.tck;
import org.jboss.jsr299.tck.spi.Beans;
import org.jboss.webbeans.util.Proxies;
Modified: ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ContextsImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ContextsImpl.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ContextsImpl.java 2009-10-08 03:49:36 UTC (rev 3881)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck;
+package org.jboss.weld.tck;
import org.jboss.jsr299.tck.spi.Contexts;
import org.jboss.webbeans.Container;
Modified: ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ELImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ELImpl.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ELImpl.java 2009-10-08 03:49:36 UTC (rev 3881)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck;
+package org.jboss.weld.tck;
import javax.el.ELContext;
Modified: ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ManagersImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ManagersImpl.java 2009-10-08 03:49:36 UTC (rev 3881)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.tck;
+package org.jboss.weld.tck;
import javax.enterprise.inject.UnproxyableResolutionException;
import javax.enterprise.inject.spi.BeanManager;
14 years, 7 months
- 1
- 0
Weld SVN: r3880 - in ri/trunk/inject-tck-runner/src/test/java/org/jboss: weld and 3 other directories.
by weld-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-10-07 23:44:07 -0400 (Wed, 07 Oct 2009)
New Revision: 3880
Added:
ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/
ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/
ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/
ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/AbstractProducer.java
ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/Any.java
ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/AtInjectTCK.java
ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/BeanDisambiguator.java
ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/DriversSeatProducer.java
ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/Plain.java
ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/Spare.java
ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/SpareTireProducer.java
ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/
Removed:
ri/trunk/inject-tck-runner/src/test/java/org/jboss/webbeans/
Modified:
ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/ForwardingAnnotated.java
ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/ForwardingAnnotatedCallable.java
ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/ForwardingAnnotatedConstructor.java
ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/ForwardingAnnotatedField.java
ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/ForwardingAnnotatedMember.java
ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/ForwardingAnnotatedMethod.java
ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/ForwardingAnnotatedParameter.java
ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/ForwardingAnnotatedType.java
Log:
refactored tck-runner packages
Copied: ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/AbstractProducer.java (from rev 3872, ri/trunk/inject-tck-runner/src/test/java/org/jboss/webbeans/atinject/tck/AbstractProducer.java)
===================================================================
--- ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/AbstractProducer.java (rev 0)
+++ ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/AbstractProducer.java 2009-10-08 03:44:07 UTC (rev 3880)
@@ -0,0 +1,27 @@
+package org.jboss.weld.atinject.tck;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionTarget;
+
+public class AbstractProducer<T>
+{
+
+ protected final InjectionTarget<T> injectionTarget;
+ protected final BeanManager beanManager;
+
+ public AbstractProducer(BeanManager beanManager, Class<T> type)
+ {
+ this.injectionTarget = beanManager.createInjectionTarget(beanManager.createAnnotatedType(type));
+ this.beanManager = beanManager;
+ }
+
+ public T produce()
+ {
+ CreationalContext<T> ctx = beanManager.createCreationalContext(null);
+ T instance = injectionTarget.produce(ctx);
+ injectionTarget.inject(instance, ctx);
+ return instance;
+ }
+
+}
\ No newline at end of file
Copied: ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/Any.java (from rev 3872, ri/trunk/inject-tck-runner/src/test/java/org/jboss/webbeans/atinject/tck/Any.java)
===================================================================
--- ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/Any.java (rev 0)
+++ ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/Any.java 2009-10-08 03:44:07 UTC (rev 3880)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.weld.atinject.tck;
+
+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 static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+/**
+ * A built-in binding type that is implicitly applied to all beans which do not
+ * have the {@link New} built-in binding type.
+ *
+ * @author Gavin King
+ * @author David Allen
+ */
+
+@Qualifier
+@Retention(RUNTIME)
+@Target( { TYPE, METHOD, FIELD, PARAMETER })
+@Documented
+public @interface Any
+{
+
+}
Copied: ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/AtInjectTCK.java (from rev 3872, ri/trunk/inject-tck-runner/src/test/java/org/jboss/webbeans/atinject/tck/AtInjectTCK.java)
===================================================================
--- ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/AtInjectTCK.java (rev 0)
+++ ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/AtInjectTCK.java 2009-10-08 03:44:07 UTC (rev 3880)
@@ -0,0 +1,66 @@
+package org.jboss.weld.atinject.tck;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+
+import junit.framework.Test;
+
+import org.atinject.tck.Tck;
+import org.atinject.tck.auto.Car;
+import org.atinject.tck.auto.Convertible;
+import org.atinject.tck.auto.FuelTank;
+import org.atinject.tck.auto.Seat;
+import org.atinject.tck.auto.Tire;
+import org.atinject.tck.auto.V8Engine;
+import org.atinject.tck.auto.accessories.Cupholder;
+import org.atinject.tck.auto.accessories.SpareTire;
+import org.jboss.webbeans.mock.MockEELifecycle;
+import org.jboss.webbeans.mock.TestContainer;
+
+/**
+ * Configure the AtInject TCK for use with the 299 RI
+ *
+ * @author pmuir
+ *
+ */
+public class AtInjectTCK
+{
+ /**
+ * The classes that should be deployed as Managed Beans
+ */
+ public static final List<Class<?>> classes = Arrays.<Class<?>>asList(
+ Convertible.class,
+ Seat.class,
+ V8Engine.class,
+ Cupholder.class,
+ FuelTank.class,
+ Tire.class,
+ SpareTire.class,
+ // Two producer method which allow us to expose SpareTire and Drivers seat with qualifiers
+ DriversSeatProducer.class,
+ SpareTireProducer.class
+ );
+
+ /**
+ * Create JUnit TestSuite
+ *
+ * @return
+ */
+ public static Test suite()
+ {
+ // Create and start the TestContainer, which takes care of starting the container, deploying the
+ // classes, starting the contexts etc.
+ TestContainer container = new TestContainer(new MockEELifecycle(), classes, null);
+ container.startContainer();
+
+ BeanManager beanManager = container.getBeanManager();
+
+ // Obtain a reference to the Car and pass it to the TCK to generate the testsuite
+ Bean<?> bean = beanManager.resolve(beanManager.getBeans(Car.class));
+ Car instance = (Car) beanManager.getReference(bean, Car.class, beanManager.createCreationalContext(bean));
+
+ return Tck.testsFor(instance, false /* supportsStatic */, true /* supportsPrivate */);
+ }
+}
\ No newline at end of file
Copied: ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/BeanDisambiguator.java (from rev 3872, ri/trunk/inject-tck-runner/src/test/java/org/jboss/webbeans/atinject/tck/BeanDisambiguator.java)
===================================================================
--- ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/BeanDisambiguator.java (rev 0)
+++ ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/BeanDisambiguator.java 2009-10-08 03:44:07 UTC (rev 3880)
@@ -0,0 +1,413 @@
+package org.jboss.weld.atinject.tck;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.spi.AnnotatedConstructor;
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.AnnotatedMethod;
+import javax.enterprise.inject.spi.AnnotatedParameter;
+import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import javax.inject.Inject;
+
+import org.atinject.tck.auto.Convertible;
+import org.atinject.tck.auto.Tire;
+import org.jboss.weld.atinject.tck.util.ForwardingAnnotatedConstructor;
+import org.jboss.weld.atinject.tck.util.ForwardingAnnotatedField;
+import org.jboss.weld.atinject.tck.util.ForwardingAnnotatedMethod;
+import org.jboss.weld.atinject.tck.util.ForwardingAnnotatedParameter;
+import org.jboss.weld.atinject.tck.util.ForwardingAnnotatedType;
+
+public class BeanDisambiguator implements Extension
+{
+
+ private static final Annotation PLAIN_LITERAL = new AnnotationLiteral<Plain>()
+ {
+ };
+
+ /**
+ * Modufy the class metadata that 299 will use when building beans
+ */
+ public void observe(@Observes ProcessAnnotatedType<?> pat)
+ {
+ addPlainQualifierToTireBean(pat);
+ addPlainQualifierToConvertibleConstructor(pat);
+ addPlainQualifierToConvertiblePlainTireField(pat);
+ addPlainQualifierToConvertibleInjectInstanceMethodWithManyArgs(pat);
+ }
+
+ /**
+ * Adjust the injectInstanceMethodWithManyArgs injectable method on {@link Convertible} so that parameters
+ * 2 and 6 ({@code plainTire} and {@code plainTireProvider}) additionally have the @Plain annotation
+ */
+ private <X> void addPlainQualifierToConvertibleInjectInstanceMethodWithManyArgs(ProcessAnnotatedType<X> pat)
+ {
+ if (pat.getAnnotatedType().getJavaClass().equals(Convertible.class))
+ {
+ final AnnotatedType<X> original = pat.getAnnotatedType();
+
+ final Set<AnnotatedMethod<? super X>> methods = new HashSet<AnnotatedMethod<? super X>>();
+ for (final AnnotatedMethod<? super X> method : original.getMethods())
+ {
+ if (method.getJavaMember().getName().equals("injectInstanceMethodWithManyArgs"))
+ {
+ methods.add(qualifyParameterWithPlain(method, 2, 6));
+ }
+ else
+ {
+ methods.add(method);
+ }
+ }
+
+ pat.setAnnotatedType(new ForwardingAnnotatedType<X>()
+ {
+
+ @Override
+ protected AnnotatedType<X> delegate()
+ {
+ return original;
+ }
+
+ @Override
+ public Set<AnnotatedMethod<? super X>> getMethods()
+ {
+ return methods;
+ }
+
+ });
+ }
+ }
+
+
+ /**
+ * Add the @Plain qualifier to the field {@code fieldPlainTire} and @{code fieldPlainTireProvider} of {@link Convertible}
+ *
+ */
+ private <X> void addPlainQualifierToConvertiblePlainTireField(ProcessAnnotatedType<X> pat)
+ {
+ if (pat.getAnnotatedType().getJavaClass().equals(Convertible.class))
+ {
+ final AnnotatedType<X> original = pat.getAnnotatedType();
+
+ final Set<AnnotatedField<? super X>> fields = new HashSet<AnnotatedField<? super X>>();
+
+ for (final AnnotatedField<? super X> field : original.getFields())
+ {
+ if (field.getJavaMember().getName().equals("fieldPlainTire") || field.getJavaMember().getName().equals("fieldPlainTireProvider"))
+ {
+ fields.add(addPlainQualifierToField(field));
+ }
+ else
+ {
+ fields.add(field);
+ }
+ }
+
+ pat.setAnnotatedType(new ForwardingAnnotatedType<X>()
+ {
+
+ @Override
+ public Set<AnnotatedField<? super X>> getFields()
+ {
+ return fields;
+ }
+
+ @Override
+ protected AnnotatedType<X> delegate()
+ {
+ return original;
+ }
+
+ });
+ }
+ }
+
+ /**
+ * Add the @Plain qualifier to the parameters 2 and 6 ({@code plainTire} and {@code plainTireProvider}) of the constructor of {@link Convertible}
+ *
+ */
+ private <X> void addPlainQualifierToConvertibleConstructor(ProcessAnnotatedType<X> pat)
+ {
+ if (pat.getAnnotatedType().getJavaClass().equals(Convertible.class))
+ {
+ final AnnotatedType<X> original = pat.getAnnotatedType();
+
+ final Set<AnnotatedConstructor<X>> constructors = new HashSet<AnnotatedConstructor<X>>();
+ for (final AnnotatedConstructor<X> constructor : original.getConstructors())
+ {
+ if (constructor.isAnnotationPresent(Inject.class))
+ {
+ constructors.add(qualifyParameterWithPlain(constructor, 2, 6));
+ }
+ else
+ {
+ constructors.add(constructor);
+ }
+ }
+
+ pat.setAnnotatedType(new ForwardingAnnotatedType<X>()
+ {
+
+ @Override
+ protected AnnotatedType<X> delegate()
+ {
+ return original;
+ }
+
+ @Override
+ public Set<AnnotatedConstructor<X>> getConstructors()
+ {
+ return constructors;
+ }
+
+ });
+ }
+ }
+
+ /**
+ * Add the @Plain annotation to the {@link Tire} class
+ *
+ */
+ private <X> void addPlainQualifierToTireBean(ProcessAnnotatedType<X> pat)
+ {
+ if (pat.getAnnotatedType().getJavaClass().equals(Tire.class))
+ {
+ final Set<Annotation> annotations = new HashSet<Annotation>();
+ annotations.addAll(pat.getAnnotatedType().getAnnotations());
+ annotations.add(PLAIN_LITERAL);
+ final AnnotatedType<X> original = pat.getAnnotatedType();
+ pat.setAnnotatedType(new ForwardingAnnotatedType<X>()
+ {
+
+ @Override
+ protected AnnotatedType<X> delegate()
+ {
+ return original;
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public <A extends Annotation> A getAnnotation(Class<A> annotationType)
+ {
+ if (annotationType.equals(Plain.class))
+ {
+ return (A) PLAIN_LITERAL;
+ }
+ else
+ {
+ return delegate().getAnnotation(annotationType);
+ }
+ }
+
+ @Override
+ public Set<Annotation> getAnnotations()
+ {
+ return annotations;
+ }
+
+ @Override
+ public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
+ {
+ if (annotationType.equals(Plain.class))
+ {
+ return true;
+ }
+ else
+ {
+ return delegate().isAnnotationPresent(annotationType);
+ }
+ }
+
+ });
+ }
+ }
+
+ /**
+ * Utility method to add the @Plain qualifier to a list of parameters
+ */
+ private <X> List<AnnotatedParameter<X>> qualifyParameterWithPlain(final List<AnnotatedParameter<X>> parameters, Integer... position)
+ {
+ Collection<Integer> positions = Arrays.asList(position);
+ final List<AnnotatedParameter<X>> newParameters = new ArrayList<AnnotatedParameter<X>>();
+
+ for (final AnnotatedParameter<X> parameter : parameters)
+ {
+ if (positions.contains(parameter.getPosition()))
+ {
+ newParameters.add(addPlainQualifierToParameter(parameter));
+ }
+ else
+ {
+ newParameters.add(parameter);
+ }
+ }
+
+ return newParameters;
+
+ }
+
+ /**
+ * Utility method to add the @Plain qualifier to a method
+ */
+ private <X> AnnotatedMethod<X> qualifyParameterWithPlain(final AnnotatedMethod<X> method, Integer... position)
+ {
+ final List<AnnotatedParameter<X>> parameters = qualifyParameterWithPlain(method.getParameters(), position);
+ return new ForwardingAnnotatedMethod<X>()
+ {
+
+ @Override
+ public List<AnnotatedParameter<X>> getParameters()
+ {
+ return parameters;
+ }
+
+ @Override
+ protected AnnotatedMethod<X> delegate()
+ {
+ return method;
+ }
+
+ };
+ }
+
+ /**
+ * Utility method to add the @Plain qualifier to a constructor
+ */
+ private <X> AnnotatedConstructor<X> qualifyParameterWithPlain(final AnnotatedConstructor<X> constructor, Integer... position)
+ {
+ final List<AnnotatedParameter<X>> parameters = qualifyParameterWithPlain(constructor.getParameters(), position);
+ return new ForwardingAnnotatedConstructor<X>()
+ {
+
+ @Override
+ public List<AnnotatedParameter<X>> getParameters()
+ {
+ return parameters;
+ }
+
+ @Override
+ protected AnnotatedConstructor<X> delegate()
+ {
+ return constructor;
+ }
+
+ };
+ }
+
+ /**
+ * Utility method to add the @Plain qualifier to a parameter
+ */
+ private <X> AnnotatedParameter<X> addPlainQualifierToParameter(final AnnotatedParameter<X> parameter)
+ {
+ final Set<Annotation> annotations = new HashSet<Annotation>();
+ annotations.addAll(parameter.getAnnotations());
+ annotations.add(PLAIN_LITERAL);
+ return new ForwardingAnnotatedParameter<X>()
+ {
+
+ @Override
+ protected AnnotatedParameter<X> delegate()
+ {
+ return parameter;
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public <A extends Annotation> A getAnnotation(Class<A> annotationType)
+ {
+ if (annotationType.equals(Plain.class))
+ {
+ return (A) PLAIN_LITERAL;
+ }
+ else
+ {
+ return delegate().getAnnotation(annotationType);
+ }
+ }
+
+ @Override
+ public Set<Annotation> getAnnotations()
+ {
+ return annotations;
+ }
+
+ @Override
+ public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
+ {
+ if (annotationType.equals(Plain.class))
+ {
+ return true;
+ }
+ else
+ {
+ return delegate().isAnnotationPresent(annotationType);
+ }
+ }
+
+ };
+ }
+
+ /**
+ * Utility method to add the @Plain qualifier to a field
+ */
+ private <X> AnnotatedField<X> addPlainQualifierToField(final AnnotatedField<X> field)
+ {
+ final Set<Annotation> annotations = new HashSet<Annotation>();
+ annotations.addAll(field.getAnnotations());
+ annotations.add(PLAIN_LITERAL);
+ return new ForwardingAnnotatedField<X>()
+ {
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public <A extends Annotation> A getAnnotation(Class<A> annotationType)
+ {
+ if (annotationType.equals(Plain.class))
+ {
+ return (A) PLAIN_LITERAL;
+ }
+ else
+ {
+ return delegate().getAnnotation(annotationType);
+ }
+ }
+
+ @Override
+ public Set<Annotation> getAnnotations()
+ {
+ return annotations;
+ }
+
+ @Override
+ public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
+ {
+ if (annotationType.equals(Plain.class))
+ {
+ return true;
+ }
+ else
+ {
+ return delegate().isAnnotationPresent(annotationType);
+ }
+ }
+
+ @Override
+ protected AnnotatedField<X> delegate()
+ {
+ return field;
+ }
+
+ };
+ }
+
+
+}
Copied: ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/DriversSeatProducer.java (from rev 3872, ri/trunk/inject-tck-runner/src/test/java/org/jboss/webbeans/atinject/tck/DriversSeatProducer.java)
===================================================================
--- ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/DriversSeatProducer.java (rev 0)
+++ ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/DriversSeatProducer.java 2009-10-08 03:44:07 UTC (rev 3880)
@@ -0,0 +1,26 @@
+package org.jboss.weld.atinject.tck;
+
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+
+import org.atinject.tck.auto.Drivers;
+import org.atinject.tck.auto.DriversSeat;
+
+public class DriversSeatProducer extends AbstractProducer<DriversSeat>
+{
+
+ @Inject
+ public DriversSeatProducer(BeanManager beanManager)
+ {
+ super(beanManager, DriversSeat.class);
+ }
+
+ @Override
+ @Produces @Drivers
+ public DriversSeat produce()
+ {
+ return super.produce();
+ }
+
+}
Copied: ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/Plain.java (from rev 3872, ri/trunk/inject-tck-runner/src/test/java/org/jboss/webbeans/atinject/tck/Plain.java)
===================================================================
--- ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/Plain.java (rev 0)
+++ ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/Plain.java 2009-10-08 03:44:07 UTC (rev 3880)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.weld.atinject.tck;
+
+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 static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+@Qualifier
+@Retention(RUNTIME)
+@Target( { TYPE, METHOD, FIELD, PARAMETER })
+@Documented
+public @interface Plain
+{
+
+}
Copied: ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/Spare.java (from rev 3872, ri/trunk/inject-tck-runner/src/test/java/org/jboss/webbeans/atinject/tck/Spare.java)
===================================================================
--- ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/Spare.java (rev 0)
+++ ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/Spare.java 2009-10-08 03:44:07 UTC (rev 3880)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.weld.atinject.tck;
+
+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 static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+@Qualifier
+@Retention(RUNTIME)
+@Target( { TYPE, METHOD, FIELD, PARAMETER })
+@Documented
+public @interface Spare
+{
+
+}
Copied: ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/SpareTireProducer.java (from rev 3872, ri/trunk/inject-tck-runner/src/test/java/org/jboss/webbeans/atinject/tck/SpareTireProducer.java)
===================================================================
--- ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/SpareTireProducer.java (rev 0)
+++ ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/SpareTireProducer.java 2009-10-08 03:44:07 UTC (rev 3880)
@@ -0,0 +1,26 @@
+package org.jboss.weld.atinject.tck;
+
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.atinject.tck.auto.accessories.SpareTire;
+
+public class SpareTireProducer extends AbstractProducer<SpareTire>
+{
+
+ @Inject
+ public SpareTireProducer(BeanManager beanManager)
+ {
+ super(beanManager, SpareTire.class);
+ }
+
+ @Override
+ @Produces @Named("spare") @Spare
+ public SpareTire produce()
+ {
+ return super.produce();
+ }
+
+}
Copied: ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util (from rev 3872, ri/trunk/inject-tck-runner/src/test/java/org/jboss/webbeans/atinject/tck/util)
Modified: ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/ForwardingAnnotated.java
===================================================================
--- ri/trunk/inject-tck-runner/src/test/java/org/jboss/webbeans/atinject/tck/util/ForwardingAnnotated.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/ForwardingAnnotated.java 2009-10-08 03:44:07 UTC (rev 3880)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.atinject.tck.util;
+package org.jboss.weld.atinject.tck.util;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
Modified: ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/ForwardingAnnotatedCallable.java
===================================================================
--- ri/trunk/inject-tck-runner/src/test/java/org/jboss/webbeans/atinject/tck/util/ForwardingAnnotatedCallable.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/ForwardingAnnotatedCallable.java 2009-10-08 03:44:07 UTC (rev 3880)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.atinject.tck.util;
+package org.jboss.weld.atinject.tck.util;
import java.util.List;
Modified: ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/ForwardingAnnotatedConstructor.java
===================================================================
--- ri/trunk/inject-tck-runner/src/test/java/org/jboss/webbeans/atinject/tck/util/ForwardingAnnotatedConstructor.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/ForwardingAnnotatedConstructor.java 2009-10-08 03:44:07 UTC (rev 3880)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.atinject.tck.util;
+package org.jboss.weld.atinject.tck.util;
import java.lang.reflect.Constructor;
Modified: ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/ForwardingAnnotatedField.java
===================================================================
--- ri/trunk/inject-tck-runner/src/test/java/org/jboss/webbeans/atinject/tck/util/ForwardingAnnotatedField.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/ForwardingAnnotatedField.java 2009-10-08 03:44:07 UTC (rev 3880)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.atinject.tck.util;
+package org.jboss.weld.atinject.tck.util;
import java.lang.reflect.Field;
Modified: ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/ForwardingAnnotatedMember.java
===================================================================
--- ri/trunk/inject-tck-runner/src/test/java/org/jboss/webbeans/atinject/tck/util/ForwardingAnnotatedMember.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/ForwardingAnnotatedMember.java 2009-10-08 03:44:07 UTC (rev 3880)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.atinject.tck.util;
+package org.jboss.weld.atinject.tck.util;
import java.lang.reflect.Member;
Modified: ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/ForwardingAnnotatedMethod.java
===================================================================
--- ri/trunk/inject-tck-runner/src/test/java/org/jboss/webbeans/atinject/tck/util/ForwardingAnnotatedMethod.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/ForwardingAnnotatedMethod.java 2009-10-08 03:44:07 UTC (rev 3880)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.atinject.tck.util;
+package org.jboss.weld.atinject.tck.util;
import java.lang.reflect.Method;
Modified: ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/ForwardingAnnotatedParameter.java
===================================================================
--- ri/trunk/inject-tck-runner/src/test/java/org/jboss/webbeans/atinject/tck/util/ForwardingAnnotatedParameter.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/ForwardingAnnotatedParameter.java 2009-10-08 03:44:07 UTC (rev 3880)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.atinject.tck.util;
+package org.jboss.weld.atinject.tck.util;
import javax.enterprise.inject.spi.AnnotatedCallable;
import javax.enterprise.inject.spi.AnnotatedParameter;
Modified: ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/ForwardingAnnotatedType.java
===================================================================
--- ri/trunk/inject-tck-runner/src/test/java/org/jboss/webbeans/atinject/tck/util/ForwardingAnnotatedType.java 2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/ForwardingAnnotatedType.java 2009-10-08 03:44:07 UTC (rev 3880)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.atinject.tck.util;
+package org.jboss.weld.atinject.tck.util;
import java.util.Set;
14 years, 7 months
- 1
- 0