[seam-commits] Seam SVN: r14426 - in branches/community/Seam_2_3/examples-ee6: blog/blog-ear and 13 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Sat Mar 17 02:17:17 EDT 2012
Author: dhinojosa
Date: 2012-03-17 02:17:16 -0400 (Sat, 17 Mar 2012)
New Revision: 14426
Modified:
branches/community/Seam_2_3/examples-ee6/blog/blog-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/blog/blog-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/blog/blog-web/pom.xml
branches/community/Seam_2_3/examples-ee6/blog/pom.xml
branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/pom.xml
branches/community/Seam_2_3/examples-ee6/contactlist/pom.xml
branches/community/Seam_2_3/examples-ee6/drools/drools-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/drools/drools-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/drools/drools-web/pom.xml
branches/community/Seam_2_3/examples-ee6/drools/pom.xml
Log:
migrated all versions to 2.3.0.Beta1-SNAPSHOT and repaired any ailing dependencies
Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-ear/pom.xml 2012-03-17 06:15:58 UTC (rev 14425)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-ear/pom.xml 2012-03-17 06:17:16 UTC (rev 14426)
@@ -5,11 +5,11 @@
<parent>
<artifactId>blog</artifactId>
<groupId>org.jboss.seam.examples-ee6</groupId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.0.Beta1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples-ee6.blog</groupId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog-ear</artifactId>
<packaging>ear</packaging>
<name>Blog EAR Module (EE6)</name>
@@ -23,13 +23,13 @@
<dependencies>
<dependency>
- <groupId>org.jboss.seam.examples-ee6.blog</groupId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog-web</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
- <groupId>org.jboss.seam.examples-ee6.blog</groupId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog-ejb</artifactId>
<version>${project.version}</version>
<type>ejb</type>
@@ -73,13 +73,13 @@
</jboss>
<modules>
<webModule>
- <groupId>org.jboss.seam.examples-ee6.blog</groupId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog-web</artifactId>
<contextRoot>/seam-blog</contextRoot>
<bundleFileName>blog-web.war</bundleFileName>
</webModule>
<ejbModule>
- <groupId>org.jboss.seam.examples-ee6.blog</groupId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog-ejb</artifactId>
<bundleFileName>blog-ejb.jar</bundleFileName>
</ejbModule>
@@ -144,7 +144,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.jboss.seam.examples</groupId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog-ear</artifactId>
<type>ear</type>
<overWrite>true</overWrite>
@@ -152,7 +152,7 @@
</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>org.jboss.seam.examples-ee6.blog</groupId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog-web</artifactId>
<type>war</type>
<overWrite>true</overWrite>
@@ -161,7 +161,7 @@
</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>org.jboss.seam.examples</groupId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog-ejb</artifactId>
<type>jar</type>
<overWrite>true</overWrite>
Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/pom.xml 2012-03-17 06:15:58 UTC (rev 14425)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/pom.xml 2012-03-17 06:17:16 UTC (rev 14426)
@@ -3,19 +3,24 @@
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>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog</artifactId>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.0.Beta1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples-ee6.blog</groupId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog-ejb</artifactId>
<packaging>ejb</packaging>
<name>Blog EJB Module (EE6)</name>
<dependencies>
<dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
</dependency>
@@ -37,14 +42,29 @@
<artifactId>ejb-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
- <type>ejb</type>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
+ <groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
+ <version>2.1</version>
</dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.jboss.seam</groupId>-->
+ <!--<artifactId>jboss-seam-jsf2</artifactId>-->
+ <!--<version>${project.version}</version>-->
+ <!--<type>ejb</type>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>com.sun.faces</groupId>-->
+ <!--<artifactId>jsf-api</artifactId>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>com.sun.faces</groupId>-->
+ <!--<artifactId>jsf-impl</artifactId>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>com.sun.faces</groupId>-->
+ <!--<artifactId>jsf-api</artifactId>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
@@ -80,6 +100,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
+ <version>3.5.6-Final</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-tests/pom.xml 2012-03-17 06:15:58 UTC (rev 14425)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-tests/pom.xml 2012-03-17 06:17:16 UTC (rev 14426)
@@ -5,42 +5,37 @@
<parent>
<groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.0.Beta1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples-ee6.blog</groupId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog-tests</artifactId>
<name>Blog Integration Tests Module (EE6)</name>
-
<dependencies>
<dependency>
- <groupId>org.jboss.seam.examples-ee6.blog</groupId>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog-ejb</artifactId>
- <version>${project.version}</version>
<type>ejb</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
+ <artifactId>jboss-seam</artifactId>
<type>ejb</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </dependency>
- <dependency>
<groupId>org.seleniumhq.selenium.server</groupId>
<artifactId>selenium-server</artifactId>
<classifier>standalone</classifier>
@@ -55,13 +50,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-6.0</artifactId>
- <type>pom</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -79,17 +67,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-api-maven</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -98,14 +75,6 @@
<directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
- <testResource> <!-- this takes datasource blog-ds.xml -->
- <directory>${basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </testResource>
- <testResource> <!-- this takes themes aka *.properties -->
- <directory>${basedir}/../blog-web/src/main/resources</directory>
- <filtering>true</filtering>
- </testResource>
<testResource>
<directory>src/test/resources-integration</directory>
</testResource>
@@ -168,28 +137,17 @@
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
+ <artifactId>jboss-maven-plugin</artifactId>
+ <configuration>
+ <jbossHome>${jboss.home}</jbossHome>
+ <serverName>${jboss.domain}</serverName>
+ <fileNames>
+ <param>${basedir}/../blog-ear/target/seam-blog.ear</param>
+ </fileNames>
+ </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>failsafe-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>ftest-jbossas-cluster</id>
- <properties>
- <example.context.path>seam-blog</example.context.path>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
<artifactId>selenium-maven-plugin</artifactId>
</plugin>
<plugin>
Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-web/pom.xml 2012-03-17 06:15:58 UTC (rev 14425)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-web/pom.xml 2012-03-17 06:17:16 UTC (rev 14426)
@@ -6,11 +6,11 @@
<parent>
<artifactId>blog</artifactId>
<groupId>org.jboss.seam.examples-ee6</groupId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.0.Beta1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples-ee6.blog</groupId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog-web</artifactId>
<packaging>war</packaging>
<name>Blog Web Module (EE6)</name>
@@ -23,7 +23,7 @@
<dependencies>
<dependency>
- <groupId>org.jboss.seam.examples-ee6.blog</groupId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog-ejb</artifactId>
<version>${project.version}</version>
<type>ejb</type>
@@ -31,7 +31,12 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui-jsf2</artifactId>
+ <artifactId>jboss-seam</artifactId>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ui</artifactId>
<exclusions>
<exclusion>
<groupId>org.jboss.seam</groupId>
@@ -40,10 +45,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-debug-jsf2</artifactId>
- </dependency>
- <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<exclusions>
Modified: branches/community/Seam_2_3/examples-ee6/blog/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/pom.xml 2012-03-17 06:15:58 UTC (rev 14425)
+++ branches/community/Seam_2_3/examples-ee6/blog/pom.xml 2012-03-17 06:17:16 UTC (rev 14426)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.seam</groupId>
<artifactId>examples-ee6</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.0.Beta1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ear/pom.xml 2012-03-17 06:15:58 UTC (rev 14425)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ear/pom.xml 2012-03-17 06:17:16 UTC (rev 14426)
@@ -4,7 +4,7 @@
<parent>
<artifactId>contactlist</artifactId>
<groupId>org.jboss.seam.examples-ee6</groupId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.0.Beta1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ejb/pom.xml 2012-03-17 06:15:58 UTC (rev 14425)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ejb/pom.xml 2012-03-17 06:17:16 UTC (rev 14426)
@@ -4,7 +4,7 @@
<parent>
<artifactId>contactlist</artifactId>
<groupId>org.jboss.seam.examples-ee6</groupId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.0.Beta1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -34,6 +34,7 @@
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
+ <version>2.1</version>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml 2012-03-17 06:15:58 UTC (rev 14425)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml 2012-03-17 06:17:16 UTC (rev 14426)
@@ -5,7 +5,7 @@
<parent>
<artifactId>contactlist</artifactId>
<groupId>org.jboss.seam.examples-ee6</groupId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.0.Beta1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/pom.xml 2012-03-17 06:15:58 UTC (rev 14425)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/pom.xml 2012-03-17 06:17:16 UTC (rev 14426)
@@ -4,7 +4,7 @@
<parent>
<artifactId>contactlist</artifactId>
<groupId>org.jboss.seam.examples-ee6</groupId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.0.Beta1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -54,6 +54,7 @@
<dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
+ <version>1.1.15</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/contactlist/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/pom.xml 2012-03-17 06:15:58 UTC (rev 14425)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/pom.xml 2012-03-17 06:17:16 UTC (rev 14426)
@@ -3,7 +3,7 @@
<parent>
<artifactId>examples-ee6</artifactId>
<groupId>org.jboss.seam</groupId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.0.Beta1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/community/Seam_2_3/examples-ee6/drools/drools-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/drools/drools-ear/pom.xml 2012-03-17 06:15:58 UTC (rev 14425)
+++ branches/community/Seam_2_3/examples-ee6/drools/drools-ear/pom.xml 2012-03-17 06:17:16 UTC (rev 14426)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>drools</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.0.Beta1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: branches/community/Seam_2_3/examples-ee6/drools/drools-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/drools/drools-ejb/pom.xml 2012-03-17 06:15:58 UTC (rev 14425)
+++ branches/community/Seam_2_3/examples-ee6/drools/drools-ejb/pom.xml 2012-03-17 06:17:16 UTC (rev 14426)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>drools</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.0.Beta1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -87,10 +87,12 @@
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
+ <version>2.1</version>
</dependency>
<dependency>
<groupId>org.jbpm</groupId>
<artifactId>jbpm-jpdl</artifactId>
+ <version>3.2.3</version>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml 2012-03-17 06:15:58 UTC (rev 14425)
+++ branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml 2012-03-17 06:17:16 UTC (rev 14426)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>drools</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.0.Beta1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: branches/community/Seam_2_3/examples-ee6/drools/drools-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/drools/drools-web/pom.xml 2012-03-17 06:15:58 UTC (rev 14425)
+++ branches/community/Seam_2_3/examples-ee6/drools/drools-web/pom.xml 2012-03-17 06:17:16 UTC (rev 14426)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>drools</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.0.Beta1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: branches/community/Seam_2_3/examples-ee6/drools/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/drools/pom.xml 2012-03-17 06:15:58 UTC (rev 14425)
+++ branches/community/Seam_2_3/examples-ee6/drools/pom.xml 2012-03-17 06:17:16 UTC (rev 14426)
@@ -4,7 +4,7 @@
<parent>
<artifactId>examples-ee6</artifactId>
<groupId>org.jboss.seam</groupId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.0.Beta1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
More information about the seam-commits
mailing list