[webbeans-commits] Webbeans SVN: r3681 - in ri/trunk: embedded-tck-runner and 9 other directories.

Author: pete.muir(a)jboss.org Date: 2009-09-16 13:00:53 -0400 (Wed, 16 Sep 2009) New Revision: 3681 Added: ri/trunk/embedded-tck-runner/ ri/trunk/embedded-tck-runner/pom.xml ri/trunk/embedded-tck-runner/src/ ri/trunk/embedded-tck-runner/src/main/ ri/trunk/embedded-tck-runner/src/main/java/ ri/trunk/embedded-tck-runner/src/main/resources/ ri/trunk/embedded-tck-runner/src/main/resources/META-INF/ ri/trunk/embedded-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties ri/trunk/embedded-tck-runner/src/test/ ri/trunk/embedded-tck-runner/src/test/debug-resources/ ri/trunk/embedded-tck-runner/src/test/debug-resources/META-INF/ ri/trunk/embedded-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties ri/trunk/embedded-tck-runner/src/test/resources/ ri/trunk/embedded-tck-runner/src/test/resources/jndi.properties ri/trunk/embedded-tck-runner/src/test/resources/log4j.xml Modified: ri/trunk/version-matrix/pom.xml Log: add embedded-tck-runner Added: ri/trunk/embedded-tck-runner/pom.xml =================================================================== --- ri/trunk/embedded-tck-runner/pom.xml (rev 0) +++ ri/trunk/embedded-tck-runner/pom.xml 2009-09-16 17:00:53 UTC (rev 3681) @@ -0,0 +1,131 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>webbeans-parent</artifactId> + <groupId>org.jboss.webbeans</groupId> + <version>1.0.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-embedded-tck-runner</artifactId> + <name>CDI TCK runner for JBoss Emebedded</name> + <description>Aggregates dependencies and run's the CDI TCK on JBoss Embedded</description> + + <dependencies> + + <dependency> + <groupId>org.jboss.webbeans</groupId> + <artifactId>jsr299-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-core</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-porting-package</artifactId> + </dependency> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-jboss-embedded</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.jsr299.tck</groupId> + <artifactId>jsr299-tck-impl</artifactId> + </dependency> + + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>process-resources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <stripVersion>true</stripVersion> + <artifactItems> + <artifactItem> + <groupId>org.jboss.jsr299.tck</groupId> + <artifactId>jsr299-tck-impl</artifactId> + <type>xml</type> + <classifier>suite</classifier> + <overWrite>true</overWrite> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-suite.xml</suiteXmlFile> + </suiteXmlFiles> + <argLine>-Xmx256m</argLine> + <forkMode>once</forkMode> + <systemProperties> + <property> + <name>org.jboss.testharness.standalone</name> + <value>false</value> + </property> + <property> + <name>org.jboss.testharness.container.extraConfigurationDir</name> + <value>../jboss-as</value> + </property> + <property> + <name>org.jboss.testharness.container.forceRestart</name> + <value>true</value> + </property> + <property> + <name>org.jboss.testharness.runIntegrationTests</name> + <value>true</value> + </property> + <property> + <name>org.jboss.testharness.outputDirectory</name> + <value>target</value> + </property> + </systemProperties> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <executions> + <execution> + <id>generate-test-report</id> + <phase>test</phase> + <goals> + <goal>report-only</goal> + </goals> + </execution> + </executions> + <configuration> + <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory> + <outputName>test-report</outputName> + </configuration> + </plugin> + </plugins> + </build> + + + +</project> Added: ri/trunk/embedded-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties =================================================================== --- ri/trunk/embedded-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties (rev 0) +++ ri/trunk/embedded-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties 2009-09-16 17:00:53 UTC (rev 3681) @@ -0,0 +1,2 @@ +org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.local.LocalTestLauncher + Added: ri/trunk/embedded-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties =================================================================== --- ri/trunk/embedded-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties (rev 0) +++ ri/trunk/embedded-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties 2009-09-16 17:00:53 UTC (rev 3681) @@ -0,0 +1,6 @@ +# Configuration for running incontainer tests from your IDE +# Alter the path webbeans accordingly (relative from the tck/impl dir) +org.jboss.testharness.standalone=false +org.jboss.testharness.container.extraConfigurationDir=../../webbeans/jboss-as +org.jboss.testharness.container.forceRestart=false +org.jboss.testharness.runIntegrationTests=true \ No newline at end of file Added: ri/trunk/embedded-tck-runner/src/test/resources/jndi.properties =================================================================== --- ri/trunk/embedded-tck-runner/src/test/resources/jndi.properties (rev 0) +++ ri/trunk/embedded-tck-runner/src/test/resources/jndi.properties 2009-09-16 17:00:53 UTC (rev 3681) @@ -0,0 +1,4 @@ +#jboss JNDI properties +java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory +java.naming.provider.url=jnp://localhost:1099 +java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces \ No newline at end of file Added: ri/trunk/embedded-tck-runner/src/test/resources/log4j.xml =================================================================== --- ri/trunk/embedded-tck-runner/src/test/resources/log4j.xml (rev 0) +++ ri/trunk/embedded-tck-runner/src/test/resources/log4j.xml 2009-09-16 17:00:53 UTC (rev 3681) @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out"/> + <layout class="org.apache.log4j.PatternLayout"> + <!-- The default pattern: Date Priority [Category] Message\n --> + <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{2}] %m%n"/> + </layout> + <filter class="org.apache.log4j.varia.StringMatchFilter"> + <param name="AcceptOnMatch" value="false" /> + <param name="StringToMatch" value="Failure while notifying an observer of event [a]" /> + </filter> + <filter class="org.apache.log4j.varia.StringMatchFilter"> + <param name="AcceptOnMatch" value="false" /> + <param name="StringToMatch" value="Error destroying Request scoped unnamed simple bean org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.Cod" /> + </filter> + </appender> + + <!-- ############### Embedded EJB3 ################# --> + <category name="org.jboss"> + <priority value="ERROR"/> + </category> + + <category name="org.jboss.test"> + <priority value="ERROR"/> + </category> + + <category name="com.arjuna"> + <priority value="ERROR"/> + </category> + + <!-- ############### Hibernate logging ################# --> + + <category name="org.hibernate"> + <priority value="ERROR"/> + </category> + + <!-- + <category name="org.hibernate.SQL"> + <priority value="TRACE"/> + </category> + + <category name="org.hibernate.type"> + <priority value="TRACE"/> + </category> + + <category name="org.hibernate.loader"> + <priority value="TRACE"/> + </category> + <category name="org.hibernate.cache"> + <priority value="TRACE"/> + </category> + --> + + <!-- ############### Web Beans logging ################### --> + + <category name="org.jboss.webbeans"> + <priority value="WARN"/> + </category> + + <category name="org.jboss.webbeans.tck"> + <priority value="INFO"/> + </category> + + <category name="org.jboss.testharness"> + <priority value="INFO"/> + </category> + + <root> + <priority value="INFO"/> + <appender-ref ref="CONSOLE"/> + </root> + +</log4j:configuration> Modified: ri/trunk/version-matrix/pom.xml =================================================================== --- ri/trunk/version-matrix/pom.xml 2009-09-16 16:45:29 UTC (rev 3680) +++ ri/trunk/version-matrix/pom.xml 2009-09-16 17:00:53 UTC (rev 3681) @@ -339,6 +339,12 @@ <dependency> <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-jboss-embedded</artifactId> + <version>${jboss.test.harness.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> <artifactId>jboss-test-harness-tomcat</artifactId> <version>${jboss.test.harness.version}</version> </dependency>