[jboss-cvs] JBossAS SVN: r59040 - in projects/microcontainer/trunk/spring-int/src: main/org/jboss/spring/deployment/xml resources/org/jboss/test/spring/test tests/org/jboss/test/spring/support
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Dec 14 08:13:12 EST 2006
Author: alesj
Date: 2006-12-14 08:13:00 -0500 (Thu, 14 Dec 2006)
New Revision: 59040
Modified:
projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/RefHandler.java
projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringCollectionHandler.java
projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringSchemaBindingHelper.java
projects/microcontainer/trunk/spring-int/src/resources/org/jboss/test/spring/test/TestDescribe.xml
projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/support/SimpleBean.java
Log:
JBMICROCONT-26; inital code addon
Modified: projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/RefHandler.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/RefHandler.java 2006-12-14 12:41:59 UTC (rev 59039)
+++ projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/RefHandler.java 2006-12-14 13:13:00 UTC (rev 59040)
@@ -52,6 +52,7 @@
String localName = attrs.getLocalName(i);
if ("bean".equals(localName))
value.setValue(attrs.getValue(i));
+ // todo local, parent
}
}
Modified: projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringCollectionHandler.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringCollectionHandler.java 2006-12-14 12:41:59 UTC (rev 59039)
+++ projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringCollectionHandler.java 2006-12-14 13:13:00 UTC (rev 59040)
@@ -44,7 +44,6 @@
public Object startElement(Object parent, QName name, ElementBinding element)
{
String typeName = element.getQName().getLocalPart();
- // todo - does this work?
if ("list".equals(typeName))
return new AbstractListMetaData();
else if ("set".equals(typeName))
Modified: projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringSchemaBindingHelper.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringSchemaBindingHelper.java 2006-12-14 12:41:59 UTC (rev 59039)
+++ projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringSchemaBindingHelper.java 2006-12-14 13:13:00 UTC (rev 59040)
@@ -21,8 +21,8 @@
*/
package org.jboss.spring.deployment.xml;
+import org.jboss.kernel.plugins.deployment.xml.*;
import org.jboss.xb.binding.sunday.unmarshalling.TypeBinding;
-import org.jboss.kernel.plugins.deployment.xml.*;
/**
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
@@ -71,13 +71,12 @@
configureValueBindings(typeBinding);
}
+ // here value only takes simple type
public static void initValueHandler(TypeBinding typeBinding)
{
typeBinding.setHandler(PlainValueHandler.HANDLER);
// value can take characters
typeBinding.setSimpleType(PlainValueCharactersHandler.HANDLER);
- // configure
- configureValueBindings(typeBinding);
}
public static void initCollectionHandler(TypeBinding typeBinding)
@@ -99,19 +98,44 @@
typeBinding.setHandler(EntryHandler.HANDLER);
// entry has a key
typeBinding.pushInterceptor(SpringSchemaBinding.keyQName, EntryKeyInterceptor.INTERCEPTOR);
- // entry has a value
+
+ // entry has bean
+ typeBinding.pushInterceptor(SpringSchemaBinding.beanQName, EntryValueInterceptor.INTERCEPTOR);
+
+ // entry has ref
+ typeBinding.pushInterceptor(SpringSchemaBinding.refQName, EntryValueInterceptor.INTERCEPTOR);
+
+ // entry has value
typeBinding.pushInterceptor(SpringSchemaBinding.valueQName, EntryValueInterceptor.INTERCEPTOR);
+
+ // entry can take a list
+ typeBinding.pushInterceptor(SpringSchemaBinding.listQName, EntryValueInterceptor.INTERCEPTOR);
+
+ // entry can take a set
+ typeBinding.pushInterceptor(SpringSchemaBinding.setQName, EntryValueInterceptor.INTERCEPTOR);
+
+ // entry can take a map
+ typeBinding.pushInterceptor(SpringSchemaBinding.mapQName, EntryValueInterceptor.INTERCEPTOR);
+
+ // entry has a null
+ typeBinding.pushInterceptor(SpringSchemaBinding.nullQName, EntryValueInterceptor.INTERCEPTOR);
}
public static void initKeyHandler(TypeBinding typeBinding)
{
typeBinding.setHandler(SpringMapKeyHandler.HANDLER);
// key has a value
- typeBinding.pushInterceptor(SpringSchemaBinding.valueQName, ValueMetaDataElementInterceptor.VALUES);
+ configureValueBindings(typeBinding);
}
public static void configureValueBindings(TypeBinding typeBinding)
{
+ // type has beans
+ typeBinding.pushInterceptor(SpringSchemaBinding.beanQName, ValueMetaDataElementInterceptor.VALUES);
+
+ // type has refs
+ typeBinding.pushInterceptor(SpringSchemaBinding.refQName, ValueMetaDataElementInterceptor.VALUES);
+
// type has values
typeBinding.pushInterceptor(SpringSchemaBinding.valueQName, ValueMetaDataElementInterceptor.VALUES);
Modified: projects/microcontainer/trunk/spring-int/src/resources/org/jboss/test/spring/test/TestDescribe.xml
===================================================================
--- projects/microcontainer/trunk/spring-int/src/resources/org/jboss/test/spring/test/TestDescribe.xml 2006-12-14 12:41:59 UTC (rev 59039)
+++ projects/microcontainer/trunk/spring-int/src/resources/org/jboss/test/spring/test/TestDescribe.xml 2006-12-14 13:13:00 UTC (rev 59040)
@@ -4,14 +4,14 @@
<constructor-arg index="2"><value>SpringBean</value></constructor-arg>
<constructor-arg index="0"><value>1</value></constructor-arg>
<constructor-arg index="1"><value>3.1415</value></constructor-arg>
- <property name="list">
+ <property name="mylist">
<list value-type="java.lang.String">
<value>one</value>
<value>two</value>
<value>three</value>
</list>
</property>
- <property name="set">
+ <property name="myset">
<set value-type="java.lang.String">
<value>one</value>
<value>two</value>
@@ -23,7 +23,7 @@
<key>
<value>key</value>
</key>
- <value>key</value>
+ <value>myvalue</value>
</entry>
</property>
</bean>
Modified: projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/support/SimpleBean.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/support/SimpleBean.java 2006-12-14 12:41:59 UTC (rev 59039)
+++ projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/support/SimpleBean.java 2006-12-14 13:13:00 UTC (rev 59040)
@@ -34,9 +34,9 @@
private int x;
private double y;
private String s;
- private List list;
- private Set set;
- private Map map;
+ private List mylist;
+ private Set myset;
+ private Map mymap;
public SimpleBean()
{
@@ -49,34 +49,34 @@
this.s = s;
}
- public List getList()
+ public List getMylist()
{
- return list;
+ return mylist;
}
- public void setList(List list)
+ public void setMylist(List mylist)
{
- this.list = list;
+ this.mylist = mylist;
}
- public Set getSet()
+ public Set getMyset()
{
- return set;
+ return myset;
}
- public void setSet(Set set)
+ public void setMyset(Set myset)
{
- this.set = set;
+ this.myset = myset;
}
- public Map getMap()
+ public Map getMymap()
{
- return map;
+ return mymap;
}
- public void setMap(Map map)
+ public void setMymap(Map mymap)
{
- this.map = map;
+ this.mymap = mymap;
}
}
More information about the jboss-cvs-commits
mailing list