[jboss-cvs] JBossAS SVN: r79573 - in projects/microcontainer/trunk: kernel/src/main/java/org/jboss/beans/metadata/plugins and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Oct 16 05:17:04 EDT 2008
Author: alesj
Date: 2008-10-16 05:17:03 -0400 (Thu, 16 Oct 2008)
New Revision: 79573
Added:
projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/test/MockEjb3DependsTestCase.java
projects/microcontainer/trunk/kernel/src/test/resources/org/jboss/test/kernel/deployment/test/MockEjb3DependsTestCase.xml
Modified:
projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractDependencyItem.java
projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractDemandMetaData.java
projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/test/DeploymentTestSuite.java
Log:
[JBMICROCONT-365]; fix demand dependency resolution against ObjectName.
Modified: projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractDependencyItem.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractDependencyItem.java 2008-10-16 09:15:55 UTC (rev 79572)
+++ projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractDependencyItem.java 2008-10-16 09:17:03 UTC (rev 79573)
@@ -212,12 +212,16 @@
protected void setIDependOn(Object iDependOn)
{
this.iDependOn = iDependOn;
-
- // HACK: Try to fixup JMX like ObjectNames to their canonical name
- Object fixup = JMXObjectNameFix.needsAnAlias(iDependOn);
- if (fixup != null)
- this.iDependOn = fixup;
+ // only check if not null
+ if (iDependOn != null)
+ {
+ // HACK: Try to fixup JMX like ObjectNames to their canonical name
+ Object fixup = JMXObjectNameFix.needsAnAlias(iDependOn);
+ if (fixup != null)
+ this.iDependOn = fixup;
+ }
+
flushJBossObjectCache();
}
Modified: projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractDemandMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractDemandMetaData.java 2008-10-16 09:15:55 UTC (rev 79572)
+++ projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractDemandMetaData.java 2008-10-16 09:17:03 UTC (rev 79573)
@@ -33,6 +33,7 @@
import org.jboss.beans.metadata.spi.MetaDataVisitor;
import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
import org.jboss.dependency.plugins.AbstractDependencyItem;
+import org.jboss.dependency.plugins.JMXObjectNameFix;
import org.jboss.dependency.spi.Controller;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerState;
@@ -212,7 +213,15 @@
*/
protected Object getDemandObject()
{
- return (matcher != null) ? matcher : getDemand();
+ if (matcher == null)
+ {
+ Object fixup = JMXObjectNameFix.needsAnAlias(getDemand());
+ return (fixup != null) ? fixup : getDemand();
+ }
+ else
+ {
+ return matcher;
+ }
}
public boolean resolve(Controller controller)
Modified: projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/test/DeploymentTestSuite.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/test/DeploymentTestSuite.java 2008-10-16 09:15:55 UTC (rev 79572)
+++ projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/test/DeploymentTestSuite.java 2008-10-16 09:17:03 UTC (rev 79573)
@@ -68,6 +68,7 @@
suite.addTest(MutableMetaDataTestCase.suite());
suite.addTest(AnnotationRedeployTestCase.suite());
suite.addTest(MockServiceBindingTestCase.suite());
+ suite.addTest(MockEjb3DependsTestCase.suite());
suite.addTest(AnnotationUsageTestCase.suite());
suite.addTest(PropertyUsageTestCase.suite());
// bean container tests
Copied: projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/test/MockEjb3DependsTestCase.java (from rev 79511, projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/test/MockServiceBindingTestCase.java)
===================================================================
--- projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/test/MockEjb3DependsTestCase.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/test/MockEjb3DependsTestCase.java 2008-10-16 09:17:03 UTC (rev 79573)
@@ -0,0 +1,48 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.kernel.deployment.test;
+
+import junit.framework.Test;
+import org.jboss.test.kernel.deployment.support.SimpleBean;
+
+/**
+ * MockEjb3DependsTestCase: JBMICROCONT-365
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class MockEjb3DependsTestCase extends AbstractDeploymentTest
+{
+ public MockEjb3DependsTestCase(String name) throws Throwable
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(MockEjb3DependsTestCase.class);
+ }
+
+ public void testDepends() throws Throwable
+ {
+ assertBean("EJB", SimpleBean.class);
+ }
+}
\ No newline at end of file
Copied: projects/microcontainer/trunk/kernel/src/test/resources/org/jboss/test/kernel/deployment/test/MockEjb3DependsTestCase.xml (from rev 79511, projects/microcontainer/trunk/kernel/src/test/resources/org/jboss/test/kernel/deployment/test/MockServiceBindingTestCase.xml)
===================================================================
--- projects/microcontainer/trunk/kernel/src/test/resources/org/jboss/test/kernel/deployment/test/MockEjb3DependsTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/test/resources/org/jboss/test/kernel/deployment/test/MockEjb3DependsTestCase.xml 2008-10-16 09:17:03 UTC (rev 79573)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="jboss.jca:name=DefaultDS,service=DataSourceBinding" class="org.jboss.test.kernel.deployment.support.SimpleBeanImpl"/>
+
+ <bean name="EJB" class="org.jboss.test.kernel.deployment.support.SimpleBeanImpl">
+ <demand>jboss.jca:service=DataSourceBinding,name=DefaultDS</demand>
+ </bean>
+
+</deployment>
More information about the jboss-cvs-commits
mailing list