[jboss-cvs] JBossAS SVN: r83414 - in projects/webbeans-ri-int/trunk: jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/bootstrap and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 26 10:01:01 EST 2009
Author: petemuir
Date: 2009-01-26 10:01:01 -0500 (Mon, 26 Jan 2009)
New Revision: 83414
Modified:
projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbResolver.java
projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/bootstrap/ServletJBossEjbDiscovery.java
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansClassloadingDeployer.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/VFSTestSuite.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/deployer/MockEjbJarDeployer.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/deployer/MockJBossAppDeployer.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/AbstractWebBeansTest.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.java
Log:
WBRI-117, update to PRD2 packaging
Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbResolver.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbResolver.java 2009-01-26 14:46:13 UTC (rev 83413)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbResolver.java 2009-01-26 15:01:01 UTC (rev 83414)
@@ -6,8 +6,8 @@
import javax.annotation.Resource;
import javax.ejb.EJB;
+import javax.inject.manager.InjectionPoint;
import javax.persistence.PersistenceContext;
-import javax.webbeans.InjectionPoint;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.ejb3.common.deployers.spi.AttachmentNames;
Modified: projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/bootstrap/ServletJBossEjbDiscovery.java
===================================================================
--- projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/bootstrap/ServletJBossEjbDiscovery.java 2009-01-26 14:46:13 UTC (rev 83413)
+++ projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/bootstrap/ServletJBossEjbDiscovery.java 2009-01-26 15:01:01 UTC (rev 83414)
@@ -32,7 +32,8 @@
}
DeploymentUnit du = duConnector.getUtility();
- this.delegate = new JBossEjbDiscovery(du, controller);
+
+ this.delegate = new JBossEjbDiscovery(du.getTopLevel(), controller);
}
@Override
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansClassloadingDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansClassloadingDeployer.java 2009-01-26 14:46:13 UTC (rev 83413)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansClassloadingDeployer.java 2009-01-26 15:01:01 UTC (rev 83414)
@@ -24,9 +24,9 @@
import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
import org.jboss.classloading.spi.metadata.ExportAll;
import org.jboss.classloading.spi.version.Version;
+import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.deployers.spi.DeploymentException;
import org.jboss.virtual.VirtualFile;
/**
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/VFSTestSuite.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/VFSTestSuite.java 2009-01-26 14:46:13 UTC (rev 83413)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/VFSTestSuite.java 2009-01-26 15:01:01 UTC (rev 83414)
@@ -24,6 +24,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
+
import org.jboss.test.webbeans.deployers.test.PostDeployersTestCase;
import org.jboss.test.webbeans.deployers.test.WBDiscoveryEnvTestCase;
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/deployer/MockEjbJarDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/deployer/MockEjbJarDeployer.java 2009-01-26 14:46:13 UTC (rev 83413)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/deployer/MockEjbJarDeployer.java 2009-01-26 15:01:01 UTC (rev 83414)
@@ -23,8 +23,8 @@
import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
import org.jboss.metadata.ejb.spec.EjbJarMetaData;
-import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
import org.jboss.virtual.VirtualFile;
/**
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/deployer/MockJBossAppDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/deployer/MockJBossAppDeployer.java 2009-01-26 14:46:13 UTC (rev 83413)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/deployer/MockJBossAppDeployer.java 2009-01-26 15:01:01 UTC (rev 83414)
@@ -23,8 +23,8 @@
import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.metadata.ear.jboss.JBoss50AppMetaData;
import org.jboss.metadata.ear.jboss.JBossAppMetaData;
-import org.jboss.metadata.ear.jboss.JBoss50AppMetaData;
import org.jboss.virtual.VirtualFile;
/**
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/AbstractWebBeansTest.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/AbstractWebBeansTest.java 2009-01-26 14:46:13 UTC (rev 83413)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/AbstractWebBeansTest.java 2009-01-26 15:01:01 UTC (rev 83414)
@@ -23,7 +23,6 @@
import org.jboss.deployers.vfs.deployer.kernel.BeanDeployer;
import org.jboss.test.deployers.BootstrapDeployersTest;
-import org.jboss.virtual.AssembledDirectory;
import org.jboss.test.webbeans.deployers.support.crm.CrmWebBean;
import org.jboss.test.webbeans.deployers.support.ejb.MySLSBean;
import org.jboss.test.webbeans.deployers.support.ext.ExternalWebBean;
@@ -32,6 +31,7 @@
import org.jboss.test.webbeans.deployers.support.ui.UIWebBean;
import org.jboss.test.webbeans.deployers.support.util.SomeUtil;
import org.jboss.test.webbeans.deployers.support.web.ServletWebBean;
+import org.jboss.virtual.AssembledDirectory;
/**
* AbstractWebBeansTest.
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.java 2009-01-26 14:46:13 UTC (rev 83413)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.java 2009-01-26 15:01:01 UTC (rev 83414)
@@ -24,6 +24,7 @@
import java.util.List;
import junit.framework.Test;
+
import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
import org.jboss.classloading.spi.metadata.ExportAll;
import org.jboss.classloading.spi.version.Version;
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.java 2009-01-26 14:46:13 UTC (rev 83413)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.java 2009-01-26 15:01:01 UTC (rev 83414)
@@ -27,9 +27,8 @@
import java.util.Set;
import junit.framework.Test;
+
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.webbeans.integration.microcontainer.deployer.env.WebBeanDiscoveryEnvironment;
import org.jboss.test.webbeans.deployers.support.crm.CrmWebBean;
import org.jboss.test.webbeans.deployers.support.ejb.BusinessInterface;
import org.jboss.test.webbeans.deployers.support.ejb.MySLSBean;
@@ -37,6 +36,8 @@
import org.jboss.test.webbeans.deployers.support.jar.PlainJavaBean;
import org.jboss.test.webbeans.deployers.support.ui.UIWebBean;
import org.jboss.test.webbeans.deployers.support.web.ServletWebBean;
+import org.jboss.virtual.VirtualFile;
+import org.jboss.webbeans.integration.microcontainer.deployer.env.WebBeanDiscoveryEnvironment;
/**
* WebBeansDiscovery env test case.
More information about the jboss-cvs-commits
mailing list