[jboss-cvs] JBossAS SVN: r86887 - in projects/webbeans-ri-int/trunk/deployer: src/main/assembly/resources/META-INF and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 6 18:28:45 EDT 2009
Author: petemuir
Date: 2009-04-06 18:28:44 -0400 (Mon, 06 Apr 2009)
New Revision: 86887
Added:
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/DeployersUtils.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/cl/
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/ext/
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/
Removed:
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/DeployersUtils.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/cl/
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/ext/
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/
Modified:
projects/webbeans-ri-int/trunk/deployer/resources/org/jboss/test/webbeans/deployers/test/BootDeployerTestCase.xml
projects/webbeans-ri-int/trunk/deployer/resources/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.xml
projects/webbeans-ri-int/trunk/deployer/resources/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.xml
projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-deployers-jboss-beans.xml
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/cl/WebBeansUrlIntegrationDeployer.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/cl/WebBeansWebUrlIntegrationDeployer.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossWebBeanDiscovery.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeanDiscoveryDeployer.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeanDiscoveryEnvironment.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansBootstrapDeployer.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/ext/JBossWebBeansMetaData.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/ext/JBossWebBeansMetaDataDeployer.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/PostFacesConfigDeployer.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/PostJBossAppMetadataDeployer.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/PostJBossMetadataDeployer.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/PostJBossWebMetadataDeployer.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/PostWebMetadataDeployer.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WBEjbInterceptorMetadataDeployer.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WebBeansAwareMetadataDeployer.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WebBeansClassloadingDeployer.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WebBeansFilesDeployer.java
projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/webbeans/deployers/support/MockBootDeployer.java
projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/webbeans/deployers/support/WBDEWrapper.java
projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/webbeans/deployers/test/BootDeployerTestCase.java
projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.java
projects/webbeans-ri-int/trunk/deployer/src/test/resources/org/jboss/test/webbeans/deployers/test/BootDeployerTestCase.xml
projects/webbeans-ri-int/trunk/deployer/src/test/resources/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.xml
projects/webbeans-ri-int/trunk/deployer/src/test/resources/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.xml
Log:
repackage to remove microcontainer from package name
Modified: projects/webbeans-ri-int/trunk/deployer/resources/org/jboss/test/webbeans/deployers/test/BootDeployerTestCase.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/resources/org/jboss/test/webbeans/deployers/test/BootDeployerTestCase.xml 2009-04-06 22:13:07 UTC (rev 86886)
+++ projects/webbeans-ri-int/trunk/deployer/resources/org/jboss/test/webbeans/deployers/test/BootDeployerTestCase.xml 2009-04-06 22:28:44 UTC (rev 86887)
@@ -3,9 +3,9 @@
<bean name="EarStructure" class="org.jboss.test.deployers.vfs.structure.ear.support.MockEarStructureDeployer"/>
<bean name="WarStructure" class="org.jboss.test.deployers.vfs.structure.war.support.MockWarStructureDeployer"/>
- <bean name="JWBMDDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.ext.JBossWebBeansMetaDataDeployer"/>
- <bean name="WBFilesDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.WebBeansFilesDeployer"/>
- <bean name="WBDiscoveryDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.env.WebBeanDiscoveryDeployer"/>
+ <bean name="JWBMDDeployer" class="org.jboss.webbeans.integration.deployer.ext.JBossWebBeansMetaDataDeployer"/>
+ <bean name="WBFilesDeployer" class="org.jboss.webbeans.integration.deployer.metadata.WebBeansFilesDeployer"/>
+ <bean name="WBDiscoveryDeployer" class="org.jboss.webbeans.integration.deployer.env.WebBeanDiscoveryDeployer"/>
<bean name="BootDeployer" class="org.jboss.test.webbeans.deployers.support.MockBootDeployer"/>
Modified: projects/webbeans-ri-int/trunk/deployer/resources/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/resources/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.xml 2009-04-06 22:13:07 UTC (rev 86886)
+++ projects/webbeans-ri-int/trunk/deployer/resources/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.xml 2009-04-06 22:28:44 UTC (rev 86887)
@@ -10,12 +10,12 @@
<bean name="MockWeb" class="org.jboss.test.webbeans.deployers.support.deployer.MockWebDeployer"/>
<bean name="MockMergeJBoss" class="org.jboss.test.webbeans.deployers.support.deployer.MockMergeJBossDeployer"/>
- <bean name="WBFiles" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.WebBeansFilesDeployer"/>
+ <bean name="WBFiles" class="org.jboss.webbeans.integration.deployer.metadata.WebBeansFilesDeployer"/>
- <bean name="PostEjbJar" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.WBEjbInterceptorMetadataDeployer"/>
- <bean name="PostJBossApp" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.PostJBossAppMetadataDeployer"/>
- <bean name="PostJBoss" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.PostJBossMetadataDeployer"/>
- <bean name="PostJBossWeb" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.PostJBossWebMetadataDeployer"/>
- <bean name="PostWeb" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.PostWebMetadataDeployer"/>
+ <bean name="PostEjbJar" class="org.jboss.webbeans.integration.deployer.metadata.WBEjbInterceptorMetadataDeployer"/>
+ <bean name="PostJBossApp" class="org.jboss.webbeans.integration.deployer.metadata.PostJBossAppMetadataDeployer"/>
+ <bean name="PostJBoss" class="org.jboss.webbeans.integration.deployer.metadata.PostJBossMetadataDeployer"/>
+ <bean name="PostJBossWeb" class="org.jboss.webbeans.integration.deployer.metadata.PostJBossWebMetadataDeployer"/>
+ <bean name="PostWeb" class="org.jboss.webbeans.integration.deployer.metadata.PostWebMetadataDeployer"/>
</deployment>
Modified: projects/webbeans-ri-int/trunk/deployer/resources/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/resources/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.xml 2009-04-06 22:13:07 UTC (rev 86886)
+++ projects/webbeans-ri-int/trunk/deployer/resources/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.xml 2009-04-06 22:28:44 UTC (rev 86887)
@@ -3,8 +3,8 @@
<bean name="EarStructure" class="org.jboss.test.deployers.vfs.structure.ear.support.MockEarStructureDeployer"/>
<bean name="WarStructure" class="org.jboss.test.deployers.vfs.structure.war.support.MockWarStructureDeployer"/>
- <bean name="JWBMDDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.ext.JBossWebBeansMetaDataDeployer"/>
- <bean name="WBFilesDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.WebBeansFilesDeployer"/>
- <bean name="WBDiscoveryDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.env.WebBeanDiscoveryDeployer"/>
+ <bean name="JWBMDDeployer" class="org.jboss.webbeans.integration.deployer.ext.JBossWebBeansMetaDataDeployer"/>
+ <bean name="WBFilesDeployer" class="org.jboss.webbeans.integration.deployer.metadata.WebBeansFilesDeployer"/>
+ <bean name="WBDiscoveryDeployer" class="org.jboss.webbeans.integration.deployer.env.WebBeanDiscoveryDeployer"/>
</deployment>
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-deployers-jboss-beans.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-deployers-jboss-beans.xml 2009-04-06 22:13:07 UTC (rev 86886)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-deployers-jboss-beans.xml 2009-04-06 22:28:44 UTC (rev 86887)
@@ -8,27 +8,27 @@
<!-- Web Beans deployers -->
<!-- Responsible for discovering Web Bean files -->
- <bean name="WebBeansFilesDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.WebBeansFilesDeployer"/>
+ <bean name="WebBeansFilesDeployer" class="org.jboss.webbeans.integration.deployer.metadata.WebBeansFilesDeployer"/>
<!-- Responsible for discovering Web Bean classes -->
- <bean name="WebBeansDiscoveryDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.env.WebBeanDiscoveryDeployer"/>
+ <bean name="WebBeansDiscoveryDeployer" class="org.jboss.webbeans.integration.deployer.env.WebBeanDiscoveryDeployer"/>
<!-- Responsible for booting Web Beans -->
- <bean name="WebBeansBootstrapDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.env.WebBeansBootstrapDeployer"/>
+ <bean name="WebBeansBootstrapDeployer" class="org.jboss.webbeans.integration.deployer.env.WebBeansBootstrapDeployer"/>
<!-- Responsible for pushing the Web Beans RI onto the application classpath -->
- <bean name="WebBeansWebUrlIntegrationDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.cl.WebBeansWebUrlIntegrationDeployer"/>
+ <bean name="WebBeansWebUrlIntegrationDeployer" class="org.jboss.webbeans.integration.deployer.cl.WebBeansWebUrlIntegrationDeployer"/>
<!-- Responsible for inserting the Web Beans RI EJB interceptor -->
- <bean name="PostEjbJarMetadataDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.WBEjbInterceptorMetadataDeployer"/>
+ <bean name="PostEjbJarMetadataDeployer" class="org.jboss.webbeans.integration.deployer.metadata.WBEjbInterceptorMetadataDeployer"/>
<!-- Responsible for enabling classloader isolation for Web Bean jars -->
- <bean name="PostJBossMetadataDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.PostJBossMetadataDeployer"/>
+ <bean name="PostJBossMetadataDeployer" class="org.jboss.webbeans.integration.deployer.metadata.PostJBossMetadataDeployer"/>
<!-- Responsible for enabling classloader isolation for Web Bean wars -->
- <bean name="PostJBossWebMetadataDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.PostJBossWebMetadataDeployer"/>
+ <bean name="PostJBossWebMetadataDeployer" class="org.jboss.webbeans.integration.deployer.metadata.PostJBossWebMetadataDeployer"/>
<!-- Responsible for adding the Web Beans RI listener to the Servlet -->
- <bean name="PostWebMetadataDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.PostWebMetadataDeployer"/>
+ <bean name="PostWebMetadataDeployer" class="org.jboss.webbeans.integration.deployer.metadata.PostWebMetadataDeployer"/>
</deployment>
Copied: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/DeployersUtils.java (from rev 86882, projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/DeployersUtils.java)
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/DeployersUtils.java (rev 0)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/DeployersUtils.java 2009-04-06 22:28:44 UTC (rev 86887)
@@ -0,0 +1,109 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.webbeans.integration.deployer;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+
+/**
+ * WebBeans deployers utils.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public final class DeployersUtils
+{
+ private DeployersUtils()
+ {
+ }
+
+ public static final String WEB_BEANS_FILES = "WEB_BEANS_FILES";
+ public static final String WEB_BEANS_CLASSPATH = "WEB_BEANS_CLASSPATH";
+ public static final String WEB_BEANS_DEPLOYMENT_FLAG = "WEB_BEANS_DEPLOYMENT_FLAG";
+
+ public static final String WEB_BEANS_BOOTSTRAP_BEAN = "_WebBeansBootstrapBean";
+
+ /**
+ * Get bootstrap bean name.
+ *
+ * @param unit the deployment unit
+ * @return webbeans bootstrap bean name
+ */
+ public static String getBootstrapBeanName(DeploymentUnit unit)
+ {
+ if (unit == null)
+ throw new IllegalArgumentException("Null deployment unit");
+
+ DeploymentUnit top = unit.getTopLevel();
+ return top.getName() + WEB_BEANS_BOOTSTRAP_BEAN;
+ }
+
+ /**
+ * Check deployment hierarchy for beans.xml files.
+ * It checks the 'cached' flag.
+ *
+ * @param unit the deployment unit
+ * @return true if beans.xml files exist, false otherwise
+ */
+ public static boolean checkForWebBeansFiles(DeploymentUnit unit)
+ {
+ if (unit == null)
+ throw new IllegalArgumentException("Null deployment unit");
+
+ DeploymentUnit top = unit.getTopLevel();
+
+ Boolean flag = top.getAttachment(WEB_BEANS_DEPLOYMENT_FLAG, Boolean.class);
+ if (flag != null)
+ return flag;
+
+ flag = searchForWebBeans(top);
+ top.addAttachment(WEB_BEANS_DEPLOYMENT_FLAG, flag, Boolean.class);
+
+ return flag;
+ }
+
+ /**
+ * Search deployment hierarchy for beans.xml files.
+ *
+ * @param unit the deployment unit
+ * @return true if beans.xml files exist, false otherwise
+ */
+ private static boolean searchForWebBeans(DeploymentUnit unit)
+ {
+ Collection files = unit.getAttachment(WEB_BEANS_FILES, Collection.class);
+ if (files != null && files.isEmpty() == false)
+ return true;
+
+ List<DeploymentUnit> children = unit.getChildren();
+ if (children != null && children.isEmpty() == false)
+ {
+ for (DeploymentUnit child : children)
+ {
+ boolean result = searchForWebBeans(child);
+ if (result)
+ return true;
+ }
+ }
+ return false;
+ }
+}
Copied: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/cl (from rev 86882, projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/cl)
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/cl/WebBeansUrlIntegrationDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/cl/WebBeansUrlIntegrationDeployer.java 2009-04-06 21:52:51 UTC (rev 86882)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/cl/WebBeansUrlIntegrationDeployer.java 2009-04-06 22:28:44 UTC (rev 86887)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.integration.microcontainer.deployer.cl;
+package org.jboss.webbeans.integration.deployer.cl;
import java.net.MalformedURLException;
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/cl/WebBeansWebUrlIntegrationDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/cl/WebBeansWebUrlIntegrationDeployer.java 2009-04-06 21:52:51 UTC (rev 86882)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/cl/WebBeansWebUrlIntegrationDeployer.java 2009-04-06 22:28:44 UTC (rev 86887)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.integration.microcontainer.deployer.cl;
+package org.jboss.webbeans.integration.deployer.cl;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
Copied: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env (from rev 86882, projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env)
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossWebBeanDiscovery.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/JBossWebBeanDiscovery.java 2009-04-06 21:52:51 UTC (rev 86882)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossWebBeanDiscovery.java 2009-04-06 22:28:44 UTC (rev 86887)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.integration.microcontainer.deployer.env;
+package org.jboss.webbeans.integration.deployer.env;
import java.net.URL;
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeanDiscoveryDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeanDiscoveryDeployer.java 2009-04-06 21:52:51 UTC (rev 86882)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeanDiscoveryDeployer.java 2009-04-06 22:28:44 UTC (rev 86887)
@@ -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.integration.microcontainer.deployer.env;
+package org.jboss.webbeans.integration.deployer.env;
import java.net.URL;
import java.util.Collection;
@@ -34,8 +34,8 @@
import org.jboss.deployers.vfs.spi.deployer.AbstractOptionalVFSRealDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.virtual.VirtualFile;
-import org.jboss.webbeans.integration.microcontainer.deployer.DeployersUtils;
-import org.jboss.webbeans.integration.microcontainer.deployer.ext.JBossWebBeansMetaData;
+import org.jboss.webbeans.integration.deployer.DeployersUtils;
+import org.jboss.webbeans.integration.deployer.ext.JBossWebBeansMetaData;
/**
* WBD deployer.
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeanDiscoveryEnvironment.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeanDiscoveryEnvironment.java 2009-04-06 21:52:51 UTC (rev 86882)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeanDiscoveryEnvironment.java 2009-04-06 22:28:44 UTC (rev 86887)
@@ -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.integration.microcontainer.deployer.env;
+package org.jboss.webbeans.integration.deployer.env;
import java.net.URL;
import java.util.HashSet;
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansBootstrapDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeansBootstrapDeployer.java 2009-04-06 21:52:51 UTC (rev 86882)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansBootstrapDeployer.java 2009-04-06 22:28:44 UTC (rev 86887)
@@ -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.integration.microcontainer.deployer.env;
+package org.jboss.webbeans.integration.deployer.env;
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.ValueMetaData;
@@ -32,7 +32,7 @@
import org.jboss.webbeans.bootstrap.api.Environments;
import org.jboss.webbeans.context.api.BeanStore;
import org.jboss.webbeans.context.api.helpers.ConcurrentHashMapBeanStore;
-import org.jboss.webbeans.integration.microcontainer.deployer.DeployersUtils;
+import org.jboss.webbeans.integration.deployer.DeployersUtils;
/**
* Deploy WebBeans boostrap service.
@@ -53,7 +53,7 @@
{
String unitName = unit.getName();
String envName = unitName + "_JBossWebBeanDiscovery";
- BeanMetaDataBuilder envWrapper = BeanMetaDataBuilder.createBuilder(envName, "org.jboss.webbeans.integration.microcontainer.deployer.env.JBossWebBeanDiscovery");
+ BeanMetaDataBuilder envWrapper = BeanMetaDataBuilder.createBuilder(envName, "org.jboss.webbeans.integration.deployer.env.JBossWebBeanDiscovery");
envWrapper.addConstructorParameter(WebBeanDiscoveryEnvironment.class.getName(), env);
unit.addAttachment(envName + "_" + BeanMetaData.class.getSimpleName(), envWrapper.getBeanMetaData());
Copied: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/ext (from rev 86882, projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/ext)
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/ext/JBossWebBeansMetaData.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/ext/JBossWebBeansMetaData.java 2009-04-06 21:52:51 UTC (rev 86882)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/ext/JBossWebBeansMetaData.java 2009-04-06 22:28:44 UTC (rev 86887)
@@ -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.integration.microcontainer.deployer.ext;
+package org.jboss.webbeans.integration.deployer.ext;
import java.io.Serializable;
import java.net.URL;
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/ext/JBossWebBeansMetaDataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/ext/JBossWebBeansMetaDataDeployer.java 2009-04-06 21:52:51 UTC (rev 86882)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/ext/JBossWebBeansMetaDataDeployer.java 2009-04-06 22:28:44 UTC (rev 86887)
@@ -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.integration.microcontainer.deployer.ext;
+package org.jboss.webbeans.integration.deployer.ext;
import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
Copied: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata (from rev 86882, projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata)
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/PostFacesConfigDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostFacesConfigDeployer.java 2009-04-06 21:52:51 UTC (rev 86882)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/PostFacesConfigDeployer.java 2009-04-06 22:28:44 UTC (rev 86887)
@@ -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.integration.microcontainer.deployer.metadata;
+package org.jboss.webbeans.integration.deployer.metadata;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.DeploymentStages;
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/PostJBossAppMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostJBossAppMetadataDeployer.java 2009-04-06 21:52:51 UTC (rev 86882)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/PostJBossAppMetadataDeployer.java 2009-04-06 22:28:44 UTC (rev 86887)
@@ -19,13 +19,13 @@
* 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.integration.microcontainer.deployer.metadata;
+package org.jboss.webbeans.integration.deployer.metadata;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.ear.jboss.JBossAppMetaData;
import org.jboss.virtual.VirtualFile;
-import org.jboss.webbeans.integration.microcontainer.deployer.DeployersUtils;
+import org.jboss.webbeans.integration.deployer.DeployersUtils;
/**
* Post jboss-app.xml webbeans deployer.
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/PostJBossMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostJBossMetadataDeployer.java 2009-04-06 21:52:51 UTC (rev 86882)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/PostJBossMetadataDeployer.java 2009-04-06 22:28:44 UTC (rev 86887)
@@ -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.integration.microcontainer.deployer.metadata;
+package org.jboss.webbeans.integration.deployer.metadata;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/PostJBossWebMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostJBossWebMetadataDeployer.java 2009-04-06 21:52:51 UTC (rev 86882)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/PostJBossWebMetadataDeployer.java 2009-04-06 22:28:44 UTC (rev 86887)
@@ -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.integration.microcontainer.deployer.metadata;
+package org.jboss.webbeans.integration.deployer.metadata;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/PostWebMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostWebMetadataDeployer.java 2009-04-06 21:52:51 UTC (rev 86882)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/PostWebMetadataDeployer.java 2009-04-06 22:28:44 UTC (rev 86887)
@@ -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.integration.microcontainer.deployer.metadata;
+package org.jboss.webbeans.integration.deployer.metadata;
import java.util.ArrayList;
import java.util.Arrays;
@@ -34,7 +34,7 @@
import org.jboss.metadata.web.spec.FiltersMetaData;
import org.jboss.metadata.web.spec.ListenerMetaData;
import org.jboss.virtual.VirtualFile;
-import org.jboss.webbeans.integration.microcontainer.deployer.DeployersUtils;
+import org.jboss.webbeans.integration.deployer.DeployersUtils;
/**
* Post web.xml webbeans deployer.
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WBEjbInterceptorMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WBEjbInterceptorMetadataDeployer.java 2009-04-06 21:52:51 UTC (rev 86882)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WBEjbInterceptorMetadataDeployer.java 2009-04-06 22:28:44 UTC (rev 86887)
@@ -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.integration.microcontainer.deployer.metadata;
+package org.jboss.webbeans.integration.deployer.metadata;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.DeploymentStages;
@@ -34,7 +34,7 @@
import org.jboss.metadata.ejb.spec.InterceptorMetaData;
import org.jboss.metadata.ejb.spec.InterceptorsMetaData;
import org.jboss.virtual.VirtualFile;
-import org.jboss.webbeans.integration.microcontainer.deployer.DeployersUtils;
+import org.jboss.webbeans.integration.deployer.DeployersUtils;
/**
* Adds wb custom interceptor to ejb deployments.
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WebBeansAwareMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansAwareMetadataDeployer.java 2009-04-06 21:52:51 UTC (rev 86882)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WebBeansAwareMetadataDeployer.java 2009-04-06 22:28:44 UTC (rev 86887)
@@ -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.integration.microcontainer.deployer.metadata;
+package org.jboss.webbeans.integration.deployer.metadata;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.DeploymentStages;
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WebBeansClassloadingDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansClassloadingDeployer.java 2009-04-06 21:52:51 UTC (rev 86882)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WebBeansClassloadingDeployer.java 2009-04-06 22:28:44 UTC (rev 86887)
@@ -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.integration.microcontainer.deployer.metadata;
+package org.jboss.webbeans.integration.deployer.metadata;
import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
import org.jboss.classloading.spi.metadata.ExportAll;
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WebBeansFilesDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansFilesDeployer.java 2009-04-06 21:52:51 UTC (rev 86882)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WebBeansFilesDeployer.java 2009-04-06 22:28:44 UTC (rev 86887)
@@ -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.integration.microcontainer.deployer.metadata;
+package org.jboss.webbeans.integration.deployer.metadata;
import java.util.ArrayList;
import java.util.Collection;
@@ -31,8 +31,8 @@
import org.jboss.deployers.vfs.spi.deployer.AbstractOptionalVFSRealDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.virtual.VirtualFile;
-import org.jboss.webbeans.integration.microcontainer.deployer.DeployersUtils;
-import org.jboss.webbeans.integration.microcontainer.deployer.ext.JBossWebBeansMetaData;
+import org.jboss.webbeans.integration.deployer.DeployersUtils;
+import org.jboss.webbeans.integration.deployer.ext.JBossWebBeansMetaData;
/**
* A deployer that collects all beans.xml files in deployment unit
Deleted: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/DeployersUtils.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/DeployersUtils.java 2009-04-06 22:13:07 UTC (rev 86886)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/DeployersUtils.java 2009-04-06 22:28:44 UTC (rev 86887)
@@ -1,109 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.webbeans.integration.microcontainer.deployer;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-
-/**
- * WebBeans deployers utils.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public final class DeployersUtils
-{
- private DeployersUtils()
- {
- }
-
- public static final String WEB_BEANS_FILES = "WEB_BEANS_FILES";
- public static final String WEB_BEANS_CLASSPATH = "WEB_BEANS_CLASSPATH";
- public static final String WEB_BEANS_DEPLOYMENT_FLAG = "WEB_BEANS_DEPLOYMENT_FLAG";
-
- public static final String WEB_BEANS_BOOTSTRAP_BEAN = "_WebBeansBootstrapBean";
-
- /**
- * Get bootstrap bean name.
- *
- * @param unit the deployment unit
- * @return webbeans bootstrap bean name
- */
- public static String getBootstrapBeanName(DeploymentUnit unit)
- {
- if (unit == null)
- throw new IllegalArgumentException("Null deployment unit");
-
- DeploymentUnit top = unit.getTopLevel();
- return top.getName() + WEB_BEANS_BOOTSTRAP_BEAN;
- }
-
- /**
- * Check deployment hierarchy for beans.xml files.
- * It checks the 'cached' flag.
- *
- * @param unit the deployment unit
- * @return true if beans.xml files exist, false otherwise
- */
- public static boolean checkForWebBeansFiles(DeploymentUnit unit)
- {
- if (unit == null)
- throw new IllegalArgumentException("Null deployment unit");
-
- DeploymentUnit top = unit.getTopLevel();
-
- Boolean flag = top.getAttachment(WEB_BEANS_DEPLOYMENT_FLAG, Boolean.class);
- if (flag != null)
- return flag;
-
- flag = searchForWebBeans(top);
- top.addAttachment(WEB_BEANS_DEPLOYMENT_FLAG, flag, Boolean.class);
-
- return flag;
- }
-
- /**
- * Search deployment hierarchy for beans.xml files.
- *
- * @param unit the deployment unit
- * @return true if beans.xml files exist, false otherwise
- */
- private static boolean searchForWebBeans(DeploymentUnit unit)
- {
- Collection files = unit.getAttachment(WEB_BEANS_FILES, Collection.class);
- if (files != null && files.isEmpty() == false)
- return true;
-
- List<DeploymentUnit> children = unit.getChildren();
- if (children != null && children.isEmpty() == false)
- {
- for (DeploymentUnit child : children)
- {
- boolean result = searchForWebBeans(child);
- if (result)
- return true;
- }
- }
- return false;
- }
-}
Modified: projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/webbeans/deployers/support/MockBootDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/webbeans/deployers/support/MockBootDeployer.java 2009-04-06 22:13:07 UTC (rev 86886)
+++ projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/webbeans/deployers/support/MockBootDeployer.java 2009-04-06 22:28:44 UTC (rev 86887)
@@ -30,8 +30,8 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.webbeans.context.api.BeanStore;
import org.jboss.webbeans.context.api.helpers.ConcurrentHashMapBeanStore;
-import org.jboss.webbeans.integration.microcontainer.deployer.env.WebBeanDiscoveryEnvironment;
-import org.jboss.webbeans.integration.microcontainer.deployer.DeployersUtils;
+import org.jboss.webbeans.integration.deployer.DeployersUtils;
+import org.jboss.webbeans.integration.deployer.env.WebBeanDiscoveryEnvironment;
/**
* Mock wb boot deployer.
Modified: projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/webbeans/deployers/support/WBDEWrapper.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/webbeans/deployers/support/WBDEWrapper.java 2009-04-06 22:13:07 UTC (rev 86886)
+++ projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/webbeans/deployers/support/WBDEWrapper.java 2009-04-06 22:28:44 UTC (rev 86887)
@@ -24,7 +24,7 @@
import java.net.URL;
import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
-import org.jboss.webbeans.integration.microcontainer.deployer.env.WebBeanDiscoveryEnvironment;
+import org.jboss.webbeans.integration.deployer.env.WebBeanDiscoveryEnvironment;
/**
* @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
Modified: projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/webbeans/deployers/test/BootDeployerTestCase.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/webbeans/deployers/test/BootDeployerTestCase.java 2009-04-06 22:13:07 UTC (rev 86886)
+++ projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/webbeans/deployers/test/BootDeployerTestCase.java 2009-04-06 22:28:44 UTC (rev 86887)
@@ -25,7 +25,7 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.test.webbeans.deployers.support.CheckableBootstrap;
import org.jboss.virtual.VirtualFile;
-import org.jboss.webbeans.integration.microcontainer.deployer.DeployersUtils;
+import org.jboss.webbeans.integration.deployer.DeployersUtils;
/**
* Test boot deployer.
Modified: projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.java 2009-04-06 22:13:07 UTC (rev 86886)
+++ projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.java 2009-04-06 22:28:44 UTC (rev 86887)
@@ -37,7 +37,7 @@
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;
+import org.jboss.webbeans.integration.deployer.env.WebBeanDiscoveryEnvironment;
/**
* WebBeansDiscovery env test case.
Modified: projects/webbeans-ri-int/trunk/deployer/src/test/resources/org/jboss/test/webbeans/deployers/test/BootDeployerTestCase.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/test/resources/org/jboss/test/webbeans/deployers/test/BootDeployerTestCase.xml 2009-04-06 22:13:07 UTC (rev 86886)
+++ projects/webbeans-ri-int/trunk/deployer/src/test/resources/org/jboss/test/webbeans/deployers/test/BootDeployerTestCase.xml 2009-04-06 22:28:44 UTC (rev 86887)
@@ -3,9 +3,9 @@
<bean name="EarStructure" class="org.jboss.test.deployers.vfs.structure.ear.support.MockEarStructureDeployer"/>
<bean name="WarStructure" class="org.jboss.test.deployers.vfs.structure.war.support.MockWarStructureDeployer"/>
- <bean name="JWBMDDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.ext.JBossWebBeansMetaDataDeployer"/>
- <bean name="WBFilesDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.WebBeansFilesDeployer"/>
- <bean name="WBDiscoveryDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.env.WebBeanDiscoveryDeployer"/>
+ <bean name="JWBMDDeployer" class="org.jboss.webbeans.integration.deployer.ext.JBossWebBeansMetaDataDeployer"/>
+ <bean name="WBFilesDeployer" class="org.jboss.webbeans.integration.deployer.metadata.WebBeansFilesDeployer"/>
+ <bean name="WBDiscoveryDeployer" class="org.jboss.webbeans.integration.deployer.env.WebBeanDiscoveryDeployer"/>
<bean name="BootDeployer" class="org.jboss.test.webbeans.deployers.support.MockBootDeployer"/>
Modified: projects/webbeans-ri-int/trunk/deployer/src/test/resources/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/test/resources/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.xml 2009-04-06 22:13:07 UTC (rev 86886)
+++ projects/webbeans-ri-int/trunk/deployer/src/test/resources/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.xml 2009-04-06 22:28:44 UTC (rev 86887)
@@ -10,12 +10,12 @@
<bean name="MockWeb" class="org.jboss.test.webbeans.deployers.support.deployer.MockWebDeployer"/>
<bean name="MockMergeJBoss" class="org.jboss.test.webbeans.deployers.support.deployer.MockMergeJBossDeployer"/>
- <bean name="WBFiles" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.WebBeansFilesDeployer"/>
+ <bean name="WBFiles" class="org.jboss.webbeans.integration.deployer.metadata.WebBeansFilesDeployer"/>
- <bean name="PostEjbJar" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.WBEjbInterceptorMetadataDeployer"/>
- <bean name="PostJBossApp" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.PostJBossAppMetadataDeployer"/>
- <bean name="PostJBoss" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.PostJBossMetadataDeployer"/>
- <bean name="PostJBossWeb" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.PostJBossWebMetadataDeployer"/>
- <bean name="PostWeb" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.PostWebMetadataDeployer"/>
+ <bean name="PostEjbJar" class="org.jboss.webbeans.integration.deployer.metadata.WBEjbInterceptorMetadataDeployer"/>
+ <bean name="PostJBossApp" class="org.jboss.webbeans.integration.deployer.metadata.PostJBossAppMetadataDeployer"/>
+ <bean name="PostJBoss" class="org.jboss.webbeans.integration.deployer.metadata.PostJBossMetadataDeployer"/>
+ <bean name="PostJBossWeb" class="org.jboss.webbeans.integration.deployer.metadata.PostJBossWebMetadataDeployer"/>
+ <bean name="PostWeb" class="org.jboss.webbeans.integration.deployer.metadata.PostWebMetadataDeployer"/>
</deployment>
Modified: projects/webbeans-ri-int/trunk/deployer/src/test/resources/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/test/resources/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.xml 2009-04-06 22:13:07 UTC (rev 86886)
+++ projects/webbeans-ri-int/trunk/deployer/src/test/resources/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.xml 2009-04-06 22:28:44 UTC (rev 86887)
@@ -3,8 +3,8 @@
<bean name="EarStructure" class="org.jboss.test.deployers.vfs.structure.ear.support.MockEarStructureDeployer"/>
<bean name="WarStructure" class="org.jboss.test.deployers.vfs.structure.war.support.MockWarStructureDeployer"/>
- <bean name="JWBMDDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.ext.JBossWebBeansMetaDataDeployer"/>
- <bean name="WBFilesDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.WebBeansFilesDeployer"/>
- <bean name="WBDiscoveryDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.env.WebBeanDiscoveryDeployer"/>
+ <bean name="JWBMDDeployer" class="org.jboss.webbeans.integration.deployer.ext.JBossWebBeansMetaDataDeployer"/>
+ <bean name="WBFilesDeployer" class="org.jboss.webbeans.integration.deployer.metadata.WebBeansFilesDeployer"/>
+ <bean name="WBDiscoveryDeployer" class="org.jboss.webbeans.integration.deployer.env.WebBeanDiscoveryDeployer"/>
</deployment>
More information about the jboss-cvs-commits
mailing list