[jboss-cvs] JBossAS SVN: r99067 - in projects/kernel/trunk/kernel/src: main/java/org/jboss/beans/metadata/plugins and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 6 11:03:06 EST 2010
Author: alesj
Date: 2010-01-06 11:03:06 -0500 (Wed, 06 Jan 2010)
New Revision: 99067
Added:
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/Filter.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/MockFilterMatcherAndParser.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/Wanted.java
projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/qualifiers/test/QualifiersXmlTestCase#testQualifierFilterContent_Not_Automatic.xml
Modified:
projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/api/model/QualifierContent.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ClassAndQualifierKey.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/qualifier/DefaultEqualsMatcher.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/spi/qualifier/QualifierMatcher.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/spi/qualifier/QualifierMatchers.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/TestMatcherAndParser.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test/QualifiersXmlTestCase.java
projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/qualifiers/test/QualifiersXmlTestCase#testQualifierAnnotationContent.xml
Log:
Test if we can impl OSGi filtering.
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/api/model/QualifierContent.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/api/model/QualifierContent.java 2010-01-06 15:49:30 UTC (rev 99066)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/api/model/QualifierContent.java 2010-01-06 16:03:06 UTC (rev 99067)
@@ -123,7 +123,7 @@
* has already been created return the existing instance. Otherwise create it
* and store it for future reference.
*
- * @param the content type string
+ * @param contentString content type string
* @return the content type instance
*/
public static QualifierContent getContent(String contentString)
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java 2010-01-06 15:49:30 UTC (rev 99066)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java 2010-01-06 16:03:06 UTC (rev 99067)
@@ -444,8 +444,7 @@
{
allQualifiers = new HashSet<Object>(qualifiers.size());
for (RelatedClassMetaData rcmd : qualifiers)
- allQualifiers.addAll(rcmd.getEnabled());
-
+ allQualifiers.addAll(rcmd.getEnabled());
}
if (qualifierAnnotations != null && qualifierAnnotations.size() > 0)
@@ -487,7 +486,9 @@
* Create a class and qualifier key for qualified contextual injection
*
* @param injectionClass the class
+ * @param allQualifiers all qualifiers
* @return the created key
+ * @throws Exception for any error
*/
QualifierMatcher createClassAndQualifierMatcher(Class<?> injectionClass, Set<Object> allQualifiers) throws Exception
{
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ClassAndQualifierKey.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ClassAndQualifierKey.java 2010-01-06 15:49:30 UTC (rev 99066)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ClassAndQualifierKey.java 2010-01-06 16:03:06 UTC (rev 99067)
@@ -24,6 +24,7 @@
import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -160,7 +161,6 @@
return getFirstContext(contexts);
List<ControllerContext> found = getContextWithAllRequiredAndMostOptionalQualifiers(requiredQualifiers, optionalQualifiers, contexts);
-
return getFirstContext(found);
}
@@ -198,11 +198,13 @@
for (ControllerContext context : contexts)
{
Set<Object> suppliedQualifiers = QualifiersMdrUtil.mergeSuppliedQualifiersFromMdr(context);
+ if (suppliedQualifiers == null) // TODO -- too strict?
+ suppliedQualifiers = Collections.emptySet();
int matches = 0;
boolean allRequired = true;
- if (requiredQualifiers != null && requiredQualifiers.size() > 0 && suppliedQualifiers != null && suppliedQualifiers.size() > 0)
+ if (requiredQualifiers != null && requiredQualifiers.size() > 0)
{
for (Object qualifier : requiredQualifiers)
{
@@ -215,7 +217,7 @@
break;
}
}
- if (allRequired && optionalQualifiers != null && optionalQualifiers.size() > 0 && suppliedQualifiers != null && suppliedQualifiers.size() > 0)
+ if (allRequired && optionalQualifiers != null && optionalQualifiers.size() > 0)
{
for (Object qualifier : optionalQualifiers)
{
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/qualifier/DefaultEqualsMatcher.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/qualifier/DefaultEqualsMatcher.java 2010-01-06 15:49:30 UTC (rev 99066)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/qualifier/DefaultEqualsMatcher.java 2010-01-06 16:03:06 UTC (rev 99067)
@@ -12,7 +12,7 @@
* when comparing.
* @see QualifierMatcher#matches(ControllerContext, Set, Object)
*/
-public class DefaultEqualsMatcher implements QualifierMatcher
+public class DefaultEqualsMatcher implements QualifierMatcher<Object>
{
public static final QualifierMatcher SINGLETON = new DefaultEqualsMatcher();
@@ -25,8 +25,8 @@
return suppliedQualifiers.contains(qualifier);
}
- public Class<?> getHandledType()
+ public Class<Object> getHandledType()
{
- return null;
+ return Object.class;
}
}
\ No newline at end of file
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/spi/qualifier/QualifierMatcher.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/spi/qualifier/QualifierMatcher.java 2010-01-06 15:49:30 UTC (rev 99066)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/spi/qualifier/QualifierMatcher.java 2010-01-06 16:03:06 UTC (rev 99067)
@@ -29,18 +29,19 @@
* Abstraction to check if a qualifier exists in a context's set of supplied qualifiers. A QualifierMatcher
* handles a particular class of wanted qualifier and can check a candidate context and/or its supplied qualifiers
* to see if the wanted qualifier is satisfied.
- *
+ *
+ * @param <T> exact handled type
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision: 1.1 $
*/
-public interface QualifierMatcher
+public interface QualifierMatcher<T>
{
/**
* The class of qualifier handled
*
* @return the class of qualifier handled
*/
- Class<?> getHandledType();
+ Class<T> getHandledType();
/**
* Check whether the passed in qualifier matches the context and/or the context's supplied qualifiers
@@ -50,5 +51,5 @@
* @param qualifier the qualifier to check against the context and/or its qualifiers
* @return true if there is a match
*/
- boolean matches(ControllerContext context, Set<Object> suppliedQualifiers, Object qualifier);
+ boolean matches(ControllerContext context, Set<Object> suppliedQualifiers, T qualifier);
}
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/spi/qualifier/QualifierMatchers.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/spi/qualifier/QualifierMatchers.java 2010-01-06 15:49:30 UTC (rev 99066)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/spi/qualifier/QualifierMatchers.java 2010-01-06 16:03:06 UTC (rev 99067)
@@ -88,6 +88,7 @@
* @param qualifier the qualifier to check against the context and/or its qualifiers
* @return true if there is a match
*/
+ @SuppressWarnings({"unchecked"})
public boolean matches(ControllerContext context, Set<Object> suppliedQualifiers, Object qualifier)
{
QualifierMatcher matcher = matchers.get(qualifier.getClass());
Added: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/Filter.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/Filter.java (rev 0)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/Filter.java 2010-01-06 16:03:06 UTC (rev 99067)
@@ -0,0 +1,58 @@
+/*
+ * 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.kernel.qualifiers.support;
+
+import java.util.Dictionary;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class Filter
+{
+ private Map<String, String> props = new HashMap<String, String>();
+
+ public Filter(String string)
+ {
+ String[] ps = string.split(",");
+ for(String p : ps)
+ {
+ String[] pps = p.split("=");
+ props.put(pps[0], pps[1]);
+ }
+ }
+
+ public boolean filter(Dictionary<String, Object> dictionary)
+ {
+ if (dictionary == null || dictionary.isEmpty())
+ return false;
+
+ for (Map.Entry<String, String> entry : props.entrySet())
+ {
+ Object value = dictionary.get(entry.getKey());
+ if (entry.getValue().equals(value) == false)
+ return false;
+ }
+ return true;
+ }
+}
\ No newline at end of file
Copied: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/MockFilterMatcherAndParser.java (from rev 99060, projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/TestMatcherAndParser.java)
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/MockFilterMatcherAndParser.java (rev 0)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/MockFilterMatcherAndParser.java 2010-01-06 16:03:06 UTC (rev 99067)
@@ -0,0 +1,76 @@
+/*
+* 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.test.kernel.qualifiers.support;
+
+import java.util.Dictionary;
+import java.util.Set;
+
+import org.jboss.beans.metadata.api.model.QualifierContent;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.kernel.spi.qualifier.QualifierMatcher;
+import org.jboss.kernel.spi.qualifier.QualifierParser;
+import org.jboss.metadata.spi.MetaData;
+import org.jboss.metadata.spi.scope.CommonLevels;
+
+/**
+ * Mock filter parser & matcher.
+ *
+ * @author <a href="ales.justin at jboss.org">Ales Justin</a>
+ * @version $Revision: 1.1 $
+ */
+public class MockFilterMatcherAndParser implements QualifierMatcher<Filter>, QualifierParser
+{
+ public static MockFilterMatcherAndParser INSTANCE = new MockFilterMatcherAndParser();
+
+ private MockFilterMatcherAndParser()
+ {
+ }
+
+ public QualifierContent getHandledContent()
+ {
+ return QualifierContent.getContent("Filter");
+ }
+
+ public Class<Filter> getHandledType()
+ {
+ return Filter.class;
+ }
+
+ @SuppressWarnings({"unchecked"})
+ public boolean matches(ControllerContext context, Set<Object> suppliedQualifiers, Filter filter)
+ {
+ MetaData metaData = context.getScopeInfo().getMetaData();
+ MetaData instanceMD = metaData.getScopeMetaData(CommonLevels.INSTANCE);
+ Dictionary<String, Object> dictionary = instanceMD.getMetaData(Dictionary.class);
+ return filter.filter(dictionary);
+ }
+
+ public Object parseSupplied(ClassLoader cl, Object rawQualifier)
+ {
+ return new Filter((String)rawQualifier);
+ }
+
+ public Object parseWanted(ClassLoader cl, Object object)
+ {
+ return new Filter((String)object);
+ }
+}
\ No newline at end of file
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/TestMatcherAndParser.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/TestMatcherAndParser.java 2010-01-06 15:49:30 UTC (rev 99066)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/TestMatcherAndParser.java 2010-01-06 16:03:06 UTC (rev 99067)
@@ -18,7 +18,7 @@
* 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.qualifiers.support;
import java.util.Set;
@@ -29,37 +29,33 @@
import org.jboss.kernel.spi.qualifier.QualifierParser;
/**
- *
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision: 1.1 $
*/
-public class TestMatcherAndParser implements QualifierMatcher, QualifierParser
+public class TestMatcherAndParser implements QualifierMatcher<Wanted>, QualifierParser
{
public static TestMatcherAndParser INSTANCE = new TestMatcherAndParser();
-
+
private TestMatcherAndParser()
{
}
-
+
public QualifierContent getHandledContent()
{
return QualifierContent.getContent("Test");
}
- public Class<?> getHandledType()
+ public Class<Wanted> getHandledType()
{
return Wanted.class;
}
-
- public boolean matches(ControllerContext context, Set<Object> suppliedQualifiers, Object qualifier)
+
+ public boolean matches(ControllerContext context, Set<Object> suppliedQualifiers, Wanted qualifier)
{
- if (qualifier instanceof Wanted)
+ for (Object supplied : suppliedQualifiers)
{
- for (Object supplied : suppliedQualifiers)
- {
- if (supplied instanceof Supplied)
- return ((Wanted)qualifier).getString().equals(((Supplied)supplied).getString());
- }
+ if (supplied instanceof Supplied)
+ return qualifier.getString().equals(((Supplied)supplied).getString());
}
return false;
}
@@ -91,23 +87,4 @@
return string;
}
}
-
- private static class Wanted
- {
- String string;
-
- public Wanted(String string)
- {
- this.string = string;
-
- if (string.startsWith("xxx-"))
- string = string.substring(4);
- this.string = string;
- }
-
- public String getString()
- {
- return string;
- }
- }
}
Added: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/Wanted.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/Wanted.java (rev 0)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/support/Wanted.java 2010-01-06 16:03:06 UTC (rev 99067)
@@ -0,0 +1,44 @@
+/*
+ * 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.kernel.qualifiers.support;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class Wanted
+{
+ String string;
+
+ public Wanted(String string)
+ {
+ this.string = string;
+
+ if (string.startsWith("xxx-"))
+ string = string.substring(4);
+ this.string = string;
+ }
+
+ public String getString()
+ {
+ return string;
+ }
+}
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test/QualifiersXmlTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test/QualifiersXmlTestCase.java 2010-01-06 15:49:30 UTC (rev 99066)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test/QualifiersXmlTestCase.java 2010-01-06 16:03:06 UTC (rev 99067)
@@ -21,11 +21,27 @@
*/
package org.jboss.test.kernel.qualifiers.test;
+import java.util.Dictionary;
+import java.util.Hashtable;
+
import junit.framework.Test;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.kernel.spi.deployment.KernelDeployment;
+import org.jboss.kernel.spi.metadata.KernelMetaDataRepository;
import org.jboss.kernel.spi.qualifier.QualifierMatchers;
+import org.jboss.metadata.plugins.loader.memory.MemoryMetaDataLoader;
+import org.jboss.metadata.spi.loader.MutableMetaDataLoader;
+import org.jboss.metadata.spi.repository.MutableMetaDataRepository;
+import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
+import org.jboss.metadata.spi.scope.CommonLevels;
+import org.jboss.metadata.spi.scope.Scope;
+import org.jboss.metadata.spi.scope.ScopeKey;
import org.jboss.test.kernel.junit.MicrocontainerTest;
import org.jboss.test.kernel.qualifiers.support.Bean;
+import org.jboss.test.kernel.qualifiers.support.MockFilterMatcherAndParser;
import org.jboss.test.kernel.qualifiers.support.Target;
import org.jboss.test.kernel.qualifiers.support.TargetAllBean;
import org.jboss.test.kernel.qualifiers.support.TargetBean;
@@ -217,10 +233,59 @@
testNonCustomBeanQualifiers(false, false);
}
-
+
+ public void testQualifierFilterContent() throws Throwable
+ {
+ QualifierMatchers.getInstance().addParser(MockFilterMatcherAndParser.INSTANCE);
+ QualifierMatchers.getInstance().addMatcher(MockFilterMatcherAndParser.INSTANCE);
+
+ KernelControllerContext context = deploy(BeanMetaDataBuilder.createBuilder("foobar", Bean.class.getName()).getBeanMetaData());
+ try
+ {
+ Kernel kernel = context.getKernel();
+ KernelMetaDataRepository repository = kernel.getMetaDataRepository();
+ ScopeKey contextScopeKey = context.getScopeInfo().getMutableScope();
+ Scope scope = contextScopeKey.getScope(CommonLevels.INSTANCE);
+ ScopeKey key = new ScopeKey(scope);
+ MutableMetaDataRepository mutable = repository.getMetaDataRepository();
+ MetaDataRetrieval retrieval = mutable.getMetaDataRetrieval(key);
+ if (retrieval == null)
+ {
+ retrieval = new MemoryMetaDataLoader(key);
+ mutable.addMetaDataRetrieval(retrieval);
+ }
+ else if (retrieval.retrieveMetaData(Dictionary.class) != null)
+ {
+ return; // we already have Dictionary
+ }
+
+ if (retrieval instanceof MutableMetaDataLoader)
+ {
+ MutableMetaDataLoader mmdl = (MutableMetaDataLoader)retrieval;
+ Dictionary<String, Object> dictionary = new Hashtable<String, Object>();
+ dictionary.put("a", "b");
+ mmdl.addMetaData(dictionary, Dictionary.class);
+ }
+
+ KernelDeployment deployment = deploy("QualifiersXmlTestCase#testQualifierFilterContent_Not_Automatic.xml");
+ try
+ {
+ assertBean("target", TargetAllBean.class);
+ }
+ finally
+ {
+ undeploy(deployment);
+ }
+ }
+ finally
+ {
+ undeploy(context);
+ }
+ }
+
private void testNonCustomBeanQualifiers(boolean hasParser, boolean hasMatcher) throws Throwable
{
- deploy("QualifiersXmlTestCase#testCustomBeanQualifiers_Not_Automatic.xml");
+ KernelDeployment deployment = deploy("QualifiersXmlTestCase#testCustomBeanQualifiers_Not_Automatic.xml");
try
{
if (hasParser)
@@ -250,7 +315,7 @@
}
finally
{
- undeploy("QualifiersXmlTestCase#testCustomBeanQualifiers_Not_Automatic.xml");
+ undeploy(deployment);
}
}
Modified: projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/qualifiers/test/QualifiersXmlTestCase#testQualifierAnnotationContent.xml
===================================================================
--- projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/qualifiers/test/QualifiersXmlTestCase#testQualifierAnnotationContent.xml 2010-01-06 15:49:30 UTC (rev 99066)
+++ projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/qualifiers/test/QualifiersXmlTestCase#testQualifierAnnotationContent.xml 2010-01-06 16:03:06 UTC (rev 99067)
@@ -40,6 +40,5 @@
</parameter>
</install>
</bean>
-
</deployment>
Added: projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/qualifiers/test/QualifiersXmlTestCase#testQualifierFilterContent_Not_Automatic.xml
===================================================================
--- projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/qualifiers/test/QualifiersXmlTestCase#testQualifierFilterContent_Not_Automatic.xml (rev 0)
+++ projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/qualifiers/test/QualifiersXmlTestCase#testQualifierFilterContent_Not_Automatic.xml 2010-01-06 16:03:06 UTC (rev 99067)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="target" class="org.jboss.test.kernel.qualifiers.support.TargetAllBean">
+ <constructor>
+ <parameter>
+ <inject>
+ <qualifier content="Filter" type="Required">a=b</qualifier>
+ </inject>
+ </parameter>
+ </constructor>
+ <property name="fieldBean">
+ <inject>
+ <qualifier content="Filter" type="Required">a=b</qualifier>
+ </inject>
+ </property>
+ <install method="installBean">
+ <parameter>
+ <inject>
+ <qualifier content="Filter" type="Required">a=b</qualifier>
+ </inject>
+ </parameter>
+ </install>
+ </bean>
+
+</deployment>
More information about the jboss-cvs-commits
mailing list