Added: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/jsf/ejb/dummy.xhtml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/jsf/ejb/dummy.xhtml?rev=1373164&view=auto ============================================================================== --- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/jsf/ejb/dummy.xhtml (added) +++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/jsf/ejb/dummy.xhtml Tue Aug 14 23:48:12 2012 @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +<!-- + +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. +--> +<html xmlns="http://www.w3.org/1999/xhtml"; + xmlns:h="http://java.sun.com/jsf/html";> + <h:outputText value="#{dummyManagedBean.foo}"></h:outputText> +</html>
Added: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/jsf/resource/resource.xhtml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/jsf/resource/resource.xhtml?rev=1373164&view=auto ============================================================================== --- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/jsf/resource/resource.xhtml (added) +++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/jsf/resource/resource.xhtml Tue Aug 14 23:48:12 2012 @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +<!-- + +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. +--> +<html xmlns="http://www.w3.org/1999/xhtml"; + xmlns:h="http://java.sun.com/jsf/html";> + <h:outputText value="#{resourceManagedBean.foo}"></h:outputText> +</html> Added: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/persistence/multiple/persistence.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/persistence/multiple/persistence.xml?rev=1373164&view=auto ============================================================================== --- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/persistence/multiple/persistence.xml (added) +++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/persistence/multiple/persistence.xml Tue Aug 14 23:48:12 2012 @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. +--> +<persistence version="2.0" + xmlns="http://java.sun.com/xml/ns/persistence"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence + http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd";> + <persistence-unit name="pu1"> + <jta-data-source>My DataSource</jta-data-source> + <non-jta-data-source>My Unmanaged DataSource</non-jta-data-source> + <class>org.apache.openejb.arquillian.tests.persistence.multiple.Person1</class> + <properties> + <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/> + </properties> + </persistence-unit> + <persistence-unit name="pu2"> + <jta-data-source>My DataSource</jta-data-source> + <non-jta-data-source>My Unmanaged DataSource</non-jta-data-source> + <class>org.apache.openejb.arquillian.tests.persistence.multiple.Person2</class> + <properties> + <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/> + </properties> + </persistence-unit> +</persistence> \ No newline at end of file Added: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/persistence.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/persistence.xml?rev=1373164&view=auto ============================================================================== --- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/persistence.xml (added) +++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/persistence.xml Tue Aug 14 23:48:12 2012 @@ -0,0 +1,33 @@ +<!-- + + 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. +--> +<persistence xmlns="http://java.sun.com/xml/ns/persistence"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"; + version="2.0"> + <persistence-unit name="test"> + <class>org.apache.openejb.arquillian.tests.persistence.Address</class> + <class>org.apache.openejb.arquillian.tests.filterpersistence.Address</class> + <class>org.apache.openejb.arquillian.tests.listenerpersistence.Address</class> +<!-- + <properties> + <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/> + </properties> +--> + + </persistence-unit> +</persistence> \ No newline at end of file Added: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/test.getresources URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/test.getresources?rev=1373164&view=auto ============================================================================== --- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/test.getresources (added) +++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/test.getresources Tue Aug 14 23:48:12 2012 @@ -0,0 +1 @@ +ok Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml?rev=1373164&r1=1373163&r2=1373164&view=diff ============================================================================== --- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml (original) +++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml Tue Aug 14 23:48:12 2012 @@ -18,10 +18,17 @@ <version>1.1.0-SNAPSHOT</version> </parent> <artifactId>arquillian-tomee-tests</artifactId> - <packaging>jar</packaging> + <packaging>pom</packaging> <name>OpenEJB :: Arquillian Adaptors Parent :: Tests</name> + <modules> + <module>arquillian-tomee-webprofile-tests</module> + <module>arquillian-tomee-jaxrs-tests</module> + <module>arquillian-tomee-jaxws-tests</module> + <module>arquillian-tomee-codi-tests</module> + </modules> + <dependencies> <dependency> <groupId>org.apache.openejb</groupId> @@ -37,12 +44,6 @@ </dependency> <dependency> - <groupId>org.apache.myfaces.extensions.cdi.bundles</groupId> - <artifactId>myfaces-extcdi-bundle-jsf20</artifactId> - <version>1.0.5</version> - </dependency> - - <dependency> <groupId>org.apache.openejb</groupId> <artifactId>ziplock</artifactId> <version>${project.version}</version> @@ -51,7 +52,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.9</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> @@ -63,18 +64,6 @@ </dependency> <dependency> - <artifactId>commons-lang3</artifactId> - <groupId>org.apache.commons</groupId> - <version>${commons-lang3.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>tomee-webservices</artifactId> - <version>${tomee.version}</version> - </dependency> - - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> </dependency> @@ -90,17 +79,47 @@ <version>${version.shrinkwrap.descriptor}</version> </dependency> + <!-- just to get it in the correct order --> + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>apache-tomee</artifactId> + <version>${tomee.version}</version> + <classifier>webprofile</classifier> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>tomee-webapp</artifactId> + <version>${tomee.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>apache-tomcat</artifactId> + <version>${tomcat.bundle.version}</version> + <type>zip</type> + </dependency> + + <!-- all adapters --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>arquillian-tomee-embedded</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>arquillian-tomee-remote</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>arquillian-tomee-webapp-remote</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> <build> <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.12</version> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> @@ -121,218 +140,76 @@ </execution> </executions> </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.1</version> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.12</version> <executions> <execution> - <id>copy-test-libs</id> - <phase>process-test-resources</phase> - <configuration> - <artifactItems> - <artifactItem> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </artifactItem> - </artifactItems> - <outputDirectory> - ${project.build.directory}/test-libs - </outputDirectory> - <stripVersion>true</stripVersion> - </configuration> + <id>test-tomee-remote</id> + <phase>test</phase> <goals> - <goal>copy</goal> + <goal>test</goal> </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>tomee-embedded</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>arquillian-tomee-embedded</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </profile> - - <profile> - <id>tomee-webprofile-remote</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> <configuration> + <skip>${maven.test.skip}</skip> <systemPropertyVariables> - <tomee.classifier>webprofile</tomee.classifier> <tomee.version>${tomee.version}</tomee.version> + <tomee.classifier>${distribution.under.test}</tomee.classifier> + <arquillian.launch>tomee-remote</arquillian.launch> + <openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter> </systemPropertyVariables> - <excludes> - <exclude>**/jaxrs/**</exclude> - <exclude>**/jaxws/**</exclude> - </excludes> </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>arquillian-tomee-remote</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.openejb</groupId> - <artifactId>apache-tomee</artifactId> - <version>${tomee.version}</version> - <classifier>webprofile</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-api</artifactId> - <version>${myfaces.version}</version> - </dependency> - </dependencies> - </profile> - - <profile> - <id>tomee-plus-remote</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> + </execution> + <execution> + <id>test-tomee-webapp-remote</id> + <phase>test</phase> + <goals> + <goal>test</goal> + </goals> <configuration> + <skip>${maven.test.skip}</skip> <systemPropertyVariables> - <tomee.classifier>plus</tomee.classifier> <tomee.version>${tomee.version}</tomee.version> + <tomee.tomcatVersion>${tomcat.bundle.version}</tomee.tomcatVersion> + <tomee.artifactId>tomee-${webapp.under.test}webapp</tomee.artifactId> + <arquillian.launch>tomee-webapp</arquillian.launch> + <openejb.arquillian.adapter>tomee-webapp</openejb.arquillian.adapter> </systemPropertyVariables> </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>arquillian-tomee-remote</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.openejb</groupId> - <artifactId>apache-tomee</artifactId> - <version>${tomee.version}</version> - <classifier>plus</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-api</artifactId> - <version>${myfaces.version}</version> - </dependency> - </dependencies> - </profile> - - <profile> - <id>tomee-webprofile-webapp</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> + </execution> + <execution> + <id>test-tomee-embedded</id> + <phase>test</phase> + <goals> + <goal>test</goal> + </goals> <configuration> + <skip>${maven.test.skip}</skip> <systemPropertyVariables> - <tomee.artifactId>tomee-webapp</tomee.artifactId> <tomee.version>${tomee.version}</tomee.version> - <tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion> + <arquillian.launch>tomee-embedded</arquillian.launch> + <openejb.arquillian.adapter>tomee-embedded</openejb.arquillian.adapter> </systemPropertyVariables> - <excludes> - <exclude>**/jaxrs/**</exclude> - <exclude>**/jaxws/**</exclude> - </excludes> </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>arquillian-tomee-webapp-remote</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.openejb</groupId> - <artifactId>tomee-webapp</artifactId> - <version>${tomee.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>apache-tomcat</artifactId> - <version>${tomcat.bundle.version}</version> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-api</artifactId> - <version>${myfaces.version}</version> - </dependency> - </dependencies> - </profile> + </execution> + </executions> + <configuration> + <skip>true</skip> + <parallel>none</parallel> + <threadCount>1</threadCount> + </configuration> + </plugin> + </plugins> + </build> - <profile> - <id>tomee-plus-webapp</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemPropertyVariables> - <tomee.artifactId>tomee-plus-webapp</tomee.artifactId> - <tomee.version>${tomee.version}</tomee.version> - <tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion> - </systemPropertyVariables> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>arquillian-tomee-webapp-remote</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.openejb</groupId> - <artifactId>tomee-plus-webapp</artifactId> - <version>${tomee.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>apache-tomcat</artifactId> - <version>${tomcat.bundle.version}</version> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-api</artifactId> - <version>${myfaces.version}</version> - </dependency> - </dependencies> - </profile> + <properties> + <distribution.under.test>webprofile</distribution.under.test> + <webapp.under.test /> + </properties> + <profiles> <profile> <!-- Added to make it easy to quickly verify if something "should" work
