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/29 19:52:29 UTC
svn commit: r1040223 - in
/geronimo/server/trunk/testsuite/javaee6-testsuite: di1.0-test/
ejb3.1-test/ ejb3.1-test/asynEJB-test/ ejb3.1-test/jndiEJB-test/
el2.2-test/ jsf2.0-test/ jsp2.2-test/ webbean1.0-test/conversation-test/
webbean1.0-test/webbean-...
Author: gawor
Date: Mon Nov 29 18:52:28 2010
New Revision: 1040223
URL: http://svn.apache.org/viewvc?rev=1040223&view=rev
Log:
myfaces-api -> myfaces-bundle
Modified:
geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/pom.xml
geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/pom.xml
geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/pom.xml
geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/pom.xml
geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/pom.xml
geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/pom.xml
geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/pom.xml
geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/conversation-test/pom.xml
geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-ejb-test/pom.xml
geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-jpa-test/pom.xml
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/pom.xml?rev=1040223&r1=1040222&r2=1040223&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/pom.xml Mon Nov 29 18:52:28 2010
@@ -47,7 +47,7 @@
<!-- MyFaces API -->
<dependency>
<groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
+ <artifactId>myfaces-bundle</artifactId>
<scope>provided</scope>
</dependency>
<!-- JSR-299 API -->
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/pom.xml?rev=1040223&r1=1040222&r2=1040223&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/asynEJB-test/pom.xml Mon Nov 29 18:52:28 2010
@@ -17,11 +17,8 @@
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>
<parent>
@@ -32,7 +29,7 @@
<artifactId>asynEJB-test</artifactId>
<name>Geronimo TestSuite :: Java EE 6 Testsuite :: AsynEJB-test</name>
- <description>
+ <description>
</description>
<packaging>war</packaging>
@@ -42,89 +39,75 @@
<artifactId>geronimo-servlet_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- <scope>provided</scope>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.1_spec</artifactId>
<scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <archiveClasses>false</archiveClasses>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>it</id>
- <activation>
- <property>
- <name>it</name>
- </property>
- </activation>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>
- ${project.build.testOutputDirectory}/testng.xml
- </suiteXmlFile>
- </suiteXmlFiles>
- <systemPropertyVariables>
- <appContext>${project.artifactId}</appContext>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
- </configuration>
- </execution>
+ </dependency>
+ </dependencies>
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
+ <profiles>
+ <profile>
+ <id>it</id>
+ <activation>
+ <property>
+ <name>it</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
<configuration>
- <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
+ <suiteXmlFiles>
+ <suiteXmlFile>
+ ${project.build.testOutputDirectory}/testng.xml
+ </suiteXmlFile>
+ </suiteXmlFiles>
+ <systemPropertyVariables>
+ <appContext>${project.artifactId}</appContext>
+ </systemPropertyVariables>
</configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-</profiles>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-wars</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>undeploy-war-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/pom.xml?rev=1040223&r1=1040222&r2=1040223&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/jndiEJB-test/pom.xml Mon Nov 29 18:52:28 2010
@@ -17,11 +17,8 @@
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>
<parent>
@@ -32,7 +29,7 @@
<artifactId>jndiEJB-test</artifactId>
<name>Geronimo TestSuite :: Java EE 6 Testsuite :: jndiEJB-test</name>
- <description>
+ <description>
</description>
<packaging>war</packaging>
@@ -42,91 +39,76 @@
<artifactId>geronimo-servlet_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- <scope>provided</scope>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.1_spec</artifactId>
<scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <archiveClasses>false</archiveClasses>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>it</id>
- <activation>
- <property>
- <name>it</name>
- </property>
- </activation>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>
- ${project.build.testOutputDirectory}/testng.xml
- </suiteXmlFile>
- </suiteXmlFiles>
- <systemPropertyVariables>
- <moduleVersion>${project.version}</moduleVersion>
- <appContext>${project.artifactId}</appContext>
- </systemPropertyVariables>
-
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
- </configuration>
- </execution>
+ </dependency>
+ </dependencies>
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
+ <profiles>
+ <profile>
+ <id>it</id>
+ <activation>
+ <property>
+ <name>it</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
<configuration>
- <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
+ <suiteXmlFiles>
+ <suiteXmlFile>
+ ${project.build.testOutputDirectory}/testng.xml
+ </suiteXmlFile>
+ </suiteXmlFiles>
+ <systemPropertyVariables>
+ <moduleVersion>${project.version}</moduleVersion>
+ <appContext>${project.artifactId}</appContext>
+ </systemPropertyVariables>
</configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-</profiles>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-wars</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>undeploy-war-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/pom.xml?rev=1040223&r1=1040222&r2=1040223&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/ejb3.1-test/pom.xml Mon Nov 29 18:52:28 2010
@@ -17,10 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-
-
<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>
<parent>
@@ -33,9 +30,8 @@
<name>Geronimo TestSuite :: Java EE 6 Testsuite :: ejb3.1-test</name>
<packaging>pom</packaging>
-
<modules>
<module>asynEJB-test</module>
- <module>jndiEJB-test</module>
+ <module>jndiEJB-test</module>
</modules>
</project>
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/pom.xml?rev=1040223&r1=1040222&r2=1040223&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/el2.2-test/pom.xml Mon Nov 29 18:52:28 2010
@@ -31,6 +31,18 @@
<name>Geronimo TestSuite :: Java EE 6 Testsuite :: el2.2-test</name>
<packaging>war</packaging>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>myfaces</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -44,24 +56,11 @@
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>2.0.0</version>
+ <artifactId>myfaces-bundle</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <archiveClasses>false</archiveClasses>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<profiles>
<profile>
<id>it</id>
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/pom.xml?rev=1040223&r1=1040222&r2=1040223&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jsf2.0-test/pom.xml Mon Nov 29 18:52:28 2010
@@ -30,6 +30,18 @@
<name>Geronimo TestSuite :: Java EE 6 Testsuite :: jsf2.0-test</name>
<packaging>war</packaging>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>myfaces</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -43,38 +55,11 @@
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>2.0.0</version>
+ <artifactId>myfaces-bundle</artifactId>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- <exclusion>
- <artifactId>validation-api</artifactId>
- <groupId>javax.validation</groupId>
- </exclusion>
- <exclusion>
- <artifactId>el-api</artifactId>
- <groupId>javax.el</groupId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <archiveClasses>false</archiveClasses>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<profiles>
<profile>
<id>it</id>
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/pom.xml?rev=1040223&r1=1040222&r2=1040223&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/jsp2.2-test/pom.xml Mon Nov 29 18:52:28 2010
@@ -28,6 +28,18 @@
<name>Geronimo TestSuite :: Java EE 6 Testsuite :: jsp2.2-test</name>
<packaging>war</packaging>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>myfaces</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -41,8 +53,7 @@
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>2.0.0</version>
+ <artifactId>myfaces-bundle</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/conversation-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/conversation-test/pom.xml?rev=1040223&r1=1040222&r2=1040223&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/conversation-test/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/conversation-test/pom.xml Mon Nov 29 18:52:28 2010
@@ -48,7 +48,7 @@
<!-- JSR-314 API - JSF 2.0 -->
<dependency>
<groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
+ <artifactId>myfaces-bundle</artifactId>
<scope>provided</scope>
</dependency>
<!-- JSR-299 API - Web Beans 1.0-->
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-ejb-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-ejb-test/pom.xml?rev=1040223&r1=1040222&r2=1040223&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-ejb-test/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-ejb-test/pom.xml Mon Nov 29 18:52:28 2010
@@ -48,7 +48,7 @@
<!-- JSR-314 API - JSF 2.0 -->
<dependency>
<groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
+ <artifactId>myfaces-bundle</artifactId>
<scope>provided</scope>
</dependency>
<!-- JSR-299 API - Web Beans 1.0-->
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=1040223&r1=1040222&r2=1040223&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 Mon Nov 29 18:52:28 2010
@@ -54,7 +54,7 @@
<!-- JSF -->
<dependency>
<groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
+ <artifactId>myfaces-bundle</artifactId>
<scope>provided</scope>
</dependency>
<!--JPA 2.0-->