[Jboss-cvs] JBossAS SVN: r56488 - in projects/microcontainer/trunk/kernel/src: resources/xml-test/org/jboss/test/kernel/config/test tests/org/jboss/test/kernel/config/support
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 31 17:32:43 EDT 2006
Author: alesj
Date: 2006-08-31 17:32:34 -0400 (Thu, 31 Aug 2006)
New Revision: 56488
Added:
projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testCustomListPreinstantiated.xml
projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testCustomSetPreinstantiated.xml
Modified:
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/CustomCollection.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/CustomList.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/CustomMap.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/CustomSet.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/SimpleBean.java
Log:
Preinstantiated collections, map prepare/addon.
Added: projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testCustomListPreinstantiated.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testCustomListPreinstantiated.xml 2006-08-31 21:01:14 UTC (rev 56487)
+++ projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testCustomListPreinstantiated.xml 2006-08-31 21:32:34 UTC (rev 56488)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer">
+ <bean name="SimpleBean" class="org.jboss.test.kernel.config.support.SimpleBean">
+ <constructor>
+ <parameter class="java.lang.String">string1</parameter>
+ </constructor>
+ <property name="preInstantiatedList">
+ <collection class="org.jboss.test.kernel.config.support.CustomList" elementClass="java.lang.String">
+ <value>string2</value>
+ <value>string2</value>
+ <value>string1</value>
+ </collection>
+ </property>
+ </bean>
+</deployment>
Added: projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testCustomSetPreinstantiated.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testCustomSetPreinstantiated.xml 2006-08-31 21:01:14 UTC (rev 56487)
+++ projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testCustomSetPreinstantiated.xml 2006-08-31 21:32:34 UTC (rev 56488)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer">
+ <bean name="SimpleBean" class="org.jboss.test.kernel.config.support.SimpleBean">
+ <constructor>
+ <parameter class="java.lang.String">string1</parameter>
+ </constructor>
+ <property name="preInstantiatedSet">
+ <collection class="org.jboss.test.kernel.config.support.CustomSet" elementClass="java.lang.String">
+ <value>string2</value>
+ <value>string2</value>
+ <value>string1</value>
+ </collection>
+ </property>
+ </bean>
+</deployment>
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/CustomCollection.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/CustomCollection.java 2006-08-31 21:01:14 UTC (rev 56487)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/CustomCollection.java 2006-08-31 21:32:34 UTC (rev 56488)
@@ -39,7 +39,6 @@
public CustomCollection()
{
- this.preInstantiated = false;
}
public CustomCollection(boolean preInstantiated)
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/CustomList.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/CustomList.java 2006-08-31 21:01:14 UTC (rev 56487)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/CustomList.java 2006-08-31 21:32:34 UTC (rev 56488)
@@ -43,7 +43,7 @@
public CustomList(boolean preInstantiated)
{
- this.preInstantiated = true;
+ this.preInstantiated = preInstantiated;
}
public boolean getPreInstantiated()
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/CustomMap.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/CustomMap.java 2006-08-31 21:01:14 UTC (rev 56487)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/CustomMap.java 2006-08-31 21:32:34 UTC (rev 56488)
@@ -39,7 +39,6 @@
public CustomMap()
{
- this.preInstantiated = true;
}
public CustomMap(boolean preInstantiated)
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/CustomSet.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/CustomSet.java 2006-08-31 21:01:14 UTC (rev 56487)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/CustomSet.java 2006-08-31 21:32:34 UTC (rev 56488)
@@ -43,7 +43,7 @@
public CustomSet(boolean preInstantiated)
{
- this.preInstantiated = true;
+ this.preInstantiated = preInstantiated;
}
public boolean getPreInstantiated()
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/SimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/SimpleBean.java 2006-08-31 21:01:14 UTC (rev 56487)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/SimpleBean.java 2006-08-31 21:32:34 UTC (rev 56488)
@@ -162,7 +162,9 @@
constructorUsed = string;
aString = string;
preInstantiatedCollection.add(string);
- preInstantiatedArray = new Object[]{"string1"};
+ preInstantiatedList.add(string);
+ preInstantiatedSet.add(string);
+ preInstantiatedArray = new Object[]{string};
}
public SimpleBean(String string1, String string2)
More information about the jboss-cvs-commits
mailing list