[jboss-cvs] JBossAS SVN: r59037 - in projects/microcontainer/trunk: kernel/src/main/org/jboss/kernel/plugins/deployment/xml kernel/src/resources/schema spring-int/src/resources/org/jboss/test/spring/test spring-int/src/tests/org/jboss/test/spring/test

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2006-12-14 06:58:53 -0500 (Thu, 14 Dec 2006)
New Revision: 59037

Added:
   projects/microcontainer/trunk/spring-int/src/resources/org/jboss/test/spring/test/TestDescribe.xml
Removed:
   projects/microcontainer/trunk/spring-int/src/resources/org/jboss/test/spring/test/TestInstantiate.xml
Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBindingHelper.java
   projects/microcontainer/trunk/kernel/src/resources/schema/bean-deployer_2_0.xsd
   projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/DescribeSpringTestCase.java
Log:
spring renaming, beans xsd order matching java code order

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBindingHelper.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBindingHelper.java	2006-12-14 10:33:45 UTC (rev 59036)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBindingHelper.java	2006-12-14 11:58:53 UTC (rev 59037)
@@ -411,6 +411,12 @@
     */
    public static void configureValueBindings(TypeBinding typeBinding)
    {
+/*
+      TODO - test with inner bean!!
+      // type has bean
+      typeBinding.pushInterceptor(BeanSchemaBinding20.beanQName, ValueMetaDataElementInterceptor.VALUES);
+*/
+
       // type has values
       typeBinding.pushInterceptor(BeanSchemaBinding20.valueQName, ValueMetaDataElementInterceptor.VALUES);
 

Modified: projects/microcontainer/trunk/kernel/src/resources/schema/bean-deployer_2_0.xsd
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/schema/bean-deployer_2_0.xsd	2006-12-14 10:33:45 UTC (rev 59036)
+++ projects/microcontainer/trunk/kernel/src/resources/schema/bean-deployer_2_0.xsd	2006-12-14 11:58:53 UTC (rev 59037)
@@ -507,12 +507,12 @@
       <xsd:choice>
          <xsd:element name="bean" type="beanType"/>
          <xsd:element name="value" type="plainValueType"/>
+         <xsd:element name="inject" type="injectionType"/>
          <xsd:element name="collection" type="collectionType"/>
          <xsd:element name="list" type="listType"/>
          <xsd:element name="set" type="setType"/>
          <xsd:element name="array" type="arrayType"/>
          <xsd:element name="map" type="mapType"/>
-         <xsd:element name="inject" type="injectionType"/>
          <xsd:element name="null">
             <xsd:complexType/>
          </xsd:element>

Copied: projects/microcontainer/trunk/spring-int/src/resources/org/jboss/test/spring/test/TestDescribe.xml (from rev 59036, projects/microcontainer/trunk/spring-int/src/resources/org/jboss/test/spring/test/TestInstantiate.xml)
===================================================================
--- projects/microcontainer/trunk/spring-int/src/resources/org/jboss/test/spring/test/TestInstantiate.xml	2006-12-14 10:33:45 UTC (rev 59036)
+++ projects/microcontainer/trunk/spring-int/src/resources/org/jboss/test/spring/test/TestDescribe.xml	2006-12-14 11:58:53 UTC (rev 59037)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<bean xmlns="urn:jboss:spring-beans:2.0" id="testBean" class="org.jboss.test.spring.support.SimpleBean" >
+   <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">
+      <list value-type="java.lang.String">
+         <value>one</value>
+         <value>two</value>
+         <value>three</value>
+      </list>
+   </property>
+   <property name="set">
+      <set value-type="java.lang.String">
+         <value>one</value>
+         <value>two</value>
+         <value>one</value>
+      </set>
+   </property>
+   <property name="map">
+      <entry>
+         <key>
+            <value>key</value>
+         </key>
+         <value>key</value>
+      </entry>
+   </property>
+</bean>

Deleted: projects/microcontainer/trunk/spring-int/src/resources/org/jboss/test/spring/test/TestInstantiate.xml
===================================================================
--- projects/microcontainer/trunk/spring-int/src/resources/org/jboss/test/spring/test/TestInstantiate.xml	2006-12-14 10:33:45 UTC (rev 59036)
+++ projects/microcontainer/trunk/spring-int/src/resources/org/jboss/test/spring/test/TestInstantiate.xml	2006-12-14 11:58:53 UTC (rev 59037)
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<bean xmlns="urn:jboss:spring-beans:2.0" id="testBean" class="org.jboss.test.spring.support.SimpleBean" >
-   <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">
-      <list value-type="java.lang.String">
-         <value>one</value>
-         <value>two</value>
-         <value>three</value>
-      </list>
-   </property>
-   <property name="set">
-      <set value-type="java.lang.String">
-         <value>one</value>
-         <value>two</value>
-         <value>one</value>
-      </set>
-   </property>
-<!--
-   <property name="map">
-      <entry>
-         <key>
-            <value>key</value>
-         </key>
-         <value>key</value>
-      </entry>
-   </property>
--->
-</bean>

Modified: projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/DescribeSpringTestCase.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/DescribeSpringTestCase.java	2006-12-14 10:33:45 UTC (rev 59036)
+++ projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/DescribeSpringTestCase.java	2006-12-14 11:58:53 UTC (rev 59037)
@@ -47,7 +47,7 @@
 
    public void testDescribe() throws Exception
    {
-      BeanMetaData simpleBeanMD = unmarshal("TestInstantiate.xml", BeanMetaData.class);
+      BeanMetaData simpleBeanMD = unmarshal("TestDescribe.xml", BeanMetaData.class);
       // todo - test descriptions
       System.out.println("simpleBean = " + simpleBeanMD);
    }