Author: alexsmirnov Date: 2007-07-19 19:16:32 -0400 (Thu, 19 Jul 2007) New Revision: 1719 Modified: trunk/cdk/maven-cdk-plugin/pom.xml trunk/docs/ajaxguide/pom.xml trunk/docs/userguide/en/src/main/docbook/master.xml trunk/docs/userguide/pom.xml trunk/docs/xslt/en/src/main/xslt/f.xsl trunk/extensions/gwt/pom.xml trunk/extensions/portlet/pom.xml trunk/extensions/seam/pom.xml trunk/extensions/trinidad/pom.xml trunk/framework/api/pom.xml trunk/framework/pom.xml trunk/framework/test/pom.xml trunk/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/modalpanel-sample/pom.xml trunk/samples/panel-sample/pom.xml trunk/samples/panelbar-sample/pom.xml trunk/samples/pom.xml trunk/samples/richfaces-art-datatable/pom.xml trunk/samples/richfaces-demo/pom.xml trunk/samples/separator-sample/pom.xml trunk/samples/simpleTogglePanel-sample/pom.xml trunk/samples/suggestionbox-sample/pom.xml trunk/samples/tabPanelDemo/pom.xml trunk/samples/togglePanel-sample/pom.xml trunk/samples/toolBarDemo/pom.xml trunk/samples/tree-demo/pom.xml trunk/samples/virtualEarth-sample/pom.xml trunk/sandbox/api/pom.xml trunk/sandbox/samples/calendar-sample/pom.xml trunk/sandbox/samples/panel2-sample/pom.xml trunk/sandbox/samples/panelmenu-sample/pom.xml trunk/sandbox/samples/rich-message-demo/pom.xml trunk/sandbox/samples/scrollable-grid-demo/pom.xml trunk/sandbox/samples/simpleTogglePanel2-sample/pom.xml trunk/sandbox/samples/tooltip-sample/pom.xml trunk/sandbox/ui/calendar/pom.xml trunk/sandbox/ui/message/pom.xml trunk/sandbox/ui/panel2/pom.xml trunk/sandbox/ui/panelmenu/pom.xml trunk/sandbox/ui/scrollable-grid/pom.xml trunk/sandbox/ui/simpleTogglePanel2/pom.xml trunk/sandbox/ui/tooltip/pom.xml trunk/ui/assembly/pom.xml trunk/ui/core/pom.xml trunk/ui/dataFilterSlider/pom.xml trunk/ui/dataTable/pom.xml trunk/ui/datascroller/pom.xml trunk/ui/drag-drop/pom.xml trunk/ui/dropdown-menu/pom.xml trunk/ui/gmap/pom.xml trunk/ui/menu-components/pom.xml trunk/ui/panel/pom.xml trunk/ui/pom.xml trunk/ui/simpleTogglePanel/pom.xml trunk/ui/spacer/pom.xml trunk/ui/suggestionbox/pom.xml trunk/ui/tabPanel/pom.xml trunk/ui/togglePanel/pom.xml trunk/ui/toolBar/pom.xml trunk/ui/tree/pom.xml Log: Append virtualEarth to a build process. Change artifactId's from short names to a richfaces-api[impl,ui,etc] Modified: trunk/cdk/maven-cdk-plugin/pom.xml =================================================================== --- trunk/cdk/maven-cdk-plugin/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/cdk/maven-cdk-plugin/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -49,7 +49,7 @@ <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>generator</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/docs/ajaxguide/pom.xml =================================================================== --- trunk/docs/ajaxguide/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/docs/ajaxguide/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -32,9 +32,9 @@ <groupId> org.richfaces.ui </groupId> - <artifactId>core</artifactId> + <artifactId>richfaces-ui-core</artifactId> <version> - ${project.version} + 3.1.0-SNAPSHOT </version> <type>jar</type> <overWrite>true</overWrite> @@ -129,6 +129,10 @@ <name>separator</name> <value>${file.separator}</value> </parameter> + <parameter> + <name>prefix</name> + <value>a4j</value> + </parameter> </parameters> </transformationSet> </transformationSets> Modified: trunk/docs/userguide/en/src/main/docbook/master.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/master.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/docs/userguide/en/src/main/docbook/master.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -17,6 +17,7 @@ <!ENTITY dataTable_table SYSTEM "../../../target/generated/dataTable.xml"> <!ENTITY dnd_table SYSTEM "../../../target/generated/dnd.xml"> <!ENTITY gmap_table SYSTEM "../../../target/generated/gmap.xml"> +<!ENTITY virtualEarth_table SYSTEM "../../../target/generated/virtualEarth.xml"> <!ENTITY inputNumberSlider_table SYSTEM "../../../target/generated/inputnumber-slider.xml"> <!ENTITY inputNumberSpinner_table SYSTEM "../../../target/generated/inputnumber-spinner.xml"> <!ENTITY modalPanel_table SYSTEM "../../../target/generated/modal-panel.xml"> @@ -76,6 +77,7 @@ &dataTable_table; &dnd_table; &gmap_table; +&virtualEarth_table; &inputNumberSlider_table; &inputNumberSpinner_table; &modalPanel_table; Modified: trunk/docs/userguide/pom.xml =================================================================== --- trunk/docs/userguide/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/docs/userguide/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -51,7 +51,7 @@ dataFilterSlider </artifactId> <version> - ${project.version} + 3.1.0-SNAPSHOT </version> </artifactItem> <artifactItem> @@ -62,7 +62,7 @@ datascroller </artifactId> <version> - ${project.version} + 3.1.0-SNAPSHOT </version> </artifactItem> <artifactItem> @@ -73,7 +73,7 @@ dataTable </artifactId> <version> - ${project.version} + 3.1.0-SNAPSHOT </version> </artifactItem> <artifactItem> @@ -84,7 +84,7 @@ drag-drop </artifactId> <version> - ${project.version} + 3.1.0-SNAPSHOT </version> </artifactItem> <artifactItem> @@ -95,7 +95,7 @@ dropdown-menu </artifactId> <version> - ${project.version} + 3.1.0-SNAPSHOT </version> </artifactItem> <artifactItem> @@ -104,18 +104,27 @@ </groupId> <artifactId>gmap</artifactId> <version> - ${project.version} + 3.1.0-SNAPSHOT </version> </artifactItem> <artifactItem> <groupId> org.richfaces.ui </groupId> + <artifactId>virtualEarth</artifactId> + <version> + 3.1.0-SNAPSHOT + </version> + </artifactItem> + <artifactItem> + <groupId> + org.richfaces.ui + </groupId> <artifactId> inputnumber-slider </artifactId> <version> - ${project.version} + 3.1.0-SNAPSHOT </version> </artifactItem> <artifactItem> @@ -126,7 +135,7 @@ inputnumber-spinner </artifactId> <version> - ${project.version} + 3.1.0-SNAPSHOT </version> </artifactItem> <artifactItem> @@ -137,7 +146,7 @@ menu-components </artifactId> <version> - ${project.version} + 3.1.0-SNAPSHOT </version> </artifactItem> <artifactItem> @@ -148,7 +157,7 @@ modal-panel </artifactId> <version> - ${project.version} + 3.1.0-SNAPSHOT </version> </artifactItem> <artifactItem> @@ -157,7 +166,7 @@ </groupId> <artifactId>paint2D</artifactId> <version> - ${project.version} + 3.1.0-SNAPSHOT </version> </artifactItem> <artifactItem> @@ -166,7 +175,7 @@ </groupId> <artifactId>panel</artifactId> <version> - ${project.version} + 3.1.0-SNAPSHOT </version> </artifactItem> <artifactItem> @@ -177,7 +186,7 @@ panelbar </artifactId> <version> - ${project.version} + 3.1.0-SNAPSHOT </version> </artifactItem> <artifactItem> @@ -188,7 +197,7 @@ simpleTogglePanel </artifactId> <version> - ${project.version} + 3.1.0-SNAPSHOT </version> </artifactItem> <artifactItem> @@ -199,7 +208,7 @@ separator </artifactId> <version> - ${project.version} + 3.1.0-SNAPSHOT </version> </artifactItem> <artifactItem> @@ -208,7 +217,7 @@ </groupId> <artifactId>spacer</artifactId> <version> - ${project.version} + 3.1.0-SNAPSHOT </version> </artifactItem> <artifactItem> @@ -219,7 +228,7 @@ suggestionbox </artifactId> <version> - ${project.version} + 3.1.0-SNAPSHOT </version> </artifactItem> <artifactItem> @@ -230,7 +239,7 @@ tabPanel </artifactId> <version> - ${project.version} + 3.1.0-SNAPSHOT </version> </artifactItem> <artifactItem> @@ -241,7 +250,7 @@ togglePanel </artifactId> <version> - ${project.version} + 3.1.0-SNAPSHOT </version> </artifactItem> <artifactItem> @@ -250,7 +259,7 @@ </groupId> <artifactId>toolBar</artifactId> <version> - ${project.version} + 3.1.0-SNAPSHOT </version> </artifactItem> <artifactItem> @@ -259,7 +268,7 @@ </groupId> <artifactId>tree</artifactId> <version> - ${project.version} + 3.1.0-SNAPSHOT </version> </artifactItem> <artifactItem> @@ -347,6 +356,10 @@ <name>separator</name> <value>${file.separator}</value> </parameter> + <parameter> + <name>prefix</name> + <value>rich</value> + </parameter> </parameters> </transformationSet> </transformationSets> Modified: trunk/docs/xslt/en/src/main/xslt/f.xsl =================================================================== --- trunk/docs/xslt/en/src/main/xslt/f.xsl 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/docs/xslt/en/src/main/xslt/f.xsl 2007-07-19 23:16:32 UTC (rev 1719) @@ -1,40 +1,47 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:javaee="http://java.sun.com/JSP/TagLibraryDescriptor" - version="1.0" exclude-result-prefixes="javaee"> - <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" omit-xml-declaration="yes"/> - <xsl:param name="lang" /> - <xsl:param name="title" /> - <xsl:param name="separator" /> - - <xsl:template match="javaee:taglib | taglib"> - <xsl:variable name="excluded-tag-names">header2,header3,header4,header5,header6</xsl:variable> - - <xsl:for-each select="javaee:tag | tag"> - - <!--xsl:value-of select="./name/text()" /--> - - <xsl:if test="not(contains($excluded-tag-names, javaee:name))"> - <xsl:call-template name="tag" /> - </xsl:if> - <xsl:if test="not(contains($excluded-tag-names, ./name/text()))"> - <xsl:call-template name="tag" /> - </xsl:if> - </xsl:for-each> - </xsl:template> - - <xsl:template name="tag"> - <section role="NotInToc"> - <xsl:variable name="tag_name"> - <xsl:choose> - <xsl:when test="javaee:name"> - <xsl:value-of select="javaee:name" /> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="./name/text()" /> - </xsl:otherwise> - </xsl:choose> +<?xml version="1.0" encoding="UTF-8"?> +<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:javaee="http://java.sun.com/JSP/TagLibraryDescriptor" + version="1.0" exclude-result-prefixes="javaee"> + <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" + omit-xml-declaration="yes" /> + <xsl:param name="lang" /> + <xsl:param name="title" /> + <xsl:param name="separator" /> + <xsl:param name="prefix" /> + + <xsl:template match="javaee:taglib | taglib"> + <xsl:variable name="excluded-tag-names"> + header2,header3,header4,header5,header6 + </xsl:variable> + + <xsl:for-each select="javaee:tag | tag"> + + <!--xsl:value-of select="./name/text()" /--> + + <xsl:if + test="not(contains($excluded-tag-names, javaee:name))"> + <xsl:call-template name="tag" /> + </xsl:if> + <xsl:if + test="not(contains($excluded-tag-names, ./name/text()))"> + <xsl:call-template name="tag" /> + </xsl:if> + </xsl:for-each> + </xsl:template> + + <xsl:template name="tag"> + <section role="NotInToc"> + <xsl:variable name="tag_name"> + <xsl:choose> + <xsl:when test="javaee:name"> + <xsl:value-of select="javaee:name" /> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="./name/text()" /> + </xsl:otherwise> + </xsl:choose> </xsl:variable> + <!-- <xsl:variable name="prefix"> <xsl:choose> <xsl:when test="/javaee:taglib/javaee:short-name"> @@ -44,41 +51,57 @@ <xsl:value-of select="/taglib/short-name/text()" /> </xsl:otherwise> </xsl:choose> - </xsl:variable> - - <xsl:attribute name="id"><xsl:value-of select="$tag_name"/></xsl:attribute> - <title>&lt;<xsl:value-of select="concat($prefix,':', $tag_name)" />&gt;</title> - <xsl:for-each select="document(concat($lang, $separator,'included',$separator,$tag_name, '.desc.xml'))/*"> - <xsl:copy-of select="./*"/> - </xsl:for-each> - <table> - <title><xsl:value-of select="$prefix"/>:<xsl:value-of select="javaee:name"/><xsl:value-of select="name"/> attributes</title> - <tgroup cols="2"> - <thead> - <row> - <entry>Attribute Name</entry> - <entry>Description</entry> - </row> - </thead> - <tbody> - <xsl:for-each select="javaee:attribute | attribute"> - <row> - <entry> - <xsl:value-of select="javaee:name"/> - <xsl:value-of select="name"/> - </entry> - <entry> - <xsl:value-of select="javaee:description" disable-output-escaping="yes"/> - <xsl:value-of select="description" disable-output-escaping="yes"/> - </entry> - </row> - </xsl:for-each> - </tbody> - </tgroup> - </table> - <xsl:for-each select="document(concat($lang, $separator,'included',$separator,$tag_name, '.xml'))/*"> - <xsl:copy-of select="./*"/> - </xsl:for-each> - </section> - </xsl:template> + </xsl:variable> + --> + <xsl:attribute name="id"><xsl:value-of select="$tag_name" /> + </xsl:attribute> + <title> + &lt; + <xsl:value-of select="concat($prefix,':', $tag_name)" /> + &gt; + </title> + <xsl:for-each + select="document(concat($lang, $separator,'included',$separator,$tag_name, '.desc.xml'))/*"> + <xsl:copy-of select="./*" /> + </xsl:for-each> + <table> + <title> + <xsl:value-of select="$prefix" /> + : + <xsl:value-of select="javaee:name" /> + <xsl:value-of select="name" /> + attributes + </title> + <tgroup cols="2"> + <thead> + <row> + <entry>Attribute Name</entry> + <entry>Description</entry> + </row> + </thead> + <tbody> + <xsl:for-each + select="javaee:attribute | attribute"> + <row> + <entry> + <xsl:value-of select="javaee:name" /> + <xsl:value-of select="name" /> + </entry> + <entry> + <xsl:value-of + select="javaee:description" disable-output-escaping="yes" /> + <xsl:value-of select="description" + disable-output-escaping="yes" /> + </entry> + </row> + </xsl:for-each> + </tbody> + </tgroup> + </table> + <xsl:for-each + select="document(concat($lang, $separator,'included',$separator,$tag_name, '.xml'))/*"> + <xsl:copy-of select="./*" /> + </xsl:for-each> + </section> + </xsl:template> </xsl:transform> \ No newline at end of file Modified: trunk/extensions/gwt/pom.xml =================================================================== --- trunk/extensions/gwt/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/extensions/gwt/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -99,7 +99,7 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>com.sun.facelets</groupId> Modified: trunk/extensions/portlet/pom.xml =================================================================== --- trunk/extensions/portlet/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/extensions/portlet/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -54,7 +54,7 @@ </dependency> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>impl</artifactId> + <artifactId>richfaces-impl</artifactId> <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> Modified: trunk/extensions/seam/pom.xml =================================================================== --- trunk/extensions/seam/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/extensions/seam/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -35,7 +35,7 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>jboss</groupId> Modified: trunk/extensions/trinidad/pom.xml =================================================================== --- trunk/extensions/trinidad/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/extensions/trinidad/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -35,7 +35,7 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.myfaces.trinidad</groupId> Modified: trunk/framework/api/pom.xml =================================================================== --- trunk/framework/api/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/framework/api/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -9,6 +9,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> - <artifactId>api</artifactId> + <artifactId>richfaces-api</artifactId> <name>Java Server Faces AJAX framework API</name> </project> \ No newline at end of file Modified: trunk/framework/pom.xml =================================================================== --- trunk/framework/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/framework/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -11,7 +11,7 @@ <packaging>pom</packaging> <name>Java Server Faces AJAX framework</name> <dependencies /> - <build> + <build> </build> <modules> <module>api-parent</module> Modified: trunk/framework/test/pom.xml =================================================================== --- trunk/framework/test/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/framework/test/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -6,7 +6,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> - <artifactId>test</artifactId> + <artifactId>richfaces-test</artifactId> <name>Ajax4Jsf test framework</name> <url>https://ajax4jsf.dev.java.net</url> <dependencies> @@ -40,8 +40,8 @@ </dependency> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>impl</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-impl</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>htmlunit</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -21,6 +21,21 @@ <module>sandbox</module> --> </modules> + <repositories> + <repository> + <releases /> + <snapshots> + <enabled>false</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + <id>maven-repository.dev.java.net</id> + <name>Java.net Repository for Maven</name> + <url> + https://maven-repository.dev.java.net/nonav/repository + </url> + <layout>legacy</layout> + </repository> + </repositories> <distributionManagement> <downloadUrl> http://labs.jboss.com/portal/jbossrichfaces/downloads @@ -115,5 +130,49 @@ <module>sandbox</module> </modules> </profile> + <profile> + <id>clover</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clover-plugin</artifactId> + <configuration> + <includesAllSourceRoots> + true + </includesAllSourceRoots> + <licenseLocation> + ${clover.license.path} + </licenseLocation> + <jdk>1.5</jdk> + </configuration> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>instrument</goal> + <goal>aggregate</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + + </build> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clover-plugin</artifactId> + <!-- + <configuration> + <licenseLocation>${clover.license.path}</licenseLocation> + <jdk>1.5</jdk> + </configuration> + --> + </plugin> + </plugins> + </reporting> + </profile> </profiles> </project> \ No newline at end of file Modified: trunk/samples/dataFilterSliderDemo/pom.xml =================================================================== --- trunk/samples/dataFilterSliderDemo/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/samples/dataFilterSliderDemo/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -13,12 +13,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataFilterSlider</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces</groupId> <artifactId>skins</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> <build> Modified: trunk/samples/dataTableDemo/pom.xml =================================================================== --- trunk/samples/dataTableDemo/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/samples/dataTableDemo/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -17,12 +17,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces</groupId> <artifactId>skins</artifactId> - <version>${project.version}</version> + <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-07-19 22:53:03 UTC (rev 1718) +++ trunk/samples/datascroller-sample/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -16,12 +16,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>datascroller</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces</groupId> <artifactId>skins</artifactId> - <version>${project.version}</version> + <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-07-19 22:53:03 UTC (rev 1718) +++ trunk/samples/dragDropDemo/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -16,12 +16,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>drag-drop</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces</groupId> <artifactId>skins</artifactId> - <version>${project.version}</version> + <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-07-19 22:53:03 UTC (rev 1718) +++ trunk/samples/dropdownmenu-sample/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -16,17 +16,17 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dropdown-menu</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>menu-components</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces</groupId> <artifactId>skins</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/samples/gmap-sample/pom.xml =================================================================== --- trunk/samples/gmap-sample/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/samples/gmap-sample/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -13,7 +13,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>gmap</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> <build> Modified: trunk/samples/inputNumberSliderDemo/pom.xml =================================================================== --- trunk/samples/inputNumberSliderDemo/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/samples/inputNumberSliderDemo/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -16,12 +16,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>inputnumber-slider</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces</groupId> <artifactId>skins</artifactId> - <version>${project.version}</version> + <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-07-19 22:53:03 UTC (rev 1718) +++ trunk/samples/inputNumberSpinnerDemo/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -16,12 +16,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>inputnumber-spinner</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces</groupId> <artifactId>skins</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/samples/modalpanel-sample/pom.xml =================================================================== --- trunk/samples/modalpanel-sample/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/samples/modalpanel-sample/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -13,12 +13,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>modal-panel</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces</groupId> <artifactId>skins</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> <build> Modified: trunk/samples/panel-sample/pom.xml =================================================================== --- trunk/samples/panel-sample/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/samples/panel-sample/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -13,12 +13,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>panel</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces</groupId> <artifactId>skins</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> <build> Modified: trunk/samples/panelbar-sample/pom.xml =================================================================== --- trunk/samples/panelbar-sample/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/samples/panelbar-sample/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -16,12 +16,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>panelbar</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces</groupId> <artifactId>skins</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/samples/pom.xml =================================================================== --- trunk/samples/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/samples/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -60,12 +60,12 @@ </dependency> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>impl</artifactId> + <artifactId>richfaces-impl</artifactId> <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> - <artifactId>core</artifactId> + <artifactId>richfaces-ui-core</artifactId> <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> @@ -380,7 +380,7 @@ <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>impl</artifactId> + <artifactId>richfaces-impl</artifactId> <version>3.1.0-SNAPSHOT</version> <exclusions> <exclusion> @@ -395,7 +395,7 @@ </dependency> <dependency> <groupId>org.richfaces.ui</groupId> - <artifactId>core</artifactId> + <artifactId>richfaces-ui-core</artifactId> <version>3.1.0-SNAPSHOT</version> <exclusions> <exclusion> Modified: trunk/samples/richfaces-art-datatable/pom.xml =================================================================== --- trunk/samples/richfaces-art-datatable/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/samples/richfaces-art-datatable/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -13,8 +13,8 @@ <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-ui</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> <build> Modified: trunk/samples/richfaces-demo/pom.xml =================================================================== --- trunk/samples/richfaces-demo/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/samples/richfaces-demo/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -12,8 +12,8 @@ <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-ui</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> <build> Modified: trunk/samples/separator-sample/pom.xml =================================================================== --- trunk/samples/separator-sample/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/samples/separator-sample/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -16,12 +16,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>separator</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces</groupId> <artifactId>skins</artifactId> - <version>${project.version}</version> + <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-07-19 22:53:03 UTC (rev 1718) +++ trunk/samples/simpleTogglePanel-sample/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -16,12 +16,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>simpleTogglePanel</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces</groupId> <artifactId>skins</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/samples/suggestionbox-sample/pom.xml =================================================================== --- trunk/samples/suggestionbox-sample/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/samples/suggestionbox-sample/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -16,12 +16,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>suggestionbox</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces</groupId> <artifactId>skins</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/samples/tabPanelDemo/pom.xml =================================================================== --- trunk/samples/tabPanelDemo/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/samples/tabPanelDemo/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -16,17 +16,17 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>tabPanel</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>panel</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces</groupId> <artifactId>skins</artifactId> - <version>${project.version}</version> + <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-07-19 22:53:03 UTC (rev 1718) +++ trunk/samples/togglePanel-sample/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -16,17 +16,17 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>togglePanel</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>panel</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces</groupId> <artifactId>skins</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/samples/toolBarDemo/pom.xml =================================================================== --- trunk/samples/toolBarDemo/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/samples/toolBarDemo/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -16,12 +16,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>toolBar</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces</groupId> <artifactId>skins</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/samples/tree-demo/pom.xml =================================================================== --- trunk/samples/tree-demo/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/samples/tree-demo/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -13,17 +13,17 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>skins</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>tree</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>drag-drop</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> <build> Modified: trunk/samples/virtualEarth-sample/pom.xml =================================================================== --- trunk/samples/virtualEarth-sample/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/samples/virtualEarth-sample/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -13,7 +13,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>virtualEarth</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> <build> Modified: trunk/sandbox/api/pom.xml =================================================================== --- trunk/sandbox/api/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/sandbox/api/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -9,13 +9,13 @@ </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> - <artifactId>api</artifactId> + <artifactId>richfaces-sandbox-api</artifactId> <name>Richfaces Sandbox API</name> <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>api</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-api</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> Modified: trunk/sandbox/samples/calendar-sample/pom.xml =================================================================== --- trunk/sandbox/samples/calendar-sample/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/sandbox/samples/calendar-sample/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -12,12 +12,12 @@ <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>calendar</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces</groupId> <artifactId>skins</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> <build> Modified: trunk/sandbox/samples/panel2-sample/pom.xml =================================================================== --- trunk/sandbox/samples/panel2-sample/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/sandbox/samples/panel2-sample/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -15,12 +15,12 @@ <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>panel2</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces</groupId> <artifactId>skins</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> Modified: trunk/sandbox/samples/panelmenu-sample/pom.xml =================================================================== --- trunk/sandbox/samples/panelmenu-sample/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/sandbox/samples/panelmenu-sample/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -13,12 +13,12 @@ <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>panelmenu</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces</groupId> <artifactId>skins</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> Modified: trunk/sandbox/samples/rich-message-demo/pom.xml =================================================================== --- trunk/sandbox/samples/rich-message-demo/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/sandbox/samples/rich-message-demo/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -13,12 +13,12 @@ <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>message</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces</groupId> <artifactId>skins</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> Modified: trunk/sandbox/samples/scrollable-grid-demo/pom.xml =================================================================== --- trunk/sandbox/samples/scrollable-grid-demo/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/sandbox/samples/scrollable-grid-demo/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -22,8 +22,8 @@ </dependency> <dependency> <groupId>org.richfaces</groupId> - <artifactId>richfaces</artifactId> - <version>3.0.2-SNAPSHOT</version> + <artifactId>richfaces-ui</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>nekohtml</groupId> Modified: trunk/sandbox/samples/simpleTogglePanel2-sample/pom.xml =================================================================== --- trunk/sandbox/samples/simpleTogglePanel2-sample/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/sandbox/samples/simpleTogglePanel2-sample/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -16,12 +16,12 @@ <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>simpleTogglePanel2</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces</groupId> <artifactId>skins</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/sandbox/samples/tooltip-sample/pom.xml =================================================================== --- trunk/sandbox/samples/tooltip-sample/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/sandbox/samples/tooltip-sample/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -13,12 +13,12 @@ <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>tooltip</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces</groupId> <artifactId>skins</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> Modified: trunk/sandbox/ui/calendar/pom.xml =================================================================== --- trunk/sandbox/ui/calendar/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/sandbox/ui/calendar/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -45,8 +45,8 @@ <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>impl</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-impl</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> Modified: trunk/sandbox/ui/message/pom.xml =================================================================== --- trunk/sandbox/ui/message/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/sandbox/ui/message/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -43,8 +43,8 @@ <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>impl</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-impl</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/sandbox/ui/panel2/pom.xml =================================================================== --- trunk/sandbox/ui/panel2/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/sandbox/ui/panel2/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -45,8 +45,8 @@ <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>impl</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-impl</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> Modified: trunk/sandbox/ui/panelmenu/pom.xml =================================================================== --- trunk/sandbox/ui/panelmenu/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/sandbox/ui/panelmenu/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -43,8 +43,8 @@ <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>impl</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-impl</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/sandbox/ui/scrollable-grid/pom.xml =================================================================== --- trunk/sandbox/ui/scrollable-grid/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/sandbox/ui/scrollable-grid/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -62,8 +62,8 @@ <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>impl</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-impl</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/sandbox/ui/simpleTogglePanel2/pom.xml =================================================================== --- trunk/sandbox/ui/simpleTogglePanel2/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/sandbox/ui/simpleTogglePanel2/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -43,8 +43,8 @@ <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>impl</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-impl</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/sandbox/ui/tooltip/pom.xml =================================================================== --- trunk/sandbox/ui/tooltip/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/sandbox/ui/tooltip/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -36,8 +36,8 @@ <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>impl</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-impl</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/ui/assembly/pom.xml =================================================================== --- trunk/ui/assembly/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/ui/assembly/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -6,7 +6,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces</artifactId> + <artifactId>richfaces-ui</artifactId> <name>RichFaces JSF components library</name> <packaging>jar</packaging> <build> @@ -111,7 +111,7 @@ en </artifactId> <version> - ${project.version} + 3.1.0-SNAPSHOT </version> <outputDirectory> ${project.build.directory}/docs/userguide/en @@ -160,11 +160,5 @@ </plugins> </build> <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/ui/core/pom.xml =================================================================== --- trunk/ui/core/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/ui/core/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -8,7 +8,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> - <artifactId>core</artifactId> + <artifactId>richfaces-ui-core</artifactId> <name>Java Server Faces AJAX framework</name> <build> <plugins> Modified: trunk/ui/dataFilterSlider/pom.xml =================================================================== --- trunk/ui/dataFilterSlider/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/ui/dataFilterSlider/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -44,8 +44,8 @@ <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>impl</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-impl</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/ui/dataTable/pom.xml =================================================================== --- trunk/ui/dataTable/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/ui/dataTable/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -43,8 +43,8 @@ <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> - <artifactId>core</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-ui-core</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/ui/datascroller/pom.xml =================================================================== --- trunk/ui/datascroller/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/ui/datascroller/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -43,8 +43,8 @@ <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>impl</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-impl</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/ui/drag-drop/pom.xml =================================================================== --- trunk/ui/drag-drop/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/ui/drag-drop/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -42,14 +42,9 @@ </build> <dependencies> <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>impl</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.richfaces.ui</groupId> - <artifactId>core</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-ui-core</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/ui/dropdown-menu/pom.xml =================================================================== --- trunk/ui/dropdown-menu/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/ui/dropdown-menu/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -43,13 +43,13 @@ <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>impl</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-impl</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>menu-components</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/ui/gmap/pom.xml =================================================================== --- trunk/ui/gmap/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/ui/gmap/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -6,8 +6,8 @@ </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> - <artifactId>virtualEarth</artifactId> - <name>Virtual Earth</name> + <artifactId>gmap</artifactId> + <name>Google map component</name> <build> <plugins> <plugin> @@ -33,7 +33,7 @@ <library> <prefix>org.richfaces</prefix> <taglib> - <shortName>virtualEarth</shortName> + <shortName>gmap</shortName> </taglib> </library> </configuration> Modified: trunk/ui/menu-components/pom.xml =================================================================== --- trunk/ui/menu-components/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/ui/menu-components/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -43,8 +43,8 @@ <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>impl</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-impl</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/ui/panel/pom.xml =================================================================== --- trunk/ui/panel/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/ui/panel/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -44,8 +44,8 @@ <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>impl</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-impl</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/ui/pom.xml =================================================================== --- trunk/ui/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/ui/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -62,6 +62,7 @@ <module>panelbar</module> <module>dataFilterSlider</module> <module>gmap</module> + <module>virtualEarth</module> <module>separator</module> <module>spacer</module> <module>paint2D</module> @@ -79,45 +80,6 @@ <module>menu-components</module> <module>dropdown-menu</module> </modules> - <repositories> - <repository> - <releases /> - <snapshots> - <enabled>false</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - <id>maven-repository.dev.java.net</id> - <name>Java.net Repository for Maven</name> - <url> - https://maven-repository.dev.java.net/nonav/repository - </url> - <layout>legacy</layout> - </repository> - <repository> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <updatePolicy>always</updatePolicy> - </snapshots> - <id>maven2-snapshots.exadel.com</id> - <name>Exadel Repository for Maven Snapshots</name> - <url>http://maven.exadel.com/</url> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <updatePolicy>always</updatePolicy> - </snapshots> - <id>maven2-snapshots.exadel.com</id> - <name>Exadel Repository for Maven Snapshots</name> - <url>http://maven.exadel.com/</url> - </pluginRepository> - </pluginRepositories> <dependencies> <dependency> <groupId>junit</groupId> @@ -163,13 +125,13 @@ </dependency> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>impl</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-impl</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>test</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-test</artifactId> + <version>3.1.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> @@ -289,49 +251,5 @@ </downloadUrl> </distributionManagement> <profiles> - <profile> - <id>clover</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clover-plugin</artifactId> - <configuration> - <includesAllSourceRoots> - true - </includesAllSourceRoots> - <licenseLocation> - ${clover.license.path} - </licenseLocation> - <jdk>1.5</jdk> - </configuration> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>instrument</goal> - <goal>aggregate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - - </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clover-plugin</artifactId> - <!-- - <configuration> - <licenseLocation>${clover.license.path}</licenseLocation> - <jdk>1.5</jdk> - </configuration> - --> - </plugin> - </plugins> - </reporting> - </profile> </profiles> </project> \ No newline at end of file Modified: trunk/ui/simpleTogglePanel/pom.xml =================================================================== --- trunk/ui/simpleTogglePanel/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/ui/simpleTogglePanel/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -43,8 +43,8 @@ <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>impl</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-impl</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/ui/spacer/pom.xml =================================================================== --- trunk/ui/spacer/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/ui/spacer/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -43,8 +43,8 @@ <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>impl</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-impl</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/ui/suggestionbox/pom.xml =================================================================== --- trunk/ui/suggestionbox/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/ui/suggestionbox/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -43,8 +43,8 @@ <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>impl</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-impl</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/ui/tabPanel/pom.xml =================================================================== --- trunk/ui/tabPanel/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/ui/tabPanel/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -43,8 +43,8 @@ <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>impl</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-impl</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/ui/togglePanel/pom.xml =================================================================== --- trunk/ui/togglePanel/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/ui/togglePanel/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -43,8 +43,8 @@ <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>impl</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-impl</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/ui/toolBar/pom.xml =================================================================== --- trunk/ui/toolBar/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/ui/toolBar/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -43,8 +43,8 @@ <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>impl</artifactId> - <version>${project.version}</version> + <artifactId>richfaces-impl</artifactId> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/ui/tree/pom.xml =================================================================== --- trunk/ui/tree/pom.xml 2007-07-19 22:53:03 UTC (rev 1718) +++ trunk/ui/tree/pom.xml 2007-07-19 23:16:32 UTC (rev 1719) @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>drag-drop</artifactId> - <version>${project.version}</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file