Author: alexsmirnov Date: 2007-11-16 21:35:20 -0500 (Fri, 16 Nov 2007) New Revision: 4071 Modified: trunk/samples/seamPortletEar/ear/pom.xml trunk/samples/seamPortletEar/pom.xml trunk/samples/seamPortletEar/seamBookingPortlet/pom.xml Log: convert seam portlet sample to EAR Modified: trunk/samples/seamPortletEar/ear/pom.xml =================================================================== --- trunk/samples/seamPortletEar/ear/pom.xml 2007-11-17 00:45:20 UTC (rev 4070) +++ trunk/samples/seamPortletEar/ear/pom.xml 2007-11-17 02:35:20 UTC (rev 4071) @@ -1,80 +1,83 @@ -<?xml version="1.0"?><project> - <parent> - <artifactId>seamPortletEar</artifactId> - <groupId>org.richfaces.samples</groupId> - <version>3.2.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.samples.seamPortletEar</groupId> - <artifactId>portletEar</artifactId> - <packaging>ear</packaging> - <name>Seam Portlet Ear</name> - <version>3.2.0-SNAPSHOT</version> - <dependencies> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - </dependency> - <dependency> +<?xml version="1.0"?> +<project> + <parent> + <artifactId>seamPortletEar</artifactId> + <groupId>org.richfaces.samples</groupId> + <version>3.2.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples.seamPortletEar</groupId> + <artifactId>portletEar</artifactId> + <packaging>ear</packaging> + <name>Seam Portlet Ear</name> + <version>3.2.0-SNAPSHOT</version> + <dependencies> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + </dependency> + <dependency> <groupId>org.richfaces.samples.seamPortletEar</groupId> - <artifactId>seamBooking</artifactId> + <artifactId>seamBooking</artifactId> <type>ejb</type> - </dependency> - <dependency> + </dependency> + <dependency> <groupId>org.richfaces.samples.seamPortletEar</groupId> - <artifactId>seamBookingPortlet</artifactId> + <artifactId>seamBookingPortlet</artifactId> <type>war</type> - </dependency> - </dependencies> - <build> - <finalName>seamEAR</finalName> - <plugins> - <plugin> - <artifactId>maven-ear-plugin</artifactId> - <configuration> - <defaultLibBundleDir>lib</defaultLibBundleDir> - <modules> - <jarModule> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <includeInApplicationXml> - true - </includeInApplicationXml> - <bundleDir>/</bundleDir> - </jarModule> - <ejbModule> - <groupId> - org.richfaces.samples.seamPortletEar - </groupId> - <artifactId>seamBooking</artifactId> - <bundleDir>/</bundleDir> - </ejbModule> - <jarModule> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-api</artifactId> - <includeInApplicationXml> - true - </includeInApplicationXml> - <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> - </configuration> - </plugin> - </plugins> - </build> + </dependency> + </dependencies> + <build> + <finalName>seamEAR</finalName> + <plugins> + <plugin> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <defaultLibBundleDir>lib</defaultLibBundleDir> + <modules> + <ejbModule> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <!-- + <includeInApplicationXml> + true + </includeInApplicationXml> + --> + <bundleDir>/</bundleDir> + </ejbModule> + <ejbModule> + <groupId> + org.richfaces.samples.seamPortletEar + </groupId> + <artifactId>seamBooking</artifactId> + <bundleDir>/</bundleDir> + </ejbModule> + <jarModule> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <includeInApplicationXml> + true + </includeInApplicationXml> + <bundleDir>/</bundleDir> + </jarModule> + </modules> + <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> + </build> </project> \ No newline at end of file Modified: trunk/samples/seamPortletEar/pom.xml =================================================================== --- trunk/samples/seamPortletEar/pom.xml 2007-11-17 00:45:20 UTC (rev 4070) +++ trunk/samples/seamPortletEar/pom.xml 2007-11-17 02:35:20 UTC (rev 4071) @@ -88,21 +88,34 @@ <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> </dependencies> </dependencyManagement> Modified: trunk/samples/seamPortletEar/seamBookingPortlet/pom.xml =================================================================== --- trunk/samples/seamPortletEar/seamBookingPortlet/pom.xml 2007-11-17 00:45:20 UTC (rev 4070) +++ trunk/samples/seamPortletEar/seamBookingPortlet/pom.xml 2007-11-17 02:35:20 UTC (rev 4071) @@ -100,6 +100,12 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.richfaces.extensions</groupId> <artifactId>portlet</artifactId> <version>3.2.0-SNAPSHOT</version>