[richfaces-svn-commits] JBoss Rich Faces SVN: r5931 - in trunk/samples: richfaces-ear-demo/richfacesEAR and 5 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Thu Feb 7 16:14:58 EST 2008
Author: alexsmirnov
Date: 2008-02-07 16:14:58 -0500 (Thu, 07 Feb 2008)
New Revision: 5931
Added:
trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/seamEAR-ds.xml
Modified:
trunk/samples/pom.xml
trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml
trunk/samples/seamEAR/ear/pom.xml
trunk/samples/seamEAR/ejbs/pom.xml
trunk/samples/seamEAR/pom.xml
trunk/samples/seamEAR/wars/seamWebapp/pom.xml
Log:
restore builds of the Ear samples
Modified: trunk/samples/pom.xml
===================================================================
--- trunk/samples/pom.xml 2008-02-07 21:08:41 UTC (rev 5930)
+++ trunk/samples/pom.xml 2008-02-07 21:14:58 UTC (rev 5931)
@@ -452,9 +452,8 @@
<module>panelmenu-sample</module>
<module>rich-message-demo</module>
<module>scrollableDataTableDemo</module>
- <!--
- <module>richfaces-ear-demo</module>
- -->
+ <module>richfaces-ear-demo</module>
+ <module>seamEAR</module>
<module>contextMenuDemo</module>
<module>orderingListDemo</module>
Modified: trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml
===================================================================
--- trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml 2008-02-07 21:08:41 UTC (rev 5930)
+++ trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml 2008-02-07 21:14:58 UTC (rev 5931)
@@ -34,6 +34,7 @@
</dependency>
</dependencies>
<build>
+ <finalName>richfacesEAR</finalName>
<plugins>
<plugin>
<artifactId>maven-ear-plugin</artifactId>
Modified: trunk/samples/seamEAR/ear/pom.xml
===================================================================
--- trunk/samples/seamEAR/ear/pom.xml 2008-02-07 21:08:41 UTC (rev 5930)
+++ trunk/samples/seamEAR/ear/pom.xml 2008-02-07 21:14:58 UTC (rev 5931)
@@ -14,18 +14,11 @@
<version>3.2.0-SNAPSHOT</version>
</parent>
<dependencies>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ </dependency>
<dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-api</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.richfaces.samples.seamEAR</groupId>
<artifactId>ejbs</artifactId>
<type>ejb</type>
@@ -43,35 +36,6 @@
<groupId>org.richfaces.samples.seamEAR.projects</groupId>
<artifactId>logging</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-seam-core</artifactId>
- <version>2.0.0.BETA</version>
- </dependency>
- -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-seam-core</artifactId>
- <version>2.0.0.BETA</version>
- <systemPath>${seamHome}/jboss-seam.jar</systemPath>
- <scope>system</scope>
- <type>ejb</type>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-el</artifactId>
- <version>2.0.0.BETA</version>
- <systemPath>${seamHome}/lib/jboss-el.jar</systemPath>
- <scope>system</scope>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jbpm-jpdl</artifactId>
- <version>3.2.1-GA</version>
- <systemPath>${seamHome}/lib/jbpm-jpdl.jar</systemPath>
- <scope>system</scope>
- </dependency>
</dependencies>
<build>
<finalName>seamEAR</finalName>
@@ -82,8 +46,8 @@
<defaultLibBundleDir>lib</defaultLibBundleDir>
<modules>
<ejbModule>
- <groupId>jboss</groupId>
- <artifactId>jboss-seam-core</artifactId>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
<!--
<includeInApplicationXml>
true
@@ -99,16 +63,6 @@
<bundleDir>/</bundleDir>
</ejbModule>
<jarModule>
- <groupId>jboss</groupId>
- <artifactId>jboss-el</artifactId>
- <bundleDir>lib</bundleDir>
- </jarModule>
- <jarModule>
- <groupId>jboss</groupId>
- <artifactId>jbpm-jpdl</artifactId>
- <bundleDir>lib</bundleDir>
- </jarModule>
- <jarModule>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
<includeInApplicationXml>
@@ -117,21 +71,21 @@
<bundleDir>/</bundleDir>
</jarModule>
</modules>
- <!--
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- --><!--
- <jboss>
- <version>4.2</version>
- <loader-repository>
- seam.jboss.org:loader=seamEAR
- </loader-repository>
- </jboss>
- -->
- <version>5</version>
+ <artifactTypeMappings>
+ <artifactTypeMapping type="jar" mapping="ejb" />
+ </artifactTypeMappings>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
+ <jboss>
+ <version>4.2</version>
+ <loader-repository>
+ seam.jboss.org:loader=seamEAR
+ </loader-repository>
+ </jboss>
+ <version>5</version>
</configuration>
</plugin>
</plugins>
Modified: trunk/samples/seamEAR/ejbs/pom.xml
===================================================================
--- trunk/samples/seamEAR/ejbs/pom.xml 2008-02-07 21:08:41 UTC (rev 5930)
+++ trunk/samples/seamEAR/ejbs/pom.xml 2008-02-07 21:14:58 UTC (rev 5931)
@@ -23,11 +23,9 @@
<artifactId>logging</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-seam-core</artifactId>
- <version>2.0.0.BETA</version>
- <systemPath>${seamHome}/jboss-seam.jar</systemPath>
- <scope>system</scope>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.richfaces.framework</groupId>
Added: trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/seamEAR-ds.xml
===================================================================
--- trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/seamEAR-ds.xml (rev 0)
+++ trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/seamEAR-ds.xml 2008-02-07 21:14:58 UTC (rev 5931)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE datasources
+ PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd">
+
+<datasources>
+
+ <local-tx-datasource>
+ <jndi-name>seamEARDatasource</jndi-name>
+ <connection-url>jdbc:hsqldb:.</connection-url>
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+ <user-name>sa</user-name>
+ <password></password>
+ <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
+ <metadata>
+ <type-mapping>Hypersonic SQL</type-mapping>
+ </metadata>
+<!--
+ <exception-sorter-class-name>
+ org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter
+ </exception-sorter-class-name>
+ <metadata>
+ <type-mapping>mySQL</type-mapping>
+ </metadata>
+-->
+ </local-tx-datasource>
+
+</datasources>
+
Property changes on: trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/seamEAR-ds.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Modified: trunk/samples/seamEAR/pom.xml
===================================================================
--- trunk/samples/seamEAR/pom.xml 2008-02-07 21:08:41 UTC (rev 5930)
+++ trunk/samples/seamEAR/pom.xml 2008-02-07 21:14:58 UTC (rev 5931)
@@ -15,6 +15,9 @@
<artifactId>seamEAR</artifactId>
<packaging>pom</packaging>
<name>seam EAR project</name>
+ <properties>
+ <seam>2.0.0.GA</seam>
+ </properties>
<modules>
<module>projects</module>
<module>primary-source</module>
@@ -77,6 +80,65 @@
<version>3.2.0-SNAPSHOT</version>
<type>ejb</type>
</dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>3.0.0.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.3.0.ga</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>3.3.1.ga</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <version>${seam}</version>
+ <exclusions>
+ <exclusion><groupId>javax.el</groupId><artifactId>el-api</artifactId></exclusion>
+ <exclusion><groupId>javax.servlet</groupId><artifactId>servlet-api</artifactId></exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ui</artifactId>
+ <version>${seam}</version>
+ <exclusions>
+ <exclusion><groupId>javax.servlet</groupId><artifactId>servlet-api</artifactId></exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ioc</artifactId>
+ <version>${seam}</version>
+ <exclusions>
+ <exclusion><groupId>javax.servlet</groupId><artifactId>servlet-api</artifactId></exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-debug</artifactId>
+ <version>${seam}</version>
+ <exclusions>
+ <exclusion><groupId>javax.servlet</groupId><artifactId>servlet-api</artifactId></exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-remoting</artifactId>
+ <version>${seam}</version>
+ <exclusions>
+ <exclusion><groupId>javax.servlet</groupId><artifactId>servlet-api</artifactId></exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
Modified: trunk/samples/seamEAR/wars/seamWebapp/pom.xml
===================================================================
--- trunk/samples/seamEAR/wars/seamWebapp/pom.xml 2008-02-07 21:08:41 UTC (rev 5930)
+++ trunk/samples/seamEAR/wars/seamWebapp/pom.xml 2008-02-07 21:14:58 UTC (rev 5931)
@@ -18,23 +18,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webResources>
- <resource>
- <!-- this is relative to the pom.xml directory -->
- <directory>${seamHome}</directory>
- <!-- override the destination directory for this resource -->
- <targetPath>WEB-INF/lib</targetPath>
- <includes>
- <include>jboss-seam-ui.jar</include>
- <include>jboss-seam-debug.jar</include>
- <include>
- jboss-seam-remoting.jar
- </include>
- </includes>
- </resource>
- </webResources>
- </configuration>
</plugin>
</plugins>
</build>
@@ -58,7 +41,7 @@
<dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
- <version>1.1.12</version>
+ <version>1.1.14</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -75,13 +58,13 @@
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>1.2_04</version>
+ <version>1.2_07</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>1.2_04</version>
+ <version>1.2_07</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -115,54 +98,27 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>seam-core</artifactId>
- <version>2.0.0.BETA</version>
- <systemPath>${seamHome}/jboss-seam.jar</systemPath>
- <scope>system</scope>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>seam-ui</artifactId>
- <version>2.0.0.BETA</version>
- <systemPath>${seamHome}/jboss-seam-ui.jar</systemPath>
- <scope>system</scope>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ui</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-el</artifactId>
- <version>2.0.0.BETA</version>
- <systemPath>${seamHome}/lib/jboss-el.jar</systemPath>
- <scope>system</scope>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-debug</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>seam-debug</artifactId>
- <version>2.0.0.BETA</version>
- <systemPath>${seamHome}/jboss-seam-debug.jar</systemPath>
- <scope>system</scope>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ioc</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>seam-ioc</artifactId>
- <version>2.0.0.BETA</version>
- <systemPath>${seamHome}/jboss-seam-ioc.jar</systemPath>
- <scope>system</scope>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-remoting</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>seam-remoting</artifactId>
- <version>2.0.0.BETA</version>
- <systemPath>${seamHome}/jboss-seam-remoting.jar</systemPath>
- <scope>system</scope>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.ga</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2</version>
More information about the richfaces-svn-commits
mailing list