[richfaces-svn-commits] JBoss Rich Faces SVN: r2027 - in trunk: cdk and 54 other directories.

Author: alexsmirnov Date: 2007-08-02 15:35:23 -0400 (Thu, 02 Aug 2007) New Revision: 2027 Added: trunk/samples/seamIntegration/webapp/ trunk/samples/seamIntegration/webapp/WEB-INF/ trunk/sandbox/samples/rich-message-demo/ trunk/sandbox/samples/rich-message-demo/pom.xml Removed: trunk/cdk/AJSF-113.patch trunk/sandbox/samples/calendar-sample/ trunk/sandbox/samples/panelmenu-sample/ Modified: trunk/cdk/generator/pom.xml trunk/cdk/maven-archetype-jsfwebapp/pom.xml trunk/cdk/pom.xml trunk/docs/ajaxguide/en/pom.xml trunk/docs/ajaxguide/pom.xml trunk/docs/pom.xml trunk/docs/userguide/en/pom.xml trunk/docs/userguide/pom.xml trunk/docs/xslt/en/pom.xml trunk/docs/xslt/pom.xml trunk/framework/api/pom.xml trunk/framework/impl-parent/pom.xml trunk/framework/impl/pom.xml trunk/framework/pom.xml trunk/pom.xml trunk/samples/calendar-sample/pom.xml trunk/samples/dataFilterSliderDemo/pom.xml trunk/samples/dataTableDemo/pom.xml trunk/samples/datascroller-sample/pom.xml trunk/samples/dragDropDemo/pom.xml trunk/samples/dropdownmenu-sample/pom.xml trunk/samples/gmap-sample/pom.xml trunk/samples/inputNumberSliderDemo/pom.xml trunk/samples/inputNumberSpinnerDemo/pom.xml trunk/samples/local-value-demo/pom.xml trunk/samples/modalpanel-sample/pom.xml trunk/samples/panel-sample/pom.xml trunk/samples/panelbar-sample/pom.xml trunk/samples/panelmenu-sample/pom.xml trunk/samples/pom.xml trunk/samples/portal-echo/pom.xml trunk/samples/rich-message-demo/pom.xml trunk/samples/richfaces-art-datatable/pom.xml trunk/samples/richfaces-demo/pom.xml trunk/samples/seamIntegration/pom.xml trunk/samples/separator-sample/pom.xml trunk/samples/simpleTogglePanel-sample/pom.xml trunk/samples/skins/pom.xml trunk/samples/suggestionbox-sample/pom.xml trunk/samples/tabPanelDemo/pom.xml trunk/samples/togglePanel-sample/pom.xml trunk/samples/tomahawkCompability/pom.xml trunk/samples/toolBarDemo/pom.xml trunk/samples/tooltip-sample/pom.xml trunk/samples/tree-demo/pom.xml trunk/samples/treeModelDemo/pom.xml trunk/samples/virtualEarth-sample/pom.xml trunk/sandbox/api/pom.xml trunk/sandbox/impl/pom.xml trunk/sandbox/samples/panel2-sample/pom.xml trunk/sandbox/samples/scrollable-grid-demo/pom.xml trunk/sandbox/samples/simpleTogglePanel2-sample/pom.xml trunk/ui/message/pom.xml Log: Prepare build for a 3.1.0-rc1. Set exact project version in all pom's , move all samples into group 'org.richfaces.samples' Deleted: trunk/cdk/AJSF-113.patch =================================================================== --- trunk/cdk/AJSF-113.patch 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/cdk/AJSF-113.patch 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,52 +0,0 @@ -Index: generator/src/main/resources/META-INF/templates/converterTag.vm -=================================================================== ---- generator/src/main/resources/META-INF/templates/converterTag.vm (revision 313) -+++ generator/src/main/resources/META-INF/templates/converterTag.vm (working copy) -@@ -59,7 +59,7 @@ - - protected Converter createConverter() throws JspException - { -- ${converter.simpleClassName} converter = new ${converter.simpleClassName}(); -+ ${converter.simpleClassName} converter = (${converter.simpleClassName}) FacesContext.getCurrentInstance().getApplication().createConverter("${converter.id}"); - _setProperties(converter); - return converter; - } -Index: generator/src/main/resources/META-INF/templates/validatorTag.vm -=================================================================== ---- generator/src/main/resources/META-INF/templates/validatorTag.vm (revision 313) -+++ generator/src/main/resources/META-INF/templates/validatorTag.vm (working copy) -@@ -61,7 +61,7 @@ - - protected Validator createValidator() throws JspException - { -- ${validator.simpleClassName} validator = new ${validator.simpleClassName}(); -+ ${validator.simpleClassName} validator = (${validator.simpleClassName}) FacesContext.getCurrentInstance().getApplication().createValidator("${validator.id}"); - _setProperties(validator); - return validator; - } -Index: generator/src/main/resources/META-INF/templates12/converterTag.vm -=================================================================== ---- generator/src/main/resources/META-INF/templates12/converterTag.vm (revision 313) -+++ generator/src/main/resources/META-INF/templates12/converterTag.vm (working copy) -@@ -59,7 +59,7 @@ - - protected Converter createConverter() throws JspException - { -- ${converter.simpleClassName} converter = new ${converter.simpleClassName}(); -+ ${converter.simpleClassName} converter = (${converter.simpleClassName}) FacesContext.getCurrentInstance().getApplication().createConverter("${converter.id}"); - _setProperties(converter); - return converter; - } -Index: generator/src/main/resources/META-INF/templates12/validatorTag.vm -=================================================================== ---- generator/src/main/resources/META-INF/templates12/validatorTag.vm (revision 313) -+++ generator/src/main/resources/META-INF/templates12/validatorTag.vm (working copy) -@@ -58,7 +58,7 @@ - - protected Validator createValidator() throws JspException - { -- ${validator.simpleClassName} validator = new ${validator.simpleClassName}(); -+ ${validator.simpleClassName} validator = (${validator.simpleClassName}) FacesContext.getCurrentInstance().getApplication().createValidator("${validator.id}"); - _setProperties(validator); - return validator; - } Modified: trunk/cdk/generator/pom.xml =================================================================== --- trunk/cdk/generator/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/cdk/generator/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,82 +1,85 @@ -<?xml version="1.0"?><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>cdk</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.cdk</groupId> - <artifactId>generator</artifactId> +<?xml version="1.0"?> +<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>cdk</artifactId> + <groupId>org.richfaces</groupId> <version>3.1.0-SNAPSHOT</version> - <name>Java Server Faces component generator</name> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <inherited>true</inherited> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - <version>1.6.5</version> - </dependency> - <dependency> - <groupId>velocity</groupId> - <artifactId>velocity-dep</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.6</version> - </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.5</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_03</version> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>el-impl</groupId> - <artifactId>el-impl</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>qdox</groupId> - <artifactId>qdox</artifactId> - <version>1.6</version> - </dependency> - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - <version>2.1_3</version> - </dependency> - </dependencies> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.cdk</groupId> + <artifactId>generator</artifactId> + <version>3.1.0-SNAPSHOT</version> + <name>Java Server Faces component generator</name> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + <version>1.6.5</version> + </dependency> + <dependency> + <groupId>velocity</groupId> + <artifactId>velocity-dep</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.6</version> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2_03</version> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>el-impl</groupId> + <artifactId>el-impl</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>qdox</groupId> + <artifactId>qdox</artifactId> + <version>1.6</version> + </dependency> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> + <version>2.1_3</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: trunk/cdk/maven-archetype-jsfwebapp/pom.xml =================================================================== --- trunk/cdk/maven-archetype-jsfwebapp/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/cdk/maven-archetype-jsfwebapp/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,12 +1,14 @@ -<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>cdk</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-archetype-jsfwebapp</artifactId> +<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>cdk</artifactId> + <groupId>org.richfaces</groupId> <version>3.1.0-SNAPSHOT</version> - <name>Archetype for jsf webapp project</name> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-archetype-jsfwebapp</artifactId> + <version>3.1.0-SNAPSHOT</version> + <name>Archetype for jsf webapp project</name> </project> \ No newline at end of file Modified: trunk/cdk/pom.xml =================================================================== --- trunk/cdk/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/cdk/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<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>root</artifactId> <groupId>org.richfaces</groupId> @@ -8,7 +10,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>cdk</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>pom</packaging> <name>JSF Components Development kit</name> <dependencies /> @@ -32,5 +34,5 @@ <module>generator</module> <module>maven-archetype-jsf-component</module> <module>maven-archetype-jsfwebapp</module> - </modules> + </modules> </project> \ No newline at end of file Modified: trunk/docs/ajaxguide/en/pom.xml =================================================================== --- trunk/docs/ajaxguide/en/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/docs/ajaxguide/en/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -11,6 +11,7 @@ <groupId>org.richfaces.docs.ajaxguide</groupId> <artifactId>${translation}</artifactId> <packaging>jdocbook</packaging> + <version>3.1.0-SNAPSHOT</version> <name>Ajax4jsf Manual (${translation})</name> <properties> Modified: trunk/docs/ajaxguide/pom.xml =================================================================== --- trunk/docs/ajaxguide/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/docs/ajaxguide/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -10,6 +10,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>ajaxguide</artifactId> + <version>3.1.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Ajax4jsf user guide</name> <description>Ajax4jsf user guide</description> Modified: trunk/docs/pom.xml =================================================================== --- trunk/docs/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/docs/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -10,6 +10,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>docs</artifactId> + <version>3.1.0-SNAPSHOT</version> <name>Project documentation</name> <packaging>pom</packaging> <!-- setup repositories, to build documentation separate from Java projects --> Modified: trunk/docs/userguide/en/pom.xml =================================================================== --- trunk/docs/userguide/en/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/docs/userguide/en/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -10,6 +10,7 @@ </parent> <groupId>org.richfaces.docs.userguide</groupId> <artifactId>${translation}</artifactId> + <version>3.1.0-SNAPSHOT</version> <packaging>jdocbook</packaging> <name>Richfaces Manual (${translation})</name> Modified: trunk/docs/userguide/pom.xml =================================================================== --- trunk/docs/userguide/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/docs/userguide/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -11,6 +11,7 @@ <groupId>org.richfaces.docs</groupId> <artifactId>userguide</artifactId> <packaging>pom</packaging> + <version>3.1.0-SNAPSHOT</version> <name>User guide</name> <description>RichFaces user guide</description> <pluginRepositories> @@ -154,6 +155,17 @@ org.richfaces.ui </groupId> <artifactId> + panelmenu + </artifactId> + <version> + 3.1.0-SNAPSHOT + </version> + </artifactItem> + <artifactItem> + <groupId> + org.richfaces.ui + </groupId> + <artifactId> modal-panel </artifactId> <version> Modified: trunk/docs/xslt/en/pom.xml =================================================================== --- trunk/docs/xslt/en/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/docs/xslt/en/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -10,6 +10,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs.xslt</groupId> <artifactId>en</artifactId> + <version>3.1.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Documentation stylesheets (English translation)</name> <description> Modified: trunk/docs/xslt/pom.xml =================================================================== --- trunk/docs/xslt/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/docs/xslt/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -10,6 +10,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>xslt</artifactId> + <version>3.1.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Documentation stylesheets</name> <description>Docbook documentation stylesheets</description> Modified: trunk/framework/api/pom.xml =================================================================== --- trunk/framework/api/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/framework/api/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,15 +1,77 @@ -<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>api-parent</artifactId> - <groupId>org.richfaces.framework</groupId> - <version>3.1.0-SNAPSHOT</version> - <relativePath>../api-parent/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-api</artifactId> +<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>api-parent</artifactId> + <groupId>org.richfaces.framework</groupId> + <version>3.1.0-SNAPSHOT</version> + <relativePath>../api-parent/pom.xml</relativePath> + </parent> + --> + <parent> + <artifactId>framework</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> <version>3.1.0-SNAPSHOT</version> - <name>Java Server Faces AJAX framework API</name> + <name>Java Server Faces AJAX framework API</name> + <properties> + <jsfVersion>1.1</jsfVersion> + </properties> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.12</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2</version> + </dependency> + <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> + </dependencies> </project> \ No newline at end of file Modified: trunk/framework/impl/pom.xml =================================================================== --- trunk/framework/impl/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/framework/impl/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,101 +1,298 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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>impl-parent</artifactId> - <groupId>org.richfaces.framework</groupId> - <version>3.1.0-SNAPSHOT</version> - <relativePath>../impl-parent/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> +<?xml version="1.0" encoding="UTF-8"?> +<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>impl-parent</artifactId> + <groupId>org.richfaces.framework</groupId> + <version>3.1.0-SNAPSHOT</version> + <relativePath>../impl-parent/pom.xml</relativePath> + </parent> + --> + <parent> + <artifactId>framework</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> <version>3.1.0-SNAPSHOT</version> - <name>Java Server Faces AJAX framework implementation</name> - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - <resource> - <directory>target/javascript</directory> - </resource> - </resources> - <plugins> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-source</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javacc-maven-plugin</artifactId> - <version>2.1</version> - <executions> - <execution> - <goals> - <goal>javacc</goal> - </goals> - </execution> - </executions> - <configuration> - <packageName>org.richfaces.javacc</packageName> - </configuration> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>javascript</id> - <phase>generate-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant - antfile="${basedir}/generatescript.xml" inheritRefs="true"> - <target name="assembly" /> - <property name="target-dir" - value="${project.build.directory}/javascript"> - </property> - </ant> - </tasks> - <resourceRoot> - ${project.build.directory}/javascript - </resourceRoot> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <profiles> - <profile> - <id>clover</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clover-plugin</artifactId> - <configuration> - <excludes combine.children="append"> - <exclude> - **/javacc/** - </exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> - + <name>Java Server Faces AJAX framework implementation</name> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + <resource> + <directory>target/javascript</directory> + </resource> + </resources> + <plugins> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-source</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>javacc-maven-plugin</artifactId> + <version>2.1</version> + <executions> + <execution> + <goals> + <goal>javacc</goal> + </goals> + </execution> + </executions> + <configuration> + <packageName>org.richfaces.javacc</packageName> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>javascript</id> + <phase>generate-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <ant + antfile="${basedir}/generatescript.xml" inheritRefs="true"> + <target name="assembly" /> + <property name="target-dir" + value="${project.build.directory}/javascript"> + </property> + </ant> + </tasks> + <resourceRoot> + ${project.build.directory}/javascript + </resourceRoot> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + <profiles> + <profile> + <id>jsf1_1</id> + <activation> + <activeByDefault>true</activeByDefault> + <property> + <name>jsfVersion</name> + <value>1.1</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <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>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.1_02</version> + <scope>runtime</scope> + <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>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.0</version> + </dependency> + </dependencies> + </profile> + <profile> + <id>jsf1_2</id> + <activation> + <property> + <name>jsfVersion</name> + <value>1.2</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId> + build-helper-maven-plugin + </artifactId> + <executions> + <execution> + <id>add-source</id> + <phase>process-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>src/main/jsf12</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </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> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.2_03</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>clover</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clover-plugin</artifactId> + <configuration> + <excludes combine.children="append"> + <exclude>**/javacc/**</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>opensymphony</groupId> + <artifactId>oscache</artifactId> + <version>2.3</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.11</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>nekohtml</groupId> + <artifactId>nekohtml</artifactId> + <version>0.9.5</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.8</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + </dependencies> + <properties> + <jsfVersion>1.1</jsfVersion> + </properties> +</project> + Modified: trunk/framework/impl-parent/pom.xml =================================================================== --- trunk/framework/impl-parent/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/framework/impl-parent/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,210 +1,213 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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>framework</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.framework</groupId> - <artifactId>impl-parent</artifactId> - <packaging>pom</packaging> - <name>Java Server Faces AJAX framework implementation parent file</name> - <profiles> - <profile> - <id>jsf1_1</id> - <activation> - <activeByDefault>true</activeByDefault> - <property> - <name>jsfVersion</name> - <value>1.1</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <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>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.1_02</version> - <scope>runtime</scope> - <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>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.0</version> - </dependency> - </dependencies> - </profile> - <profile> - <id>jsf1_2</id> - <activation> - <property> - <name>jsfVersion</name> - <value>1.2</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId> - build-helper-maven-plugin - </artifactId> - <executions> - <execution> - <id>add-source</id> - <phase>process-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>src/main/jsf12</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </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> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.2_03</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - </profiles> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>opensymphony</groupId> - <artifactId>oscache</artifactId> - <version>2.3</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <version>1.1.11</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>nekohtml</groupId> - <artifactId>nekohtml</artifactId> - <version>0.9.5</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.8</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2</version> - </dependency> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-api</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - </dependencies> - <properties> - <jsfVersion>1.1</jsfVersion> - </properties> -</project> - +<?xml version="1.0" encoding="UTF-8"?> +<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>framework</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl-parent</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name> + Java Server Faces AJAX framework implementation parent file + </name> + <profiles> + <profile> + <id>jsf1_1</id> + <activation> + <activeByDefault>true</activeByDefault> + <property> + <name>jsfVersion</name> + <value>1.1</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <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>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.1_02</version> + <scope>runtime</scope> + <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>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.0</version> + </dependency> + </dependencies> + </profile> + <profile> + <id>jsf1_2</id> + <activation> + <property> + <name>jsfVersion</name> + <value>1.2</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId> + build-helper-maven-plugin + </artifactId> + <executions> + <execution> + <id>add-source</id> + <phase>process-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>src/main/jsf12</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </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> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.2_03</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + </profiles> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>opensymphony</groupId> + <artifactId>oscache</artifactId> + <version>2.3</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.11</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>nekohtml</groupId> + <artifactId>nekohtml</artifactId> + <version>0.9.5</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.8</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + </dependencies> + <properties> + <jsfVersion>1.1</jsfVersion> + </properties> +</project> + Modified: trunk/framework/pom.xml =================================================================== --- trunk/framework/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/framework/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -68,9 +68,11 @@ </pluginManagement> </build> <modules> - <module>api-parent</module> + <!-- + <module>api-parent</module> + <module>impl-parent</module> + --> <module>api</module> - <module>impl-parent</module> <module>impl</module> <module>test</module> </modules> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -11,9 +11,9 @@ <module>cdk</module> <module>framework</module> <module>ui</module> + <module>docs</module> <module>ui/assembly</module> <module>extensions</module> - <module>docs</module> <module>samples</module> <!-- <module>sandbox</module> Modified: trunk/samples/calendar-sample/pom.xml =================================================================== --- trunk/samples/calendar-sample/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/calendar-sample/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,31 +1,34 @@ -<?xml version="1.0"?><project> - <parent> - <artifactId>samples</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>calendar-sample</artifactId> - <packaging>war</packaging> - <name>calendar-sample Maven Webapp</name> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>calendar</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>core</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>skins</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - </dependencies> - <build> - <finalName>calendar-sample</finalName> - </build> +<?xml version="1.0"?> +<project> + <parent> + <artifactId>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <artifactId>calendar-sample</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>war</packaging> + <name>calendar-sample Maven Webapp</name> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>calendar</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.samples</groupId> + <artifactId>skins</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + </dependencies> + <build> + <finalName>calendar-sample</finalName> + </build> </project> \ No newline at end of file Modified: trunk/samples/dataFilterSliderDemo/pom.xml =================================================================== --- trunk/samples/dataFilterSliderDemo/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/dataFilterSliderDemo/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -7,6 +7,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>dataFilterSliderDemo</artifactId> + <version>3.1.0-SNAPSHOT</version> <packaging>war</packaging> <name>dataFilterSliderDemo Maven Webapp</name> <dependencies> @@ -21,7 +22,7 @@ <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> <version>3.1.0-SNAPSHOT</version> </dependency> Modified: trunk/samples/dataTableDemo/pom.xml =================================================================== --- trunk/samples/dataTableDemo/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/dataTableDemo/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,28 +1,31 @@ -<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>samples</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>dataTableDemo</artifactId> - <packaging>war</packaging> - <name>webapp Maven Webapp</name> - <url>http://maven.apache.org</url> - <build> - <finalName>webapp</finalName> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>dataTable</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>skins</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - </dependencies> +<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>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <artifactId>dataTableDemo</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>war</packaging> + <name>webapp Maven Webapp</name> + <url>http://maven.apache.org</url> + <build> + <finalName>webapp</finalName> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>dataTable</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.samples</groupId> + <artifactId>skins</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: trunk/samples/datascroller-sample/pom.xml =================================================================== --- trunk/samples/datascroller-sample/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/datascroller-sample/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,27 +1,30 @@ -<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>samples</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>datascroller-sample</artifactId> - <packaging>war</packaging> - <name>webapp Maven Webapp</name> - <build> - <finalName>datascroller-sample</finalName> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>datascroller</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>skins</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - </dependencies> +<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>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <artifactId>datascroller-sample</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>war</packaging> + <name>webapp Maven Webapp</name> + <build> + <finalName>datascroller-sample</finalName> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>datascroller</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.samples</groupId> + <artifactId>skins</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: trunk/samples/dragDropDemo/pom.xml =================================================================== --- trunk/samples/dragDropDemo/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/dragDropDemo/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,27 +1,30 @@ -<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>samples</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>dragDropDemo</artifactId> - <packaging>war</packaging> - <name>Drag/Drop demo app</name> - <build> - <finalName>dragDropDemo</finalName> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>drag-drop</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>skins</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - </dependencies> +<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>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <artifactId>dragDropDemo</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>war</packaging> + <name>Drag/Drop demo app</name> + <build> + <finalName>dragDropDemo</finalName> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>drag-drop</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.samples</groupId> + <artifactId>skins</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: trunk/samples/dropdownmenu-sample/pom.xml =================================================================== --- trunk/samples/dropdownmenu-sample/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/dropdownmenu-sample/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -5,8 +5,9 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>dropdownmenu-sample</artifactId> + <version>3.1.0-SNAPSHOT</version> <packaging>war</packaging> <name>webapp Maven Webapp</name> <build> @@ -24,7 +25,7 @@ <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> <version>3.1.0-SNAPSHOT</version> </dependency> Modified: trunk/samples/gmap-sample/pom.xml =================================================================== --- trunk/samples/gmap-sample/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/gmap-sample/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -5,8 +5,9 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>gmap-sample</artifactId> + <version>3.1.0-SNAPSHOT</version> <packaging>war</packaging> <name>gmap-sample Maven Webapp</name> <dependencies> Modified: trunk/samples/inputNumberSliderDemo/pom.xml =================================================================== --- trunk/samples/inputNumberSliderDemo/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/inputNumberSliderDemo/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,27 +1,30 @@ -<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>samples</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>inputNumberSliderDemo</artifactId> - <packaging>war</packaging> - <name>webapp Maven Webapp</name> - <build> - <finalName>inputNumberSliderDemo</finalName> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>inputnumber-slider</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>skins</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - </dependencies> +<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>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <artifactId>inputNumberSliderDemo</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>war</packaging> + <name>webapp Maven Webapp</name> + <build> + <finalName>inputNumberSliderDemo</finalName> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>inputnumber-slider</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.samples</groupId> + <artifactId>skins</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: trunk/samples/inputNumberSpinnerDemo/pom.xml =================================================================== --- trunk/samples/inputNumberSpinnerDemo/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/inputNumberSpinnerDemo/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,27 +1,30 @@ -<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>samples</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>inputNumberSpinnerDemo</artifactId> - <packaging>war</packaging> - <name>webapp Maven Webapp</name> - <build> - <finalName>inputNumberSpinnerDemo</finalName> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>inputnumber-spinner</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>skins</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - </dependencies> +<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>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <artifactId>inputNumberSpinnerDemo</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>war</packaging> + <name>webapp Maven Webapp</name> + <build> + <finalName>inputNumberSpinnerDemo</finalName> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>inputnumber-spinner</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.samples</groupId> + <artifactId>skins</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: trunk/samples/local-value-demo/pom.xml =================================================================== --- trunk/samples/local-value-demo/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/local-value-demo/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -5,8 +5,9 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>local-value-demo</artifactId> + <version>3.1.0-SNAPSHOT</version> <packaging>war</packaging> <name>local-value-demo Maven Webapp</name> <dependencies> Modified: trunk/samples/modalpanel-sample/pom.xml =================================================================== --- trunk/samples/modalpanel-sample/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/modalpanel-sample/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -5,8 +5,9 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>modalpanel-sample</artifactId> + <version>3.1.0-SNAPSHOT</version> <packaging>war</packaging> <name>modalpanel-sample Maven Webapp</name> <dependencies> @@ -16,7 +17,7 @@ <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> <version>3.1.0-SNAPSHOT</version> </dependency> Modified: trunk/samples/panel-sample/pom.xml =================================================================== --- trunk/samples/panel-sample/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/panel-sample/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -5,8 +5,9 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>panel-sample</artifactId> + <version>3.1.0-SNAPSHOT</version> <packaging>war</packaging> <name>panel-sample Maven Webapp</name> <dependencies> @@ -16,7 +17,7 @@ <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> <version>3.1.0-SNAPSHOT</version> </dependency> Modified: trunk/samples/panelbar-sample/pom.xml =================================================================== --- trunk/samples/panelbar-sample/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/panelbar-sample/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,27 +1,30 @@ -<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>samples</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>panelbar-sample</artifactId> - <packaging>war</packaging> - <name>webapp Maven Webapp</name> - <build> - <finalName>panelbar-sample</finalName> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>panelbar</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>skins</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - </dependencies> +<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>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <artifactId>panelbar-sample</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>war</packaging> + <name>webapp Maven Webapp</name> + <build> + <finalName>panelbar-sample</finalName> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>panelbar</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.samples</groupId> + <artifactId>skins</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: trunk/samples/panelmenu-sample/pom.xml =================================================================== --- trunk/samples/panelmenu-sample/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/panelmenu-sample/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,28 +1,30 @@ -<?xml version="1.0"?><project> - <parent> - <artifactId>samples</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>panelmenu-sample</artifactId> - <packaging>war</packaging> - <name>panelmenu-sample Maven Webapp</name> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>panelmenu</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>skins</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - </dependencies> +<?xml version="1.0"?> +<project> + <parent> + <artifactId>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <artifactId>panelmenu-sample</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>war</packaging> + <name>panelmenu-sample Maven Webapp</name> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>panelmenu</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.samples</groupId> + <artifactId>skins</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + </dependencies> - <build> - <finalName>panelmenu-sample</finalName> - </build> + <build> + <finalName>panelmenu-sample</finalName> + </build> </project> \ No newline at end of file Modified: trunk/samples/pom.xml =================================================================== --- trunk/samples/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -441,7 +441,7 @@ <module>local-value-demo</module> <!-- <module>ajaxPortlet</module> - --> + --> <module>panelmenu-sample</module> <module>rich-message-demo</module> </modules> Modified: trunk/samples/portal-echo/pom.xml =================================================================== --- trunk/samples/portal-echo/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/portal-echo/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,63 +1,68 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?> <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>portal-echo</groupId> - <artifactId>portal-echo</artifactId> - <packaging>war</packaging> - <version>0.0.1</version> - <description>Ajax JSF sample portlet</description> - <build> - <defaultGoal>package</defaultGoal> - <finalName>portal-echo</finalName> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-maven-plugin</artifactId> - <configuration> - <jbossHome>${env.JBOSS_HOME}</jbossHome> - <hostName>${jboss_host}</hostName> - <port>8080</port> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>javax.portlet</groupId> - <artifactId>portlet-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_04</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.2_04</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>a4j-portlet</artifactId> - <version>1.1.1-SNAPSHOT</version> - <exclusions> - <exclusion> + <parent> + <artifactId>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <artifactId>portal-echo</artifactId> + <packaging>war</packaging> + <version>3.1.0-SNAPSHOT</version> + <description>Ajax JSF sample portlet</description> + <build> + <defaultGoal>package</defaultGoal> + <finalName>portal-echo</finalName> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jboss-maven-plugin</artifactId> + <configuration> + <jbossHome>${env.JBOSS_HOME}</jbossHome> + <hostName>${jboss_host}</hostName> + <port>8080</port> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>javax.portlet</groupId> + <artifactId>portlet-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> - </exclusion> - <exclusion> + <version>1.2_04</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-impl</artifactId> - </exclusion> - </exclusions> - </dependency> + <version>1.2_04</version> + <scope>provided</scope> + </dependency> <dependency> + <groupId>org.richfaces</groupId> + <artifactId>a4j-portlet</artifactId> + <version>1.1.1-SNAPSHOT</version> + <exclusions> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> <version>1.2_04</version> @@ -69,6 +74,6 @@ <version>1.2_04</version> <scope>provided</scope> </dependency> - </dependencies> -</project> - + </dependencies> +</project> + Modified: trunk/samples/rich-message-demo/pom.xml =================================================================== --- trunk/samples/rich-message-demo/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/rich-message-demo/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,30 +1,32 @@ -<?xml version="1.0"?><project> - <parent> - <artifactId>samples</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.demo</groupId> - <artifactId>rich-message-demo</artifactId> - <packaging>war</packaging> - <name>rich-message-demo</name> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>message</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>skins</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - </dependencies> - +<?xml version="1.0"?> +<project> + <parent> + <artifactId>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <artifactId>rich-message-demo</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>war</packaging> + <name>rich-message-demo</name> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>message</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.samples</groupId> + <artifactId>skins</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + </dependencies> + </project> \ No newline at end of file Modified: trunk/samples/richfaces-art-datatable/pom.xml =================================================================== --- trunk/samples/richfaces-art-datatable/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/richfaces-art-datatable/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -6,8 +6,9 @@ <version>3.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>richfaces-art-datatable</artifactId> + <version>3.1.0-SNAPSHOT</version> <packaging>war</packaging> <name>richfaces-art-datatableDemo Maven Webapp</name> <dependencies> Modified: trunk/samples/richfaces-demo/pom.xml =================================================================== --- trunk/samples/richfaces-demo/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/richfaces-demo/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -5,8 +5,9 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>richfaces-demo</artifactId> + <version>3.1.0-SNAPSHOT</version> <packaging>war</packaging> <name>richfaces-demo Maven Webapp</name> <dependencies> Modified: trunk/samples/seamIntegration/pom.xml =================================================================== --- trunk/samples/seamIntegration/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/seamIntegration/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -10,6 +10,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>seamIntegration</artifactId> + <version>3.1.0-SNAPSHOT</version> <packaging>war</packaging> <name>seamIntegration Maven Webapp</name> <build> Modified: trunk/samples/separator-sample/pom.xml =================================================================== --- trunk/samples/separator-sample/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/separator-sample/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,27 +1,30 @@ -<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>samples</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>separator-sample</artifactId> - <packaging>war</packaging> - <name>webapp Maven Webapp</name> - <build> - <finalName>separator-sample</finalName> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>separator</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>skins</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - </dependencies> +<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>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <artifactId>separator-sample</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>war</packaging> + <name>webapp Maven Webapp</name> + <build> + <finalName>separator-sample</finalName> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>separator</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.samples</groupId> + <artifactId>skins</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: trunk/samples/simpleTogglePanel-sample/pom.xml =================================================================== --- trunk/samples/simpleTogglePanel-sample/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/simpleTogglePanel-sample/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,27 +1,30 @@ -<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>samples</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>simpleTogglePanel-sample</artifactId> - <packaging>war</packaging> - <name>webapp Maven Webapp</name> - <build> - <finalName>simpleTogglePanel-sample</finalName> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>simpleTogglePanel</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>skins</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - </dependencies> +<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>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <artifactId>simpleTogglePanel-sample</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>war</packaging> + <name>webapp Maven Webapp</name> + <build> + <finalName>simpleTogglePanel-sample</finalName> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>simpleTogglePanel</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.samples</groupId> + <artifactId>skins</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: trunk/samples/skins/pom.xml =================================================================== --- trunk/samples/skins/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/skins/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,13 +1,15 @@ -<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>samples</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>skins</artifactId> - <name>skins</name> - <dependencies> - </dependencies> +<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>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <artifactId>skins</artifactId> + <name>skins</name> + <version>3.1.0-SNAPSHOT</version> + <dependencies></dependencies> </project> \ No newline at end of file Modified: trunk/samples/suggestionbox-sample/pom.xml =================================================================== --- trunk/samples/suggestionbox-sample/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/suggestionbox-sample/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -5,8 +5,9 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>suggestionbox-sample</artifactId> + <version>3.1.0-SNAPSHOT</version> <packaging>war</packaging> <name>suggestionbox-sample Maven Webapp</name> <build> @@ -24,7 +25,7 @@ <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> <version>3.1.0-SNAPSHOT</version> </dependency> Modified: trunk/samples/tabPanelDemo/pom.xml =================================================================== --- trunk/samples/tabPanelDemo/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/tabPanelDemo/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,37 +1,40 @@ -<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>samples</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>tabPanelDemo</artifactId> - <packaging>war</packaging> - <name>webapp Maven Webapp</name> - <build> - <finalName>tabPanelDemo</finalName> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>tabPanel</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>core</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>panel</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>skins</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - </dependencies> +<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>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <artifactId>tabPanelDemo</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>war</packaging> + <name>webapp Maven Webapp</name> + <build> + <finalName>tabPanelDemo</finalName> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>tabPanel</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>panel</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.samples</groupId> + <artifactId>skins</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: trunk/samples/togglePanel-sample/pom.xml =================================================================== --- trunk/samples/togglePanel-sample/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/togglePanel-sample/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,32 +1,35 @@ -<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>samples</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>togglePanel-sample</artifactId> - <packaging>war</packaging> - <name>webapp Maven Webapp</name> - <build> - <finalName>togglePanel-sample</finalName> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>togglePanel</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>panel</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>skins</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - </dependencies> +<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>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <artifactId>togglePanel-sample</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>war</packaging> + <name>webapp Maven Webapp</name> + <build> + <finalName>togglePanel-sample</finalName> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>togglePanel</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>panel</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.samples</groupId> + <artifactId>skins</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: trunk/samples/tomahawkCompability/pom.xml =================================================================== --- trunk/samples/tomahawkCompability/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/tomahawkCompability/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -2,12 +2,13 @@ <project> <parent> <artifactId>samples</artifactId> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <version>1.1.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>tomahawkCompability</artifactId> + <version>3.1.0-SNAPSHOT</version> <packaging>war</packaging> <name>tomahawkCompability Maven Webapp</name> <properties> Modified: trunk/samples/toolBarDemo/pom.xml =================================================================== --- trunk/samples/toolBarDemo/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/toolBarDemo/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,27 +1,30 @@ -<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>samples</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>toolBarDemo</artifactId> - <packaging>war</packaging> - <name>webapp Maven Webapp</name> - <build> - <finalName>toolBarDemo</finalName> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>toolBar</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>skins</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - </dependencies> +<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>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <artifactId>toolBarDemo</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>war</packaging> + <name>webapp Maven Webapp</name> + <build> + <finalName>toolBarDemo</finalName> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>toolBar</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.samples</groupId> + <artifactId>skins</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: trunk/samples/tooltip-sample/pom.xml =================================================================== --- trunk/samples/tooltip-sample/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/tooltip-sample/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,28 +1,30 @@ -<?xml version="1.0"?><project> - <parent> - <artifactId>samples</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>tooltip-sample</artifactId> - <packaging>war</packaging> - <name>tooltip-sample Maven Webapp</name> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>tooltip</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>skins</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - </dependencies> +<?xml version="1.0"?> +<project> + <parent> + <artifactId>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <artifactId>tooltip-sample</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>war</packaging> + <name>tooltip-sample Maven Webapp</name> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>tooltip</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.samples</groupId> + <artifactId>skins</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + </dependencies> - <build> - <finalName>tooltip-sample</finalName> - </build> + <build> + <finalName>tooltip-sample</finalName> + </build> </project> \ No newline at end of file Modified: trunk/samples/tree-demo/pom.xml =================================================================== --- trunk/samples/tree-demo/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/tree-demo/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -5,13 +5,14 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>tree-demo</artifactId> + <version>3.1.0-SNAPSHOT</version> <packaging>war</packaging> <name>tree-demo Maven Webapp</name> <dependencies> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> <version>3.1.0-SNAPSHOT</version> </dependency> Modified: trunk/samples/treeModelDemo/pom.xml =================================================================== --- trunk/samples/treeModelDemo/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/treeModelDemo/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,26 +1,29 @@ -<?xml version="1.0"?><project> - <parent> - <artifactId>samples</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>treeModelDemo</artifactId> - <packaging>war</packaging> - <name>Tree Model Maven Webapp</name> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>treeModel</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>tree</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - </dependencies> - <build> - <finalName>treeModelDemo</finalName> - </build> +<?xml version="1.0"?> +<project> + <parent> + <artifactId>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <artifactId>treeModelDemo</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>war</packaging> + <name>Tree Model Maven Webapp</name> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>treeModel</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>tree</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + </dependencies> + <build> + <finalName>treeModelDemo</finalName> + </build> </project> \ No newline at end of file Modified: trunk/samples/virtualEarth-sample/pom.xml =================================================================== --- trunk/samples/virtualEarth-sample/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/samples/virtualEarth-sample/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -1,22 +1,25 @@ -<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>samples</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>virtualEarth-sample</artifactId> - <packaging>war</packaging> - <name>gmap-sample Maven Webapp</name> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>virtualEarth</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - </dependencies> - <build> - <finalName>virtualEarth-sample</finalName> - </build> +<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>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <artifactId>virtualEarth-sample</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>war</packaging> + <name>gmap-sample Maven Webapp</name> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>virtualEarth</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + </dependencies> + <build> + <finalName>virtualEarth-sample</finalName> + </build> </project> \ No newline at end of file Modified: trunk/sandbox/api/pom.xml =================================================================== --- trunk/sandbox/api/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/sandbox/api/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -2,10 +2,9 @@ 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>api-parent</artifactId> - <groupId>org.richfaces.framework</groupId> + <artifactId>sandbox</artifactId> + <groupId>org.richfaces</groupId> <version>3.1.0-SNAPSHOT</version> - <relativePath>../../framework/api-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> Modified: trunk/sandbox/impl/pom.xml =================================================================== --- trunk/sandbox/impl/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/sandbox/impl/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -2,10 +2,9 @@ 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>impl-parent</artifactId> - <groupId>org.richfaces.framework</groupId> + <artifactId>sandbox</artifactId> + <groupId>org.richfaces</groupId> <version>3.1.0-SNAPSHOT</version> - <relativePath>../../framework/impl-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> Modified: trunk/sandbox/samples/panel2-sample/pom.xml =================================================================== --- trunk/sandbox/samples/panel2-sample/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/sandbox/samples/panel2-sample/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -18,7 +18,7 @@ <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> <version>3.1.0-SNAPSHOT</version> </dependency> Added: trunk/sandbox/samples/rich-message-demo/pom.xml =================================================================== --- trunk/sandbox/samples/rich-message-demo/pom.xml (rev 0) +++ trunk/sandbox/samples/rich-message-demo/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -0,0 +1,45 @@ +<?xml version="1.0"?><project> + <parent> + <artifactId>samples</artifactId> + <groupId>org.richfaces.sandbox</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.demo</groupId> + <artifactId>rich-message-demo</artifactId> + <packaging>war</packaging> + <name>rich-message-demo</name> + <dependencies> + <dependency> + <groupId>org.richfaces.sandbox.ui</groupId> + <artifactId>message</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.samples</groupId> + <artifactId>skins</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + </dependencies> + + <build> + + <finalName>rich-message-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 Property changes on: trunk/sandbox/samples/rich-message-demo/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/sandbox/samples/scrollable-grid-demo/pom.xml =================================================================== --- trunk/sandbox/samples/scrollable-grid-demo/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/sandbox/samples/scrollable-grid-demo/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -16,7 +16,7 @@ <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> <version>3.1.0-SNAPSHOT</version> </dependency> Modified: trunk/sandbox/samples/simpleTogglePanel2-sample/pom.xml =================================================================== --- trunk/sandbox/samples/simpleTogglePanel2-sample/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/sandbox/samples/simpleTogglePanel2-sample/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -19,7 +19,7 @@ <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> <version>3.1.0-SNAPSHOT</version> </dependency> Modified: trunk/ui/message/pom.xml =================================================================== --- trunk/ui/message/pom.xml 2007-08-02 18:53:10 UTC (rev 2026) +++ trunk/ui/message/pom.xml 2007-08-02 19:35:23 UTC (rev 2027) @@ -7,6 +7,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>message</artifactId> + <version>3.1.0-SNAPSHOT</version> <name>Message</name> <build> <plugins>