Author: maksimkaszynski Date: 2007-06-01 13:25:16 -0400 (Fri, 01 Jun 2007) New Revision: 981 Modified: trunk/sandbox-samples/pom.xml trunk/sandbox-samples/scrollable-grid-demo/pom.xml trunk/sandbox/pom.xml trunk/sandbox/scrollable-grid/pom.xml Log: fixed build for sandbox project Modified: trunk/sandbox/pom.xml =================================================================== --- trunk/sandbox/pom.xml 2007-06-01 17:10:09 UTC (rev 980) +++ trunk/sandbox/pom.xml 2007-06-01 17:25:16 UTC (rev 981) @@ -2,10 +2,10 @@ <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> <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> + <artifactId>sandbox-parent</artifactId> <packaging>pom</packaging> <name>RichFaces Components</name> - <version>3.0.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <url>http://richfaces.ajax4jsf.org</url> <properties> <org.ajax4jsf.version>1.1.1-SNAPSHOT</org.ajax4jsf.version> Modified: trunk/sandbox/scrollable-grid/pom.xml =================================================================== --- trunk/sandbox/scrollable-grid/pom.xml 2007-06-01 17:10:09 UTC (rev 980) +++ trunk/sandbox/scrollable-grid/pom.xml 2007-06-01 17:25:16 UTC (rev 981) @@ -128,6 +128,16 @@ <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> <version>1.1_02</version> + <exclusions> + <exclusion> + <artifactId>jsp-api</artifactId> + <groupId>javax.servlet.jsp</groupId> + </exclusion> + <exclusion> + <artifactId>jstl</artifactId> + <groupId>javax.servlet.jsp.jstl</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.ajax4jsf</groupId> Modified: trunk/sandbox-samples/pom.xml =================================================================== --- trunk/sandbox-samples/pom.xml 2007-06-01 17:10:09 UTC (rev 980) +++ trunk/sandbox-samples/pom.xml 2007-06-01 17:25:16 UTC (rev 981) @@ -2,7 +2,7 @@ <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> <groupId>org.richfaces</groupId> - <artifactId>richfaces-samples</artifactId> + <artifactId>sandbox-samples</artifactId> <packaging>pom</packaging> <name>RichFaces Components Examples</name> <version>1.0.0-SNAPSHOT</version> @@ -190,7 +190,8 @@ <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> - <version>1.2_03</version> + <version>1.2_03</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>javax.faces</groupId> @@ -237,7 +238,59 @@ <scope>runtime</scope> </dependency> </dependencies> - </profile> + </profile> + <profile> + <id>jsf-facelets</id> + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2_03</version> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.2_03</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.11</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>el-impl</groupId> + <artifactId>el-impl</artifactId> + <version>1.0</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.0</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> </profiles> <modules> <module>scrollable-grid-demo</module> Modified: trunk/sandbox-samples/scrollable-grid-demo/pom.xml =================================================================== --- trunk/sandbox-samples/scrollable-grid-demo/pom.xml 2007-06-01 17:10:09 UTC (rev 980) +++ trunk/sandbox-samples/scrollable-grid-demo/pom.xml 2007-06-01 17:25:16 UTC (rev 981) @@ -1,41 +1,93 @@ -<?xml version="1.0"?><project> - <parent> - <artifactId>sandbox-samples</artifactId> - <groupId>org.richfaces</groupId> - <version>1.0.0-SNAPSHOT</version> - </parent> - +<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"> + <parent> + <artifactId>sandbox-samples</artifactId> + <groupId>org.richfaces</groupId> + <version>1.0.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>scrollable-grid-demo</artifactId> - <packaging>war</packaging> - <name>scrollable-grid-demo Maven Webapp</name> - - <dependencies> - - <dependency> <groupId>org.richfaces</groupId> - <artifactId>scrollable-grid</artifactId> - <version>1.0.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>richfaces</artifactId> - <version>3.0.1-SNAPSHOT</version> - </dependency> - - </dependencies> - <build> - <finalName>scrollable-grid-demo</finalName> - <plugins> + <artifactId>scrollable-grid-demo</artifactId> + <packaging>war</packaging> + <name>scrollable-grid-demo Maven Webapp</name> + + <dependencies> + + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>scrollable-grid</artifactId> + <version>1.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>richfaces</artifactId> + <version>3.0.1-SNAPSHOT</version> + </dependency> + + + + </dependencies> + <profiles> + <profile> + <id>jsf1_2</id> + <activation> + <activeByDefault></activeByDefault> + </activation> + <build> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> + <version>2.0</version> <configuration> <source>1.5</source> <target>1.5</target> </configuration> </plugin> </plugins> - </build> + </build> + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2_03</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.2_03</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + </profiles> + <build> + <finalName>scrollable-grid-demo</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + + </build> </project> \ No newline at end of file