[jboss-cvs] JBossAS SVN: r71974 - in projects/component-injection/trunk: src/main/org/jboss/component/plugin and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 10 15:17:33 EDT 2008
Author: scott.stark at jboss.org
Date: 2008-04-10 15:17:33 -0400 (Thu, 10 Apr 2008)
New Revision: 71974
Added:
projects/component-injection/trunk/src/resources/test/org/
projects/component-injection/trunk/src/resources/test/org/jboss/
projects/component-injection/trunk/src/resources/test/org/jboss/test/
projects/component-injection/trunk/src/resources/test/org/jboss/test/component/
projects/component-injection/trunk/src/resources/test/org/jboss/test/component/test/
projects/component-injection/trunk/src/resources/test/org/jboss/test/component/test/BeanContainerUsageTestCase_testDependencyInjectionOfBean.xml
projects/component-injection/trunk/src/resources/test/org/jboss/test/component/test/BeanContainerUsageTestCase_testDependencyInjectionOfBeanWithMismatchedPoolSizes.xml
Modified:
projects/component-injection/trunk/.classpath
projects/component-injection/trunk/pom.xml
projects/component-injection/trunk/src/main/org/jboss/component/plugin/GenericComponentInstance.java
projects/component-injection/trunk/src/tests/org/jboss/test/component/test/BeanContainerUsageMDTestCase.java
Log:
Fix the ported tests
Modified: projects/component-injection/trunk/.classpath
===================================================================
--- projects/component-injection/trunk/.classpath 2008-04-10 18:59:29 UTC (rev 71973)
+++ projects/component-injection/trunk/.classpath 2008-04-10 19:17:33 UTC (rev 71974)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/resources/test"/>
<classpathentry kind="src" path="src/tests"/>
<classpathentry excluding="**/*.java" kind="src" path="src/resources/main"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
Modified: projects/component-injection/trunk/pom.xml
===================================================================
--- projects/component-injection/trunk/pom.xml 2008-04-10 18:59:29 UTC (rev 71973)
+++ projects/component-injection/trunk/pom.xml 2008-04-10 19:17:33 UTC (rev 71974)
@@ -23,6 +23,8 @@
<version.org.jboss.test>1.0.5.GA</version.org.jboss.test>
<version.org.jboss.logging.log4j>2.0.5.GA</version.org.jboss.logging.log4j>
<version.org.jboss.microcontainer>2.0.0.Beta13</version.org.jboss.microcontainer>
+ <version.org.jboss.managed>2.0.0.Beta10</version.org.jboss.managed>
+ <version.org.jboss.metatype>2.0.0.Beta10</version.org.jboss.metatype>
</properties>
<build>
@@ -51,13 +53,19 @@
</execution>
</executions>
</plugin>
+
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <!--configuration>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration-->
- </plugin>
+ <version>2.4.1</version>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <includes>
+ <include>org/jboss/test/**/*TestCase.java</include>
+ </includes>
+ <useSystemClassLoader>true</useSystemClassLoader>
+ <!-- testFailureIgnore>true</testFailureIgnore -->
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -122,5 +130,17 @@
<version>${version.org.jboss.logging.log4j}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <version>${version.org.jboss.managed}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-metatype</artifactId>
+ <version>${version.org.jboss.metatype}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: projects/component-injection/trunk/src/main/org/jboss/component/plugin/GenericComponentInstance.java
===================================================================
--- projects/component-injection/trunk/src/main/org/jboss/component/plugin/GenericComponentInstance.java 2008-04-10 18:59:29 UTC (rev 71973)
+++ projects/component-injection/trunk/src/main/org/jboss/component/plugin/GenericComponentInstance.java 2008-04-10 19:17:33 UTC (rev 71974)
@@ -43,33 +43,21 @@
this.compID = compID;
}
- /* (non-Javadoc)
- * @see org.jboss.test.kernel.deployment.support.container.spi.ComponentInstance#getComponentID()
- */
public long getComponentID()
{
return compID;
}
- /* (non-Javadoc)
- * @see org.jboss.test.kernel.deployment.support.container.spi.ComponentInstance#getComponentNames()
- */
public List<String> getComponentNames()
{
return names;
}
- /* (non-Javadoc)
- * @see org.jboss.test.kernel.deployment.support.container.spi.ComponentInstance#getContext()
- */
public T getContext()
{
return instance;
}
- /* (non-Javadoc)
- * @see org.jboss.test.kernel.deployment.support.container.spi.ComponentInstance#getContextName()
- */
public String getContextName()
{
return names.get(0);
Added: projects/component-injection/trunk/src/resources/test/org/jboss/test/component/test/BeanContainerUsageTestCase_testDependencyInjectionOfBean.xml
===================================================================
--- projects/component-injection/trunk/src/resources/test/org/jboss/test/component/test/BeanContainerUsageTestCase_testDependencyInjectionOfBean.xml (rev 0)
+++ projects/component-injection/trunk/src/resources/test/org/jboss/test/component/test/BeanContainerUsageTestCase_testDependencyInjectionOfBean.xml 2008-04-10 19:17:33 UTC (rev 71974)
@@ -0,0 +1,24 @@
+<?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">
+
+ <beanfactory name="Bean1TypeFactory" class="org.jboss.test.component.support.container.Bean1Type"/>
+ <bean name="Bean1TypePool" class="org.jboss.test.component.support.container.BeanPool">
+ <property name="factory"><inject bean="Bean1TypeFactory"/></property>
+ </bean>
+ <bean name="BeanContainer1Type" class="org.jboss.test.component.support.container.BeanContainer">
+ <property name="pool"><inject bean="Bean1TypePool"/></property>
+ </bean>
+ <beanfactory name="Bean2TypeFactory" class="org.jboss.test.component.support.container.Bean2Type">
+ <property name="bean1"><value-factory bean="Bean1TypePool" method="createBean" /></property>
+ </beanfactory>
+ <bean name="Bean2TypePool" class="org.jboss.test.component.support.container.BeanPool">
+ <property name="factory"><inject bean="Bean2TypeFactory"/></property>
+ </bean>
+ <bean name="BeanContainer2Type" class="org.jboss.test.component.support.container.BeanContainer">
+ <property name="pool"><inject bean="Bean2TypePool"/></property>
+ </bean>
+
+</deployment>
Added: projects/component-injection/trunk/src/resources/test/org/jboss/test/component/test/BeanContainerUsageTestCase_testDependencyInjectionOfBeanWithMismatchedPoolSizes.xml
===================================================================
--- projects/component-injection/trunk/src/resources/test/org/jboss/test/component/test/BeanContainerUsageTestCase_testDependencyInjectionOfBeanWithMismatchedPoolSizes.xml (rev 0)
+++ projects/component-injection/trunk/src/resources/test/org/jboss/test/component/test/BeanContainerUsageTestCase_testDependencyInjectionOfBeanWithMismatchedPoolSizes.xml 2008-04-10 19:17:33 UTC (rev 71974)
@@ -0,0 +1,30 @@
+<?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">
+
+ <beanfactory name="Bean1TypeFactory" class="org.jboss.test.component.support.container.Bean1Type"/>
+ <bean name="Bean1TypePool" class="org.jboss.test.component.support.container.BeanPool">
+ <constructor>
+ <parameter>3</parameter>
+ </constructor>
+ <property name="factory"><inject bean="Bean1TypeFactory"/></property>
+ </bean>
+ <bean name="BeanContainer1Type" class="org.jboss.test.component.support.container.BeanContainer">
+ <property name="pool"><inject bean="Bean1TypePool"/></property>
+ </bean>
+ <beanfactory name="Bean2TypeFactory" class="org.jboss.test.component.support.container.Bean2Type">
+ <property name="bean1"><value-factory bean="Bean1TypePool" method="createBean" /></property>
+ </beanfactory>
+ <bean name="Bean2TypePool" class="org.jboss.test.component.support.container.BeanPool">
+ <constructor>
+ <parameter>4</parameter>
+ </constructor>
+ <property name="factory"><inject bean="Bean2TypeFactory"/></property>
+ </bean>
+ <bean name="BeanContainer2Type" class="org.jboss.test.component.support.container.BeanContainer">
+ <property name="pool"><inject bean="Bean2TypePool"/></property>
+ </bean>
+
+</deployment>
Modified: projects/component-injection/trunk/src/tests/org/jboss/test/component/test/BeanContainerUsageMDTestCase.java
===================================================================
--- projects/component-injection/trunk/src/tests/org/jboss/test/component/test/BeanContainerUsageMDTestCase.java 2008-04-10 18:59:29 UTC (rev 71973)
+++ projects/component-injection/trunk/src/tests/org/jboss/test/component/test/BeanContainerUsageMDTestCase.java 2008-04-10 19:17:33 UTC (rev 71974)
@@ -188,11 +188,11 @@
ArrayList<BeanMetaDataFactory> beanFactories = new ArrayList<BeanMetaDataFactory>();
// Bean1TypeFactory
GenericBeanFactoryMetaData Bean1TypeFactory = new GenericBeanFactoryMetaData("Bean1TypeFactory",
- "org.jboss.test.kernel.deployment.support.container.Bean1Type");
+ "org.jboss.test.component.support.container.Bean1Type");
beanFactories.add(Bean1TypeFactory);
// Bean1TypePool
AbstractBeanMetaData Bean1TypePool = new AbstractBeanMetaData("Bean1TypePool",
- "org.jboss.test.kernel.deployment.support.container.BeanPool");
+ "org.jboss.test.component.support.container.BeanPool");
Set<PropertyMetaData> Bean1TypePool_propertys = new HashSet<PropertyMetaData>();
Bean1TypePool_propertys.add(new AbstractPropertyMetaData("factory",
new AbstractDependencyValueMetaData("Bean1TypeFactory")));
@@ -200,7 +200,7 @@
beanFactories.add(Bean1TypePool);
// BeanContainer1Type
AbstractBeanMetaData BeanContainer1Type = new AbstractBeanMetaData("BeanContainer1Type",
- "org.jboss.test.kernel.deployment.support.container.BeanContainer");
+ "org.jboss.test.component.support.container.BeanContainer");
Set<PropertyMetaData> BeanContainer1Type_propertys = new HashSet<PropertyMetaData>();
BeanContainer1Type_propertys.add(new AbstractPropertyMetaData("pool",
new AbstractDependencyValueMetaData("Bean1TypePool")));
@@ -209,7 +209,7 @@
// Bean2TypeFactory
GenericBeanFactoryMetaData Bean2TypeFactory = new GenericBeanFactoryMetaData("Bean2TypeFactory",
- "org.jboss.test.kernel.deployment.support.container.Bean2Type");
+ "org.jboss.test.component.support.container.Bean2Type");
Set<PropertyMetaData> Bean2TypeFactory_propertys = new HashSet<PropertyMetaData>();
AbstractValueFactoryMetaData bean1CreateMethod = new AbstractValueFactoryMetaData("Bean1TypePool", "createBean");
Bean2TypeFactory_propertys.add(new AbstractPropertyMetaData("bean1", bean1CreateMethod));
@@ -217,7 +217,7 @@
beanFactories.add(Bean2TypeFactory);
// Bean2TypePool
AbstractBeanMetaData Bean2TypePool = new AbstractBeanMetaData("Bean2TypePool",
- "org.jboss.test.kernel.deployment.support.container.BeanPool");
+ "org.jboss.test.component.support.container.BeanPool");
Set<PropertyMetaData> Bean2TypePool_propertys = new HashSet<PropertyMetaData>();
Bean2TypePool_propertys.add(new AbstractPropertyMetaData("factory",
new AbstractDependencyValueMetaData("Bean2TypeFactory")));
@@ -225,7 +225,7 @@
beanFactories.add(Bean2TypePool);
// BeanContainer2Type
AbstractBeanMetaData BeanContainer2Type = new AbstractBeanMetaData("BeanContainer2Type",
- "org.jboss.test.kernel.deployment.support.container.BeanContainer");
+ "org.jboss.test.component.support.container.BeanContainer");
Set<PropertyMetaData> BeanContainer2Type_propertys = new HashSet<PropertyMetaData>();
BeanContainer2Type_propertys.add(new AbstractPropertyMetaData("pool",
new AbstractDependencyValueMetaData("Bean2TypePool")));
@@ -237,26 +237,26 @@
return deployment;
}
/*
- <beanfactory name="Bean1TypeFactory" class="org.jboss.test.kernel.deployment.support.container.Bean1Type"/>
- <bean name="Bean1TypePool" class="org.jboss.test.kernel.deployment.support.container.BeanPool">
+ <beanfactory name="Bean1TypeFactory" class="org.jboss.test.component.support.container.Bean1Type"/>
+ <bean name="Bean1TypePool" class="org.jboss.test.component.support.container.BeanPool">
<constructor>
<parameter>3</parameter>
</constructor>
<property name="factory"><inject bean="Bean1TypeFactory"/></property>
</bean>
- <bean name="BeanContainer1Type" class="org.jboss.test.kernel.deployment.support.container.BeanContainer">
+ <bean name="BeanContainer1Type" class="org.jboss.test.component.support.container.BeanContainer">
<property name="pool"><inject bean="Bean1TypePool"/></property>
</bean>
- <beanfactory name="Bean2TypeFactory" class="org.jboss.test.kernel.deployment.support.container.Bean2Type">
+ <beanfactory name="Bean2TypeFactory" class="org.jboss.test.component.support.container.Bean2Type">
<property name="bean1"><value-factory bean="Bean1TypePool" method="createBean" /></property>
</beanfactory>
- <bean name="Bean2TypePool" class="org.jboss.test.kernel.deployment.support.container.BeanPool">
+ <bean name="Bean2TypePool" class="org.jboss.test.component.support.container.BeanPool">
<constructor>
<parameter>4</parameter>
</constructor>
<property name="factory"><inject bean="Bean2TypeFactory"/></property>
</bean>
- <bean name="BeanContainer2Type" class="org.jboss.test.kernel.deployment.support.container.BeanContainer">
+ <bean name="BeanContainer2Type" class="org.jboss.test.component.support.container.BeanContainer">
<property name="pool"><inject bean="Bean2TypePool"/></property>
</bean>
*/
More information about the jboss-cvs-commits
mailing list