Author: jlmonteiro
Date: Thu Aug 19 06:43:48 2010
New Revision: 987039
URL: http://svn.apache.org/viewvc?rev=987039&view=rev
Log:
OPENEJB-1332 Patch from Lin Sun
It provides a Atinject-TCK runner to the openejb-core module. Thanks!
Added:
openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/
openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/AtInjectContainer.java
openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/OpenEJBAtInjectTckTest.java
openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/specific/
openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/specific/DriverBinding.java
openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/specific/SpareBinding.java
openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/specific/SpecificProducer.java
Modified:
openejb/branches/openejb-jcdi/container/openejb-core/pom.xml
Modified: openejb/branches/openejb-jcdi/container/openejb-core/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-jcdi/container/openejb-core/pom.xml?rev=987039&r1=987038&r2=987039&view=diff
==============================================================================
--- openejb/branches/openejb-jcdi/container/openejb-core/pom.xml (original)
+++ openejb/branches/openejb-jcdi/container/openejb-core/pom.xml Thu Aug 19
06:43:48 2010
@@ -22,394 +22,406 @@
<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>container</artifactId>
- <groupId>org.apache.openejb</groupId>
- <version>3.2-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>openejb-core</artifactId>
- <packaging>jar</packaging>
- <name>OpenEJB :: Container :: Core</name>
- <properties>
- <openejb.osgi.import.pkg>
- org.apache.activemq.ra;resolution:=optional,
- org.apache.commons.dbcp.managed;resolution:=optional,
- oracle.toplink.*;resolution:=optional,
- org.apache.openjpa.*;resolution:=optional,
- org.eclipse.persistence.*;resolution:=optional,
- org.hibernate.*;resolution:=optional,
- org.quartz.*;resolution:=optional,
- javax.enterprise.deploy*;resolution:=optional,
- javax.jms*;resolution:=optional,
- javax.xml.registry*;resolution:=optional,
- javax.xml.rpc*;resolution:=optional,
- org.apache.activemq*;resolution:=optional,
- org.apache.catalina*;resolution:=optional,
- org.apache.commons.dbcp*;resolution:=optional,
- org.apache.xerces*;resolution:=optional,
- org.apache.xml.resolver*;resolution:=optional,
- javax.annotation*;version=1.1,
- javax.transaction*;version=1.1,
- javax.ejb*;version=3.1,
- javax.xml.ws,
- *
- </openejb.osgi.import.pkg>
- <openejb.osgi.export>
- !org.apache.openejb.client,
- org.apache.openejb*;version=${openejb.osgi.export.version}
- </openejb.osgi.export>
- </properties>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- <plugins>
-<!--
- <plugin>
- <groupId>com.envoisolutions.sxc</groupId>
- <artifactId>sxc-jaxb-maven-plugin</artifactId>
- <version>0.7-SNAPSHOT</version>
- <executions>
- <execution>
- <configuration>
- <classes>
- <class>org.apache.openejb.config.sys</class>
- </classes>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
--->
- <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>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-javaagent</artifactId>
- <version>${version}</version>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <argLine>-Xmx256m
"-javaagent:${basedir}/target/openejb-javaagent-${version}.jar"
-enableassertions</argLine>
- <workingDirectory>${basedir}/target</workingDirectory>
- <systemProperties>
- <property>
- <name>openejb.home</name>
- <value>${basedir}/target/test-classes</value>
- </property>
- <property>
- <name>log4j.configuration</name>
-
<value>file:///${basedir}/target/classes/embedded.logging.properties</value>
- </property>
- </systemProperties>
- <excludes>
- <exclude>**/TestHandler.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <tstamp>
- <format property="TSTAMP" pattern="hh:mm" />
- </tstamp>
- <replace file="target/classes/openejb-version.properties"
token="@DATE-REPLACED-BY-MAVEN@" value="${DSTAMP}" />
- <replace file="target/classes/openejb-version.properties"
token="@TIME-REPLACED-BY-MAVEN@" value="${TSTAMP}" />
- <property name="compile_classpath"
refid="maven.compile.classpath" />
- <java classname="org.apache.openejb.util.MakeTxLookup">
- <arg value="${project.build.directory}" />
- <classpath>
- <pathelement path="${compile_classpath}" />
- </classpath>
- </java>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.apache.openejb.cli.Bootstrap</mainClass>
- <!--<addClasspath>true</addClasspath>-->
- </manifest>
- <manifestEntries>
- <Class-Path>openejb-loader-${version}.jar
openejb-client-${version}.jar
- xbean-finder-shaded-${xbeanVersion}.jar
xbean-asm-shaded-${xbeanVersion}.jar</Class-Path>
- <J2EE-DeploymentFactory-Implementation-Class>
-
org.apache.openejb.config.VmDeploymentFactory</J2EE-DeploymentFactory-Implementation-Class>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludes>
-
<exclude>src/main/resources/META-INF/org.apache.openejb.cli/validate.examples</exclude>
-
<exclude>src/main/resources/META-INF/org.apache.openejb.cli/validate.help</exclude>
-
<exclude>src/main/resources/META-INF/org.apache.openejb.resource.jdbc.DataSourcePlugin/*</exclude>
- <exclude>src/main/resources/schema/ejb-jar_1_1.xsd</exclude>
-
<exclude>src/main/resources/META-INF/services/org/apache/activemq/broker/openejb</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>javaee-api</artifactId>
- <version>6.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-api</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-loader</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-javaagent</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-jee</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-itests-app</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-itests-beans</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-itests-interceptor-beans</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-itests-client</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math</artifactId>
- <version>2.1</version>
- </dependency>
- <!-- ActiveMQ -->
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-ra</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- </dependency>
- <!-- End ActiveMQ -->
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-connector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-transaction</artifactId>
- </dependency>
- <dependency>
- <groupId>org.objectweb.howl</groupId>
- <artifactId>howl</artifactId>
- </dependency>
- <!-- JavaMail -->
- <dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_mail</artifactId>
- </dependency>
- <!-- End: JavaMail -->
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-asm-shaded</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder-shaded</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-reflect</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-naming</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </dependency>
- <dependency>
- <groupId>idb</groupId>
- <artifactId>idb</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>commons-dbcp-all</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.swizzle</groupId>
- <artifactId>swizzle-stream</artifactId>
- </dependency>
- <!-- added temporarily till we get a fixed version of the dep report
plugin -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <!-- webservices -->
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- </dependency>
- <dependency>
- <groupId>quartz</groupId>
- <artifactId>quartz</artifactId>
- </dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- <version>2.5.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-spring</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-spi</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-ejb-common</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-ee</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- <profiles>
- <profile>
- <id>openejb.debug</id>
- <build>
+ <parent>
+ <artifactId>container</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ <version>3.2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>openejb-core</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenEJB :: Container :: Core</name>
+ <properties>
+ <openejb.osgi.import.pkg>
+ org.apache.activemq.ra;resolution:=optional,
+ org.apache.commons.dbcp.managed;resolution:=optional,
+ oracle.toplink.*;resolution:=optional,
+ org.apache.openjpa.*;resolution:=optional,
+ org.eclipse.persistence.*;resolution:=optional,
+ org.hibernate.*;resolution:=optional,
+ org.quartz.*;resolution:=optional,
+ javax.enterprise.deploy*;resolution:=optional,
+ javax.jms*;resolution:=optional,
+ javax.xml.registry*;resolution:=optional,
+ javax.xml.rpc*;resolution:=optional,
+ org.apache.activemq*;resolution:=optional,
+ org.apache.catalina*;resolution:=optional,
+ org.apache.commons.dbcp*;resolution:=optional,
+ org.apache.xerces*;resolution:=optional,
+ org.apache.xml.resolver*;resolution:=optional,
+ javax.annotation*;version=1.1,
+ javax.transaction*;version=1.1,
+ javax.ejb*;version=3.1,
+ javax.xml.ws,
+ *
+ </openejb.osgi.import.pkg>
+ <openejb.osgi.export>
+ !org.apache.openejb.client,
+ org.apache.openejb*;version=${openejb.osgi.export.version}
+ </openejb.osgi.export>
+ </properties>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
-
<argLine>"-javaagent:${basedir}/target/openejb-javaagent-${version}.jar"
-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</argLine>
- <workingDirectory>${basedir}/target</workingDirectory>
- <systemProperties>
- <property>
- <name>openejb.home</name>
- <value>${basedir}/target/test-classes</value>
- </property>
- <property>
- <name>log4j.configuration</name>
-
<value>file:///${basedir}/target/classes/embedded.logging.properties</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
+ <!--
+ <plugin>
+ <groupId>com.envoisolutions.sxc</groupId>
+ <artifactId>sxc-jaxb-maven-plugin</artifactId>
+ <version>0.7-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <configuration>
+ <classes>
+
<class>org.apache.openejb.config.sys</class>
+ </classes>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ -->
+ <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>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-javaagent</artifactId>
+ <version>${version}</version>
+
<outputDirectory>${project.build.directory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <argLine>-Xmx256m
"-javaagent:${basedir}/target/openejb-javaagent-${version}.jar"
-enableassertions</argLine>
+ <workingDirectory>${basedir}/target</workingDirectory>
+ <systemProperties>
+ <property>
+ <name>openejb.home</name>
+ <value>${basedir}/target/test-classes</value>
+ </property>
+ <property>
+ <name>log4j.configuration</name>
+
<value>file:///${basedir}/target/classes/embedded.logging.properties</value>
+ </property>
+ </systemProperties>
+ <excludes>
+ <exclude>**/TestHandler.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <tstamp>
+ <format property="TSTAMP" pattern="hh:mm"
/>
+ </tstamp>
+ <replace
file="target/classes/openejb-version.properties"
token="@DATE-REPLACED-BY-MAVEN@" value="${DSTAMP}" />
+ <replace
file="target/classes/openejb-version.properties"
token="@TIME-REPLACED-BY-MAVEN@" value="${TSTAMP}" />
+ <property name="compile_classpath"
refid="maven.compile.classpath" />
+ <java
classname="org.apache.openejb.util.MakeTxLookup">
+ <arg value="${project.build.directory}" />
+ <classpath>
+ <pathelement
path="${compile_classpath}" />
+ </classpath>
+ </java>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+
<mainClass>org.apache.openejb.cli.Bootstrap</mainClass>
+ <!--<addClasspath>true</addClasspath>-->
+ </manifest>
+ <manifestEntries>
+ <Class-Path>openejb-loader-${version}.jar
openejb-client-${version}.jar
+ xbean-finder-shaded-${xbeanVersion}.jar
xbean-asm-shaded-${xbeanVersion}.jar</Class-Path>
+ <J2EE-DeploymentFactory-Implementation-Class>
+
org.apache.openejb.config.VmDeploymentFactory</J2EE-DeploymentFactory-Implementation-Class>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludes>
+
<exclude>src/main/resources/META-INF/org.apache.openejb.cli/validate.examples</exclude>
+
<exclude>src/main/resources/META-INF/org.apache.openejb.cli/validate.help</exclude>
+
<exclude>src/main/resources/META-INF/org.apache.openejb.resource.jdbc.DataSourcePlugin/*</exclude>
+
<exclude>src/main/resources/schema/ejb-jar_1_1.xsd</exclude>
+
<exclude>src/main/resources/META-INF/services/org/apache/activemq/broker/openejb</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
- </build>
- </profile>
- </profiles>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-api</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-loader</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-javaagent</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-jee</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-itests-app</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-itests-beans</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-itests-interceptor-beans</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-itests-client</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <!-- ActiveMQ -->
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ </dependency>
+ <!-- End ActiveMQ -->
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.objectweb.howl</groupId>
+ <artifactId>howl</artifactId>
+ </dependency>
+ <!-- JavaMail -->
+ <dependency>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.4_mail</artifactId>
+ </dependency>
+ <!-- End: JavaMail -->
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-asm-shaded</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-finder-shaded</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-reflect</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-naming</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>idb</groupId>
+ <artifactId>idb</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>commons-dbcp-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.swizzle</groupId>
+ <artifactId>swizzle-stream</artifactId>
+ </dependency>
+ <!-- added temporarily till we get a fixed version of the dep report
plugin -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <!-- webservices -->
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>2.5.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-spi</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-ejb-common</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-ee</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject-tck</artifactId>
+ <version>1</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <profile>
+ <id>openejb.debug</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+
<argLine>"-javaagent:${basedir}/target/openejb-javaagent-${version}.jar"
-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</argLine>
+
<workingDirectory>${basedir}/target</workingDirectory>
+ <systemProperties>
+ <property>
+ <name>openejb.home</name>
+
<value>${basedir}/target/test-classes</value>
+ </property>
+ <property>
+ <name>log4j.configuration</name>
+
<value>file:///${basedir}/target/classes/embedded.logging.properties</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Added:
openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/AtInjectContainer.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/AtInjectContainer.java?rev=987039&view=auto
==============================================================================
---
openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/AtInjectContainer.java
(added)
+++
openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/AtInjectContainer.java
Thu Aug 19 06:43:48 2010
@@ -0,0 +1,121 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.openejb.atinjecttck;
+
+import java.lang.annotation.Annotation;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.naming.InitialContext;
+
+import junit.framework.Test;
+
+import org.apache.openejb.assembler.classic.Assembler;
+import org.apache.openejb.assembler.classic.SecurityServiceInfo;
+import org.apache.openejb.assembler.classic.TransactionServiceInfo;
+import org.apache.openejb.atinjecttck.specific.SpecificProducer;
+import org.apache.openejb.config.ConfigurationFactory;
+import org.apache.openejb.config.EjbModule;
+import org.apache.openejb.jee.Beans;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.webbeans.container.BeanManagerImpl;
+import org.atinject.tck.Tck;
+import org.atinject.tck.auto.Car;
+import org.atinject.tck.auto.Convertible;
+import org.atinject.tck.auto.FuelTank;
+import org.atinject.tck.auto.Seat;
+import org.atinject.tck.auto.Tire;
+import org.atinject.tck.auto.V8Engine;
+import org.atinject.tck.auto.accessories.Cupholder;
+
+public class AtInjectContainer
+{
+ private static Set<Class<?>> deploymentClasses = null;
+ private InitialContext ctx;
+
+ static
+ {
+ deploymentClasses = new HashSet<Class<?>>();
+ deploymentClasses.add(Convertible.class);
+ deploymentClasses.add(Seat.class);
+ deploymentClasses.add(Tire.class);
+ deploymentClasses.add(V8Engine.class);
+ deploymentClasses.add(Cupholder.class);
+ deploymentClasses.add(FuelTank.class);
+
+ //Adding our special producer
+ deploymentClasses.add(SpecificProducer.class);
+
+ }
+
+ public AtInjectContainer()
+ {
+
+ }
+
+ public Test start()
+ {
+ try
+ {
+ //deploy(deploymentClasses);
+ ConfigurationFactory config = new ConfigurationFactory();
+ Assembler assembler = new Assembler();
+
+
assembler.createTransactionManager(config.configureService(TransactionServiceInfo.class));
+
assembler.createSecurityService(config.configureService(SecurityServiceInfo.class));
+
+ EjbJar ejbJar = new EjbJar();
+ Beans ejbBeans = new Beans();
+ for (Class clazz : deploymentClasses) {
+ ejbBeans.addManagedClass(clazz);
+ }
+
+ EjbModule module = new EjbModule(ejbJar);
+ module.setBeans(ejbBeans);
+
+ assembler.createApplication(config.configureApplication(module),
this.getClass().getClassLoader());
+
+
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+
+ final BeanManager manager = BeanManagerImpl.getManager();
+ Set<Bean<?>> beans = manager.getBeans(Car.class, new
Annotation[0]);
+ Bean<?> carBean = beans.iterator().next();
+
+ Car car = (Car)manager.getReference(carBean , Car.class ,
manager.createCreationalContext(carBean));
+
+ return Tck.testsFor(car, false, true);
+
+ }catch(Exception e)
+ {
+ e.printStackTrace();
+ }
+
+ return null;
+ }
+
+
+ public void stop()
+ {
+
+
+ }
+
+}
Added:
openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/OpenEJBAtInjectTckTest.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/OpenEJBAtInjectTckTest.java?rev=987039&view=auto
==============================================================================
---
openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/OpenEJBAtInjectTckTest.java
(added)
+++
openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/OpenEJBAtInjectTckTest.java
Thu Aug 19 06:43:48 2010
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.openejb.atinjecttck;
+
+import junit.framework.Test;
+
+public class OpenEJBAtInjectTckTest
+{
+ public static Test suite()
+ {
+ return new AtInjectContainer().start();
+ }
+
+}
Added:
openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/specific/DriverBinding.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/specific/DriverBinding.java?rev=987039&view=auto
==============================================================================
---
openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/specific/DriverBinding.java
(added)
+++
openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/specific/DriverBinding.java
Thu Aug 19 06:43:48 2010
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.openejb.atinjecttck.specific;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+
+...@qualifier
+...@retention(RetentionPolicy.RUNTIME)
+...@target( { ElementType.FIELD, ElementType.METHOD, ElementType.TYPE,
ElementType.PARAMETER })
+public @interface DriverBinding
+{
+
+}
Added:
openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/specific/SpareBinding.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/specific/SpareBinding.java?rev=987039&view=auto
==============================================================================
---
openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/specific/SpareBinding.java
(added)
+++
openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/specific/SpareBinding.java
Thu Aug 19 06:43:48 2010
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.openejb.atinjecttck.specific;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+
+...@qualifier
+...@retention(RetentionPolicy.RUNTIME)
+...@target( { ElementType.FIELD, ElementType.METHOD, ElementType.TYPE,
ElementType.PARAMETER })
+public @interface SpareBinding
+{
+
+}
Added:
openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/specific/SpecificProducer.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/specific/SpecificProducer.java?rev=987039&view=auto
==============================================================================
---
openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/specific/SpecificProducer.java
(added)
+++
openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/atinjecttck/specific/SpecificProducer.java
Thu Aug 19 06:43:48 2010
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.openejb.atinjecttck.specific;
+
+import javax.enterprise.inject.Typed;
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.New;
+import javax.enterprise.inject.Produces;
+import javax.inject.Named;
+
+import org.atinject.tck.auto.Drivers;
+import org.atinject.tck.auto.DriversSeat;
+import org.atinject.tck.auto.Seat;
+import org.atinject.tck.auto.accessories.SpareTire;
+
+
+public class SpecificProducer
+{
+ public SpecificProducer()
+ {
+
+ }
+
+ @Produces @Drivers
+ public Seat produceDrivers(@New DriversSeat seat)
+ {
+ return seat;
+ }
+
+
+ @Produces @DriverBinding @Typed(value={DriversSeat.class})
+ public DriversSeat produceDriverSeat(@New DriversSeat seat)
+ {
+ return seat;
+ }
+
+
+ @Produces @Named("spare") @SpareBinding
+ public SpareTire produceSpare(@New SpareTire tire)
+ {
+ return tire;
+ }
+
+ @Produces @Default @Typed(value={SpareTire.class})
+ public SpareTire produceSpareTire(@New SpareTire tire)
+ {
+ return tire;
+ }
+
+}
