[jboss-cvs] JBossAS SVN: r82667 - in projects/webbeans-ri-int/trunk/microcontainer/src: test/java/org/jboss/test/webbeans/deployers/support/deployer and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 7 12:43:14 EST 2009
Author: alesj
Date: 2009-01-07 12:43:14 -0500 (Wed, 07 Jan 2009)
New Revision: 82667
Added:
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/deployer/MockMergeJBossDeployer.java
Modified:
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WBEjbInterceptorMetadataDeployer.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/resources/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.xml
Log:
Use just JBMD view for interceptor.
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WBEjbInterceptorMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WBEjbInterceptorMetadataDeployer.java 2009-01-07 17:18:25 UTC (rev 82666)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WBEjbInterceptorMetadataDeployer.java 2009-01-07 17:43:14 UTC (rev 82667)
@@ -28,7 +28,6 @@
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
-import org.jboss.metadata.ejb.spec.EjbJarMetaData;
import org.jboss.metadata.ejb.spec.InterceptorMetaData;
import org.jboss.metadata.ejb.spec.InterceptorsMetaData;
import org.jboss.webbeans.integration.microcontainer.deployer.ext.JBossWebBeansMetaData;
@@ -45,7 +44,6 @@
public WBEjbInterceptorMetadataDeployer()
{
- addInput(EjbJarMetaData.class);
addInput(JBossMetaData.class);
addOutput(JBossMetaData.class);
addInput(JBossWebBeansMetaData.WEB_BEANS_FILES);
@@ -58,23 +56,6 @@
public void deploy(VFSDeploymentUnit unit) throws DeploymentException
{
- EjbJarMetaData ejbjar = unit.getAttachment(EjbJarMetaData.class);
- if (ejbjar != null && WebBeansAwareMetadataDeployer.checkForWebBeansFiles(unit))
- {
- InterceptorsMetaData interceptors = ejbjar.getInterceptors();
- if (interceptors == null && ejbjar instanceof EjbJar3xMetaData)
- {
- interceptors = new InterceptorsMetaData();
- EjbJar3xMetaData.class.cast(ejbjar).setInterceptors(interceptors);
- }
-
- if (interceptors != null)
- {
- interceptors.add(SBI);
- return;
- }
- }
-
JBossMetaData jbmd = unit.getAttachment(JBossMetaData.class);
if (jbmd != null && WebBeansAwareMetadataDeployer.checkForWebBeansFiles(unit))
{
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/deployer/MockMergeJBossDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/deployer/MockMergeJBossDeployer.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/deployer/MockMergeJBossDeployer.java 2009-01-07 17:43:14 UTC (rev 82667)
@@ -0,0 +1,51 @@
+/*
+ * 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.test.webbeans.deployers.support.deployer;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.DeploymentStages;
+import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.ejb.spec.EjbJarMetaData;
+
+/**
+ * Mock merge ejbjar md --> jboss md deployer.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class MockMergeJBossDeployer extends AbstractSimpleRealDeployer<EjbJarMetaData>
+{
+ public MockMergeJBossDeployer()
+ {
+ super(EjbJarMetaData.class);
+ addOutput(JBossMetaData.class);
+ setStage(DeploymentStages.POST_CLASSLOADER);
+ }
+
+ public void deploy(DeploymentUnit unit, EjbJarMetaData deployment) throws DeploymentException
+ {
+ JBossMetaData jbmd = new JBossMetaData();
+ jbmd.merge(null, deployment);
+ unit.addAttachment(JBossMetaData.class, jbmd);
+ }
+}
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-07 17:18:25 UTC (rev 82666)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.java 2009-01-07 17:43:14 UTC (rev 82667)
@@ -30,7 +30,6 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.metadata.common.ejb.IEjbJarMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.metadata.ejb.spec.EjbJarMetaData;
import org.jboss.metadata.ejb.spec.InterceptorMetaData;
import org.jboss.metadata.ejb.spec.InterceptorsMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
@@ -57,12 +56,12 @@
public void testSimpleJar() throws Exception
{
- testJar("simple", false, EjbJarMetaData.class);
+ testJar("simple", false);
}
public void testPostJar() throws Exception
{
- testJar("post", true, JBossMetaData.class);
+ testJar("post", true);
}
public void testSimpleWar() throws Exception
@@ -84,7 +83,7 @@
assertClassLoading(true, earDU);
DeploymentUnit jarDU = assertChild(earDU, "ejbs.jar");
- assertWBInterceptor(jarDU, EjbJarMetaData.class);
+ assertWBInterceptor(jarDU);
DeploymentUnit webDU = assertChild(earDU, "simple.war");
assertWBListener(webDU);
@@ -110,7 +109,7 @@
try
{
DeploymentUnit ejbDU = assertChild(topDU, "ejbs.jar");
- assertWBInterceptor(ejbDU, EjbJarMetaData.class);
+ assertWBInterceptor(ejbDU);
DeploymentUnit webDU = assertChild(topDU, "simple.war");
assertWBListener(webDU);
@@ -121,7 +120,7 @@
}
}
- protected void testJar(String type, boolean testCL, Class<? extends IEjbJarMetaData> clazz) throws Exception
+ protected void testJar(String type, boolean testCL) throws Exception
{
AssembledDirectory topLevel = createAssembledDirectory("ejbs.jar", "ejbs.jar");
addPath(topLevel, "/webbeans/" + type + "/ejb", "META-INF");
@@ -130,7 +129,7 @@
try
{
assertClassLoading(testCL, topDU);
- assertWBInterceptor(topDU, clazz);
+ assertWBInterceptor(topDU);
}
finally
{
@@ -173,9 +172,9 @@
assertEquals(equals, clmd.equals(classLoadingMetaData));
}
- protected void assertWBInterceptor(DeploymentUnit unit, Class<? extends IEjbJarMetaData> clazz)
+ protected void assertWBInterceptor(DeploymentUnit unit)
{
- IEjbJarMetaData ejbmd = unit.getAttachment(clazz);
+ IEjbJarMetaData ejbmd = unit.getAttachment(JBossMetaData.class);
assertNotNull(ejbmd);
InterceptorsMetaData interceptors = ejbmd.getInterceptors();
assertNotNull(interceptors);
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.xml
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.xml 2009-01-07 17:18:25 UTC (rev 82666)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.xml 2009-01-07 17:43:14 UTC (rev 82667)
@@ -8,6 +8,7 @@
<bean name="MockJBoss" class="org.jboss.test.webbeans.deployers.support.deployer.MockJBossDeployer"/>
<bean name="MockJBossWeb" class="org.jboss.test.webbeans.deployers.support.deployer.MockJBossWebDeployer"/>
<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"/>
More information about the jboss-cvs-commits
mailing list