[jboss-cvs] JBossAS SVN: r83807 - in projects/microcontainer/trunk: dependency/src/main/java/org/jboss/dependency/plugins/graph and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 3 06:52:44 EST 2009
Author: alesj
Date: 2009-02-03 06:52:44 -0500 (Tue, 03 Feb 2009)
New Revision: 83807
Added:
projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/plugins/graph/LazySearchInfo.java
projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/SearchInfoValueAdapter.java
Modified:
projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/package-info.java
projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/plugins/graph/ScopeKeySearchInfo.java
projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/plugins/graph/Search.java
projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/plugins/graph/SearchDependencyItem.java
projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/spi/graph/SearchInfo.java
projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractDependencyValueMetaData.java
projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractSearchValueMetaData.java
projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/policy/package-info.java
projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/ValueUtil.java
projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/SearchClassContextDependencyItem.java
projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/deployment/package-info.java
Log:
[JBMICROCONT-406]; use search info.
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/package-info.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/package-info.java 2009-02-03 11:47:16 UTC (rev 83806)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/package-info.java 2009-02-03 11:52:44 UTC (rev 83807)
@@ -22,14 +22,17 @@
@JBossXmlAdaptedTypes
({
@JBossXmlAdaptedType(type=Cardinality.class, valueAdapter=CardinalityValueAdapter.class),
- @JBossXmlAdaptedType(type=ControllerState.class, valueAdapter=ControllerStateValueAdapter.class)
+ @JBossXmlAdaptedType(type=ControllerState.class, valueAdapter=ControllerStateValueAdapter.class),
+ @JBossXmlAdaptedType(type=SearchInfo.class, valueAdapter=SearchInfoValueAdapter.class)
})
package org.jboss.aop.microcontainer.beans.metadata;
import org.jboss.beans.metadata.plugins.CardinalityValueAdapter;
import org.jboss.beans.metadata.plugins.ControllerStateValueAdapter;
+import org.jboss.beans.metadata.plugins.SearchInfoValueAdapter;
import org.jboss.dependency.spi.Cardinality;
import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.spi.graph.SearchInfo;
import org.jboss.xb.annotations.JBossXmlAdaptedType;
import org.jboss.xb.annotations.JBossXmlAdaptedTypes;
Added: projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/plugins/graph/LazySearchInfo.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/plugins/graph/LazySearchInfo.java (rev 0)
+++ projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/plugins/graph/LazySearchInfo.java 2009-02-03 11:52:44 UTC (rev 83807)
@@ -0,0 +1,90 @@
+/*
+ * 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.dependency.plugins.graph;
+
+import java.util.Collections;
+import java.util.Map;
+import java.io.Serializable;
+
+import org.jboss.dependency.spi.graph.LookupStrategy;
+import org.jboss.dependency.spi.graph.SearchInfo;
+import org.jboss.reflect.plugins.introspection.ReflectionUtils;
+
+/**
+ * Lazy search info.
+ * The type is the class.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class LazySearchInfo implements SearchInfo, Serializable
+{
+ private static final long serialVersionUID = 1L;
+
+ private String className;
+ private transient LookupStrategy strategy;
+
+ public LazySearchInfo(String className)
+ {
+ if (className == null)
+ throw new IllegalArgumentException("Null class name");
+
+ this.className = className;
+ }
+
+ public String getType()
+ {
+ return className;
+ }
+
+ public Map<String, ?> getInfo()
+ {
+ return Collections.emptyMap();
+ }
+
+ public LookupStrategy getStrategy()
+ {
+ if (strategy == null)
+ {
+ Object result;
+ try
+ {
+ result = ReflectionUtils.newInstance(className);
+ }
+ catch (Throwable t)
+ {
+ throw new RuntimeException(t);
+ }
+
+ if (LookupStrategy.class.isInstance(result) == false)
+ throw new IllegalArgumentException("Result is not LookupStrategy instance: " + result);
+
+ strategy = LookupStrategy.class.cast(result);
+ }
+ return strategy;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "LazySearchInfo: " + className;
+ }
+}
Modified: projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/plugins/graph/ScopeKeySearchInfo.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/plugins/graph/ScopeKeySearchInfo.java 2009-02-03 11:47:16 UTC (rev 83806)
+++ projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/plugins/graph/ScopeKeySearchInfo.java 2009-02-03 11:52:44 UTC (rev 83807)
@@ -21,6 +21,7 @@
*/
package org.jboss.dependency.plugins.graph;
+import java.io.Serializable;
import java.util.Collections;
import java.util.Map;
import java.util.Set;
@@ -38,8 +39,10 @@
*
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
-public class ScopeKeySearchInfo implements SearchInfo
+public class ScopeKeySearchInfo implements SearchInfo, Serializable
{
+ private static final long serialVersionUID = 1L;
+
public static final String SCOPE_KEY = "ScopeKey";
private ScopeKey scopeKey;
private Map<String, ?> info;
Modified: projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/plugins/graph/Search.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/plugins/graph/Search.java 2009-02-03 11:47:16 UTC (rev 83806)
+++ projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/plugins/graph/Search.java 2009-02-03 11:52:44 UTC (rev 83807)
@@ -55,19 +55,25 @@
}
/**
- * Get Search enum instance.
+ * Get SearchInfo instance.
*
* @param typeString the type string
- * @return matching instance, default if none found
+ * @return matching instance, lazy if none found
*/
- public static Search getInstance(String typeString)
+ public static SearchInfo getInstance(String typeString)
{
+ if (typeString == null || typeString.length() == 0)
+ {
+ return DEFAULT;
+ }
+
for(Search search : values())
{
- if (search.getType().equalsIgnoreCase(typeString))
+ if (search.getType().equalsIgnoreCase(typeString) || search.name().equalsIgnoreCase(typeString))
return search;
}
- return DEFAULT;
+
+ return new LazySearchInfo(typeString);
}
public String getType()
Modified: projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/plugins/graph/SearchDependencyItem.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/plugins/graph/SearchDependencyItem.java 2009-02-03 11:47:16 UTC (rev 83806)
+++ projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/plugins/graph/SearchDependencyItem.java 2009-02-03 11:52:44 UTC (rev 83807)
@@ -21,13 +21,14 @@
*/
package org.jboss.dependency.plugins.graph;
-import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.plugins.AbstractDependencyItem;
import org.jboss.dependency.spi.Controller;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerMode;
+import org.jboss.dependency.spi.ControllerState;
import org.jboss.dependency.spi.graph.GraphController;
import org.jboss.dependency.spi.graph.LookupStrategy;
-import org.jboss.dependency.plugins.AbstractDependencyItem;
+import org.jboss.dependency.spi.graph.SearchInfo;
/**
* Search dependency item.
@@ -36,9 +37,9 @@
*/
public class SearchDependencyItem extends AbstractDependencyItem
{
- private Search search;
+ private SearchInfo search;
- public SearchDependencyItem(Object name, Object iDependOn, ControllerState whenRequired, ControllerState dependentState, Search search)
+ public SearchDependencyItem(Object name, Object iDependOn, ControllerState whenRequired, ControllerState dependentState, SearchInfo search)
{
super(name, iDependOn, whenRequired, dependentState);
this.search = search;
Modified: projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/spi/graph/SearchInfo.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/spi/graph/SearchInfo.java 2009-02-03 11:47:16 UTC (rev 83806)
+++ projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/spi/graph/SearchInfo.java 2009-02-03 11:52:44 UTC (rev 83807)
@@ -22,6 +22,7 @@
package org.jboss.dependency.spi.graph;
import java.util.Map;
+import javax.xml.bind.annotation.XmlTransient;
/**
* Search info.
@@ -41,6 +42,7 @@
*
* @return the type
*/
+ @XmlTransient
String getType();
/**
@@ -49,6 +51,7 @@
*
* @return the additional info
*/
+ @XmlTransient
Map<String, ?> getInfo();
/**
@@ -60,5 +63,6 @@
*
* @return the strategy or null depending on GraphContorller
*/
+ @XmlTransient
LookupStrategy getStrategy();
}
Modified: projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractDependencyValueMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractDependencyValueMetaData.java 2009-02-03 11:47:16 UTC (rev 83806)
+++ projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractDependencyValueMetaData.java 2009-02-03 11:52:44 UTC (rev 83807)
@@ -34,8 +34,9 @@
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.dependency.spi.DependencyItem;
+import org.jboss.dependency.spi.dispatch.AttributeDispatchContext;
import org.jboss.dependency.spi.graph.LookupStrategy;
-import org.jboss.dependency.spi.dispatch.AttributeDispatchContext;
+import org.jboss.dependency.spi.graph.SearchInfo;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.managed.api.annotation.ManagementProperty;
import org.jboss.reflect.spi.TypeInfo;
@@ -83,7 +84,7 @@
/**
* The search type
*/
- protected Search search = Search.DEFAULT;
+ protected SearchInfo search = Search.DEFAULT;
/**
@@ -205,7 +206,7 @@
* @param search the search type
*/
@XmlAttribute(name = "search")
- public void setSearch(Search search)
+ public void setSearch(SearchInfo search)
{
this.search = search;
}
@@ -215,7 +216,7 @@
*
* @return the search type
*/
- public Search getSearch()
+ public SearchInfo getSearch()
{
return search;
}
@@ -318,6 +319,9 @@
public void initialVisit(MetaDataVisitor visitor)
{
+ if (search == null)
+ throw new IllegalArgumentException("Null search");
+
context = visitor.getControllerContext();
ControllerState whenRequired = whenRequiredState;
Modified: projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractSearchValueMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractSearchValueMetaData.java 2009-02-03 11:47:16 UTC (rev 83806)
+++ projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractSearchValueMetaData.java 2009-02-03 11:52:44 UTC (rev 83807)
@@ -35,6 +35,7 @@
import org.jboss.dependency.spi.DependencyItem;
import org.jboss.dependency.spi.dispatch.AttributeDispatchContext;
import org.jboss.dependency.spi.graph.GraphController;
+import org.jboss.dependency.spi.graph.SearchInfo;
import org.jboss.managed.api.annotation.ManagementProperty;
import org.jboss.reflect.spi.TypeInfo;
import org.jboss.util.JBossStringBuilder;
@@ -54,7 +55,7 @@
private static final long serialVersionUID = 1L;
private ControllerState state;
- private org.jboss.dependency.plugins.graph.Search search;
+ private SearchInfo search;
private String property;
private ControllerContext context;
@@ -64,7 +65,7 @@
{
}
- public AbstractSearchValueMetaData(Object value, ControllerState state, Search search, String property)
+ public AbstractSearchValueMetaData(Object value, ControllerState state, SearchInfo search, String property)
{
super(value);
if (search == null)
Copied: projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/SearchInfoValueAdapter.java (from rev 83617, projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/ControllerStateValueAdapter.java)
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/SearchInfoValueAdapter.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/SearchInfoValueAdapter.java 2009-02-03 11:52:44 UTC (rev 83807)
@@ -0,0 +1,39 @@
+/*
+* 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.beans.metadata.plugins;
+
+import org.jboss.dependency.plugins.graph.Search;
+import org.jboss.xb.binding.sunday.unmarshalling.ValueAdapter;
+
+/**
+ * SearchInfoValueAdapter.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public class SearchInfoValueAdapter implements ValueAdapter
+{
+ @SuppressWarnings("unchecked")
+ public Object cast(Object o, Class c)
+ {
+ return Search.getInstance((String)o);
+ }
+}
\ No newline at end of file
Property changes on: projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/SearchInfoValueAdapter.java
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/policy/package-info.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/policy/package-info.java 2009-02-03 11:47:16 UTC (rev 83806)
+++ projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/policy/package-info.java 2009-02-03 11:52:44 UTC (rev 83807)
@@ -22,14 +22,17 @@
@JBossXmlAdaptedTypes
({
@JBossXmlAdaptedType(type=Cardinality.class, valueAdapter=CardinalityValueAdapter.class),
- @JBossXmlAdaptedType(type=ControllerState.class, valueAdapter=ControllerStateValueAdapter.class)
+ @JBossXmlAdaptedType(type=ControllerState.class, valueAdapter=ControllerStateValueAdapter.class),
+ @JBossXmlAdaptedType(type=SearchInfo.class, valueAdapter=SearchInfoValueAdapter.class)
})
package org.jboss.beans.metadata.plugins.policy;
import org.jboss.beans.metadata.plugins.CardinalityValueAdapter;
import org.jboss.beans.metadata.plugins.ControllerStateValueAdapter;
+import org.jboss.beans.metadata.plugins.SearchInfoValueAdapter;
import org.jboss.dependency.spi.Cardinality;
import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.spi.graph.SearchInfo;
import org.jboss.xb.annotations.JBossXmlAdaptedType;
import org.jboss.xb.annotations.JBossXmlAdaptedTypes;
Modified: projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/ValueUtil.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/ValueUtil.java 2009-02-03 11:47:16 UTC (rev 83806)
+++ projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/ValueUtil.java 2009-02-03 11:52:44 UTC (rev 83807)
@@ -21,29 +21,27 @@
*/
package org.jboss.kernel.plugins.annotations;
-import java.util.List;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.HashMap;
+import java.util.List;
import org.jboss.beans.metadata.api.annotations.Inject;
+import org.jboss.beans.metadata.api.annotations.JavaBeanValue;
import org.jboss.beans.metadata.api.annotations.NullValue;
import org.jboss.beans.metadata.api.annotations.Parameter;
+import org.jboss.beans.metadata.api.annotations.Search;
import org.jboss.beans.metadata.api.annotations.StringValue;
import org.jboss.beans.metadata.api.annotations.ThisValue;
import org.jboss.beans.metadata.api.annotations.Value;
import org.jboss.beans.metadata.api.annotations.ValueFactory;
-import org.jboss.beans.metadata.api.annotations.JavaBeanValue;
-import org.jboss.beans.metadata.api.annotations.Search;
import org.jboss.beans.metadata.api.model.FromContext;
-import org.jboss.beans.metadata.spi.ValueMetaData;
-import org.jboss.beans.metadata.spi.ParameterMetaData;
import org.jboss.beans.metadata.plugins.AbstractInjectionValueMetaData;
-import org.jboss.beans.metadata.plugins.AbstractValueFactoryMetaData;
import org.jboss.beans.metadata.plugins.AbstractParameterMetaData;
import org.jboss.beans.metadata.plugins.AbstractSearchValueMetaData;
+import org.jboss.beans.metadata.plugins.AbstractValueFactoryMetaData;
+import org.jboss.beans.metadata.spi.ParameterMetaData;
+import org.jboss.beans.metadata.spi.ValueMetaData;
import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.spi.graph.SearchInfo;
/**
* Simple util class.
@@ -52,18 +50,6 @@
*/
final class ValueUtil
{
- /** The search types */
- private static final Map<String, org.jboss.dependency.plugins.graph.Search> types;
-
- static
- {
- types = new HashMap<String,org.jboss.dependency.plugins.graph.Search>();
- for (org.jboss.dependency.plugins.graph.Search search : org.jboss.dependency.plugins.graph.Search.values())
- {
- types.put(search.getType().toUpperCase(), search);
- }
- }
-
/**
* Does value already exist.
*
@@ -272,10 +258,7 @@
static ValueMetaData createValueMetaData(Search annotation)
{
String searchType = annotation.type();
- org.jboss.dependency.plugins.graph.Search type = types.get(searchType.toUpperCase());
- if (type == null)
- throw new IllegalArgumentException("No such search type: " + searchType + ", available: " + Arrays.toString(org.jboss.dependency.plugins.graph.Search.values()));
-
+ SearchInfo type = org.jboss.dependency.plugins.graph.Search.getInstance(searchType);
ControllerState state = null;
if (isAttributePresent(annotation.dependentState()))
state = new ControllerState(annotation.dependentState());
Modified: projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/SearchClassContextDependencyItem.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/SearchClassContextDependencyItem.java 2009-02-03 11:47:16 UTC (rev 83806)
+++ projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/SearchClassContextDependencyItem.java 2009-02-03 11:52:44 UTC (rev 83807)
@@ -21,11 +21,11 @@
*/
package org.jboss.kernel.plugins.dependency;
-import org.jboss.dependency.plugins.graph.Search;
import org.jboss.dependency.spi.Controller;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.dependency.spi.graph.LookupStrategy;
+import org.jboss.dependency.spi.graph.SearchInfo;
/**
* A search Class context dependencyItem.
@@ -34,9 +34,9 @@
*/
public class SearchClassContextDependencyItem extends ClassDependencyItem
{
- private Search search;
+ private SearchInfo search;
- public SearchClassContextDependencyItem(Object name, Class<?> demandClass, ControllerState whenRequired, ControllerState dependentState, Search search)
+ public SearchClassContextDependencyItem(Object name, Class<?> demandClass, ControllerState whenRequired, ControllerState dependentState, SearchInfo search)
{
super(name, demandClass, whenRequired, dependentState);
if (search == null)
Modified: projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/deployment/package-info.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/deployment/package-info.java 2009-02-03 11:47:16 UTC (rev 83806)
+++ projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/deployment/package-info.java 2009-02-03 11:52:44 UTC (rev 83807)
@@ -22,14 +22,17 @@
@JBossXmlAdaptedTypes
({
@JBossXmlAdaptedType(type=Cardinality.class, valueAdapter=CardinalityValueAdapter.class),
- @JBossXmlAdaptedType(type=ControllerState.class, valueAdapter=ControllerStateValueAdapter.class)
+ @JBossXmlAdaptedType(type=ControllerState.class, valueAdapter=ControllerStateValueAdapter.class),
+ @JBossXmlAdaptedType(type=SearchInfo.class, valueAdapter=SearchInfoValueAdapter.class)
})
package org.jboss.kernel.plugins.deployment;
import org.jboss.beans.metadata.plugins.CardinalityValueAdapter;
import org.jboss.beans.metadata.plugins.ControllerStateValueAdapter;
+import org.jboss.beans.metadata.plugins.SearchInfoValueAdapter;
import org.jboss.dependency.spi.Cardinality;
import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.spi.graph.SearchInfo;
import org.jboss.xb.annotations.JBossXmlAdaptedType;
import org.jboss.xb.annotations.JBossXmlAdaptedTypes;
More information about the jboss-cvs-commits
mailing list