You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2010/11/04 04:32:48 UTC
svn commit: r1030824 - in
/geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-jpa-test:
pom.xml src/main/webapp/WEB-INF/geronimo-web.xml
src/test/java/org/apache/webbeans/sample/reservation/test/ReservationTest.java
Author: gawor
Date: Thu Nov 4 03:32:48 2010
New Revision: 1030824
URL: http://svn.apache.org/viewvc?rev=1030824&view=rev
Log:
get test in a slightly better shape
Modified:
geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-jpa-test/pom.xml
geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-jpa-test/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-jpa-test/src/test/java/org/apache/webbeans/sample/reservation/test/ReservationTest.java
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-jpa-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-jpa-test/pom.xml?rev=1030824&r1=1030823&r2=1030824&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-jpa-test/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-jpa-test/pom.xml Thu Nov 4 03:32:48 2010
@@ -17,9 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-
<!-- $Rev$ $Date$ -->
-
<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">
<modelVersion>4.0.0</modelVersion>
@@ -35,7 +33,7 @@
<packaging>war</packaging>
<dependencyManagement>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>myfaces</artifactId>
@@ -46,96 +44,60 @@
</dependencies>
</dependencyManagement>
- <dependencies>
- <!--Servlet API-->
+ <dependencies>
+ <!--Servlet API-->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
-
- <!--JPA 2.0-->
- <dependency>
+ <!-- JSF -->
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!--JPA 2.0-->
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
-
- <!-- JSF -->
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <scope>provided</scope>
+ <!-- EL API -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
+ <scope>provided</scope>
</dependency>
-
- <!--Derby-->
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>derby-all</artifactId>
- <version>10.6.1.0_1</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Interceptor API -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- EL API -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Common Validator -->
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>1.3.1</version>
- </dependency>
-
- <!-- OpenJPA -->
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>2.0.0</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- JSR-299 API -->
+ <!-- Interceptor API -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- JTA API -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- JSR-299 API -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
+ <version>1.0</version>
+ <scope>provided</scope>
</dependency>
-
<!-- JSR-330 API -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
+ <version>1.0</version>
+ <scope>provided</scope>
</dependency>
-
- </dependencies>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <archiveClasses>false</archiveClasses>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
+ <profiles>
<profile>
<id>it</id>
<activation>
@@ -175,18 +137,17 @@
</execution>
</executions>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
<suiteXmlFiles>
<suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
</suiteXmlFiles>
- <!--<testFailureIgnore>true</testFailureIgnore>-->
- </configuration>
+ </configuration>
</plugin>
</plugins>
</build>
- </profile>
- </profiles>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-jpa-test/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-jpa-test/src/main/webapp/WEB-INF/geronimo-web.xml?rev=1030824&r1=1030823&r2=1030824&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-jpa-test/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-jpa-test/src/main/webapp/WEB-INF/geronimo-web.xml Thu Nov 4 03:32:48 2010
@@ -18,28 +18,15 @@ specific language governing permissions
under the License.
-->
<web:web-app xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
- xmlns:client="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0"
- xmlns:conn="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2"
xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2"
- xmlns:ejb="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
- xmlns:name="http://geronimo.apache.org/xml/ns/naming-1.2"
- xmlns:pers="http://java.sun.com/xml/ns/persistence"
- xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1"
- xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
<dep:environment>
<dep:moduleId>
<dep:groupId>${project.groupId}</dep:groupId>
<dep:artifactId>${project.artifactId}</dep:artifactId>
<dep:version>${project.version}</dep:version>
- <dep:type>car</dep:type>
+ <dep:type>war</dep:type>
</dep:moduleId>
- <dep:dependencies>
- </dep:dependencies>
- <dep:hidden-classes>
- <dep:filter>org.apache.log4j</dep:filter>
- </dep:hidden-classes>
</dep:environment>
<web:context-root>/webbean-jpa-test</web:context-root>
- <dep:gbean class="org.apache.geronimo.system.logging.log4j.ApplicationLog4jConfigurationGBean" name="DirectoryLog4jConfiguration"/>
</web:web-app>
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-jpa-test/src/test/java/org/apache/webbeans/sample/reservation/test/ReservationTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-jpa-test/src/test/java/org/apache/webbeans/sample/reservation/test/ReservationTest.java?rev=1030824&r1=1030823&r2=1030824&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-jpa-test/src/test/java/org/apache/webbeans/sample/reservation/test/ReservationTest.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-jpa-test/src/test/java/org/apache/webbeans/sample/reservation/test/ReservationTest.java Thu Nov 4 03:32:48 2010
@@ -17,6 +17,8 @@
* under the License.
*/
+package org.apache.webbeans.sample.reservation.test;
+
import org.testng.Assert;
import org.testng.annotations.Test;
import org.apache.geronimo.testsupport.SeleniumTestSupport;