[webbeans-commits] Webbeans SVN: r3687 - in ri/branches/kabir-builder: embedded-tck-runner and 12 other directories.

Author: kabir.khan(a)jboss.com Date: 2009-09-16 14:42:31 -0400 (Wed, 16 Sep 2009) New Revision: 3687 Added: ri/branches/kabir-builder/embedded-tck-runner/ ri/branches/kabir-builder/embedded-tck-runner/pom.xml ri/branches/kabir-builder/embedded-tck-runner/src/ ri/branches/kabir-builder/embedded-tck-runner/src/main/ ri/branches/kabir-builder/embedded-tck-runner/src/main/java/ ri/branches/kabir-builder/embedded-tck-runner/src/main/resources/ ri/branches/kabir-builder/embedded-tck-runner/src/main/resources/META-INF/ ri/branches/kabir-builder/embedded-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties ri/branches/kabir-builder/embedded-tck-runner/src/test/ ri/branches/kabir-builder/embedded-tck-runner/src/test/debug-resources/ ri/branches/kabir-builder/embedded-tck-runner/src/test/debug-resources/META-INF/ ri/branches/kabir-builder/embedded-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties ri/branches/kabir-builder/embedded-tck-runner/src/test/resources/ ri/branches/kabir-builder/embedded-tck-runner/src/test/resources/jndi.properties ri/branches/kabir-builder/embedded-tck-runner/src/test/resources/log4j.xml ri/branches/kabir-builder/tests/src/test/resources/META-INF/jboss-test-harness.properties Removed: ri/branches/kabir-builder/embedded-tck-runner/pom.xml ri/branches/kabir-builder/embedded-tck-runner/src/ ri/branches/kabir-builder/embedded-tck-runner/src/main/ ri/branches/kabir-builder/embedded-tck-runner/src/main/java/ ri/branches/kabir-builder/embedded-tck-runner/src/main/resources/ ri/branches/kabir-builder/embedded-tck-runner/src/main/resources/META-INF/ ri/branches/kabir-builder/embedded-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties ri/branches/kabir-builder/embedded-tck-runner/src/test/ ri/branches/kabir-builder/embedded-tck-runner/src/test/debug-resources/ ri/branches/kabir-builder/embedded-tck-runner/src/test/debug-resources/META-INF/ ri/branches/kabir-builder/embedded-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties ri/branches/kabir-builder/embedded-tck-runner/src/test/resources/ ri/branches/kabir-builder/embedded-tck-runner/src/test/resources/jndi.properties ri/branches/kabir-builder/embedded-tck-runner/src/test/resources/log4j.xml ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/jsp/JspInitialization.java Modified: ri/branches/kabir-builder/ ri/branches/kabir-builder/tests/src/main/resources/META-INF/jboss-test-harness.properties ri/branches/kabir-builder/version-matrix/pom.xml Log: Merged revisions 3678-3679,3681,3684 via svnmerge from https://svn.jboss.org/repos/webbeans/ri/trunk ....... r3678 | pete.muir(a)jboss.org | 2009-09-16 17:42:58 +0100 (Wed, 16 Sep 2009) | 1 line move test launcher out of main classpath ....... r3679 | pete.muir(a)jboss.org | 2009-09-16 17:43:24 +0100 (Wed, 16 Sep 2009) | 1 line cleanup ....... r3681 | pete.muir(a)jboss.org | 2009-09-16 18:00:53 +0100 (Wed, 16 Sep 2009) | 1 line add embedded-tck-runner ....... r3684 | pete.muir(a)jboss.org | 2009-09-16 19:32:33 +0100 (Wed, 16 Sep 2009) | 1 line import jboss-as-component-matrix ....... Property changes on: ri/branches/kabir-builder ___________________________________________________________________ Name: svnmerge-integrated - /ri/trunk:1-3676 + /ri/trunk:1-3686 Copied: ri/branches/kabir-builder/embedded-tck-runner (from rev 3684, ri/trunk/embedded-tck-runner) Property changes on: ri/branches/kabir-builder/embedded-tck-runner ___________________________________________________________________ Name: svn:ignore + .settings .project .classpath target bin Deleted: ri/branches/kabir-builder/embedded-tck-runner/pom.xml =================================================================== --- ri/trunk/embedded-tck-runner/pom.xml 2009-09-16 18:32:33 UTC (rev 3684) +++ ri/branches/kabir-builder/embedded-tck-runner/pom.xml 2009-09-16 18:42:31 UTC (rev 3687) @@ -1,143 +0,0 @@ -<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> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-component-matrix</artifactId> - <version>5.2.0-SNAPSHOT</version> - <scope>import</scope> - <type>pom</type> - </dependency> - </dependencies> - </dependencyManagement> - - <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> Copied: ri/branches/kabir-builder/embedded-tck-runner/pom.xml (from rev 3684, ri/trunk/embedded-tck-runner/pom.xml) =================================================================== --- ri/branches/kabir-builder/embedded-tck-runner/pom.xml (rev 0) +++ ri/branches/kabir-builder/embedded-tck-runner/pom.xml 2009-09-16 18:42:31 UTC (rev 3687) @@ -0,0 +1,143 @@ +<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> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-component-matrix</artifactId> + <version>5.2.0-SNAPSHOT</version> + <scope>import</scope> + <type>pom</type> + </dependency> + </dependencies> + </dependencyManagement> + + <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> Copied: ri/branches/kabir-builder/embedded-tck-runner/src (from rev 3684, ri/trunk/embedded-tck-runner/src) Copied: ri/branches/kabir-builder/embedded-tck-runner/src/main (from rev 3684, ri/trunk/embedded-tck-runner/src/main) Copied: ri/branches/kabir-builder/embedded-tck-runner/src/main/java (from rev 3684, ri/trunk/embedded-tck-runner/src/main/java) Copied: ri/branches/kabir-builder/embedded-tck-runner/src/main/resources (from rev 3684, ri/trunk/embedded-tck-runner/src/main/resources) Copied: ri/branches/kabir-builder/embedded-tck-runner/src/main/resources/META-INF (from rev 3684, ri/trunk/embedded-tck-runner/src/main/resources/META-INF) Deleted: ri/branches/kabir-builder/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 2009-09-16 18:32:33 UTC (rev 3684) +++ ri/branches/kabir-builder/embedded-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties 2009-09-16 18:42:31 UTC (rev 3687) @@ -1,2 +0,0 @@ -org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.local.LocalTestLauncher - Copied: ri/branches/kabir-builder/embedded-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties (from rev 3684, ri/trunk/embedded-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties) =================================================================== --- ri/branches/kabir-builder/embedded-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties (rev 0) +++ ri/branches/kabir-builder/embedded-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties 2009-09-16 18:42:31 UTC (rev 3687) @@ -0,0 +1,2 @@ +org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.local.LocalTestLauncher + Copied: ri/branches/kabir-builder/embedded-tck-runner/src/test (from rev 3684, ri/trunk/embedded-tck-runner/src/test) Copied: ri/branches/kabir-builder/embedded-tck-runner/src/test/debug-resources (from rev 3684, ri/trunk/embedded-tck-runner/src/test/debug-resources) Copied: ri/branches/kabir-builder/embedded-tck-runner/src/test/debug-resources/META-INF (from rev 3684, ri/trunk/embedded-tck-runner/src/test/debug-resources/META-INF) Deleted: ri/branches/kabir-builder/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 2009-09-16 18:32:33 UTC (rev 3684) +++ ri/branches/kabir-builder/embedded-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties 2009-09-16 18:42:31 UTC (rev 3687) @@ -1,6 +0,0 @@ -# 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 Copied: ri/branches/kabir-builder/embedded-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties (from rev 3684, ri/trunk/embedded-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties) =================================================================== --- ri/branches/kabir-builder/embedded-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties (rev 0) +++ ri/branches/kabir-builder/embedded-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties 2009-09-16 18:42:31 UTC (rev 3687) @@ -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 Copied: ri/branches/kabir-builder/embedded-tck-runner/src/test/resources (from rev 3684, ri/trunk/embedded-tck-runner/src/test/resources) Deleted: ri/branches/kabir-builder/embedded-tck-runner/src/test/resources/jndi.properties =================================================================== --- ri/trunk/embedded-tck-runner/src/test/resources/jndi.properties 2009-09-16 18:32:33 UTC (rev 3684) +++ ri/branches/kabir-builder/embedded-tck-runner/src/test/resources/jndi.properties 2009-09-16 18:42:31 UTC (rev 3687) @@ -1,4 +0,0 @@ -#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 Copied: ri/branches/kabir-builder/embedded-tck-runner/src/test/resources/jndi.properties (from rev 3684, ri/trunk/embedded-tck-runner/src/test/resources/jndi.properties) =================================================================== --- ri/branches/kabir-builder/embedded-tck-runner/src/test/resources/jndi.properties (rev 0) +++ ri/branches/kabir-builder/embedded-tck-runner/src/test/resources/jndi.properties 2009-09-16 18:42:31 UTC (rev 3687) @@ -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 Deleted: ri/branches/kabir-builder/embedded-tck-runner/src/test/resources/log4j.xml =================================================================== --- ri/trunk/embedded-tck-runner/src/test/resources/log4j.xml 2009-09-16 18:32:33 UTC (rev 3684) +++ ri/branches/kabir-builder/embedded-tck-runner/src/test/resources/log4j.xml 2009-09-16 18:42:31 UTC (rev 3687) @@ -1,76 +0,0 @@ -<?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> Copied: ri/branches/kabir-builder/embedded-tck-runner/src/test/resources/log4j.xml (from rev 3684, ri/trunk/embedded-tck-runner/src/test/resources/log4j.xml) =================================================================== --- ri/branches/kabir-builder/embedded-tck-runner/src/test/resources/log4j.xml (rev 0) +++ ri/branches/kabir-builder/embedded-tck-runner/src/test/resources/log4j.xml 2009-09-16 18:42:31 UTC (rev 3687) @@ -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> Deleted: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/jsp/JspInitialization.java =================================================================== --- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/jsp/JspInitialization.java 2009-09-16 18:37:08 UTC (rev 3686) +++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/jsp/JspInitialization.java 2009-09-16 18:42:31 UTC (rev 3687) @@ -1,50 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.webbeans.jsp; - -import javax.servlet.ServletContext; -import javax.servlet.jsp.JspApplicationContext; -import javax.servlet.jsp.JspFactory; - -import org.jboss.webbeans.servlet.ServletHelper; - -/** - * @author pmuir - * - */ -public class JspInitialization -{ - - public void init(ServletContext context) - { - // JSP 2.1 specific check - if (JspFactory.getDefaultFactory() == null || JspFactory.getDefaultFactory().getJspApplicationContext(context) == null) - { - return; - } - - // get JspApplicationContext. - JspApplicationContext jspAppContext = JspFactory.getDefaultFactory().getJspApplicationContext(context); - - // register compositeELResolver with JSP - jspAppContext.addELResolver(ServletHelper.getModuleBeanManager(context).getELResolver()); - - // DOesn't really achieve much :-( - //jspAppContext.addELContextListener(new WebBeansELContextListener()); - } - -} Modified: ri/branches/kabir-builder/tests/src/main/resources/META-INF/jboss-test-harness.properties =================================================================== --- ri/branches/kabir-builder/tests/src/main/resources/META-INF/jboss-test-harness.properties 2009-09-16 18:37:08 UTC (rev 3686) +++ ri/branches/kabir-builder/tests/src/main/resources/META-INF/jboss-test-harness.properties 2009-09-16 18:42:31 UTC (rev 3687) @@ -1,2 +1 @@ org.jboss.testharness.spi.StandaloneContainers=org.jboss.webbeans.test.harness.StandaloneContainersImpl -org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher Copied: ri/branches/kabir-builder/tests/src/test/resources/META-INF/jboss-test-harness.properties (from rev 3684, ri/trunk/tests/src/test/resources/META-INF/jboss-test-harness.properties) =================================================================== --- ri/branches/kabir-builder/tests/src/test/resources/META-INF/jboss-test-harness.properties (rev 0) +++ ri/branches/kabir-builder/tests/src/test/resources/META-INF/jboss-test-harness.properties 2009-09-16 18:42:31 UTC (rev 3687) @@ -0,0 +1 @@ +corg.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher Modified: ri/branches/kabir-builder/version-matrix/pom.xml =================================================================== --- ri/branches/kabir-builder/version-matrix/pom.xml 2009-09-16 18:37:08 UTC (rev 3686) +++ ri/branches/kabir-builder/version-matrix/pom.xml 2009-09-16 18:42:31 UTC (rev 3687) @@ -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>