5:30 p.m.
Author: nbelaevski
Date: 2008-02-05 18:30:23 -0500 (Tue, 05 Feb 2008)
New Revision: 5844
Added:
trunk/samples/combobox-sample/
trunk/samples/pickList-sample/
trunk/ui/combobox/
trunk/ui/pickList/
Removed:
trunk/sandbox/samples/combobox-sample/
trunk/sandbox/samples/pickList-sample/
trunk/sandbox/ui/combobox/
trunk/sandbox/ui/pickList/
Modified:
trunk/samples/combobox-sample/pom.xml
trunk/samples/combobox-sample/src/main/webapp/pages/index.jsp
trunk/samples/combobox-sample/src/main/webapp/pages/index.xhtml
trunk/samples/pickList-sample/pom.xml
trunk/samples/pickList-sample/src/main/webapp/pages/index.jsp
trunk/samples/pom.xml
trunk/sandbox/samples/pom.xml
trunk/sandbox/ui/pom.xml
trunk/ui/combobox/pom.xml
trunk/ui/pickList/pom.xml
trunk/ui/pom.xml
Log:
comboBox & pickList moved to main build
Copied: trunk/samples/combobox-sample (from rev 5842,
trunk/sandbox/samples/combobox-sample)
Modified: trunk/samples/combobox-sample/pom.xml
===================================================================
--- trunk/sandbox/samples/combobox-sample/pom.xml 2008-02-05 19:08:52 UTC (rev 5842)
+++ trunk/samples/combobox-sample/pom.xml 2008-02-05 23:30:23 UTC (rev 5844)
@@ -1,7 +1,7 @@
<?xml version="1.0"?><project>
<parent>
<artifactId>samples</artifactId>
- <groupId>org.richfaces.sandbox</groupId>
+ <groupId>org.richfaces</groupId>
<version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -57,7 +57,7 @@
</dependency>
<dependency>
- <groupId>org.richfaces.sandbox.ui</groupId>
+ <groupId>org.richfaces.ui</groupId>
<artifactId>combobox</artifactId>
<version>3.2.0-SNAPSHOT</version>
</dependency>
Modified: trunk/samples/combobox-sample/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/sandbox/samples/combobox-sample/src/main/webapp/pages/index.jsp 2008-02-05
19:08:52 UTC (rev 5842)
+++ trunk/samples/combobox-sample/src/main/webapp/pages/index.jsp 2008-02-05 23:30:23 UTC
(rev 5844)
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/ui/combobox"
prefix="cmb"%>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/combobox"
prefix="cmb"%>
<html>
<head>
<title></title>
Modified: trunk/samples/combobox-sample/src/main/webapp/pages/index.xhtml
===================================================================
--- trunk/sandbox/samples/combobox-sample/src/main/webapp/pages/index.xhtml 2008-02-05
19:08:52 UTC (rev 5842)
+++ trunk/samples/combobox-sample/src/main/webapp/pages/index.xhtml 2008-02-05 23:30:23
UTC (rev 5844)
@@ -4,7 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:cmb="http://labs.jboss.com/jbossrichfaces/ui/ui/combobox"...
+ xmlns:cmb="http://labs.jboss.com/jbossrichfaces/ui/combobox">
<head>
<title></title>
Copied: trunk/samples/pickList-sample (from rev 5842,
trunk/sandbox/samples/pickList-sample)
Modified: trunk/samples/pickList-sample/pom.xml
===================================================================
--- trunk/sandbox/samples/pickList-sample/pom.xml 2008-02-05 19:08:52 UTC (rev 5842)
+++ trunk/samples/pickList-sample/pom.xml 2008-02-05 23:30:23 UTC (rev 5844)
@@ -1,7 +1,7 @@
<?xml version="1.0"?><project>
<parent>
<artifactId>samples</artifactId>
- <groupId>org.richfaces.sandbox</groupId>
+ <groupId>org.richfaces</groupId>
<version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -55,7 +55,7 @@
</dependency>
<dependency>
- <groupId>org.richfaces.sandbox.ui</groupId>
+ <groupId>org.richfaces.ui</groupId>
<artifactId>pickList</artifactId>
<version>3.2.0-SNAPSHOT</version>
</dependency>
Modified: trunk/samples/pickList-sample/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/sandbox/samples/pickList-sample/src/main/webapp/pages/index.jsp 2008-02-05
19:08:52 UTC (rev 5842)
+++ trunk/samples/pickList-sample/src/main/webapp/pages/index.jsp 2008-02-05 23:30:23 UTC
(rev 5844)
@@ -1,6 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/ui/pickList"
prefix="pickList"%>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/pickList"
prefix="pickList"%>
<html>
<head>
<title></title>
Modified: trunk/samples/pom.xml
===================================================================
--- trunk/samples/pom.xml 2008-02-05 23:30:22 UTC (rev 5843)
+++ trunk/samples/pom.xml 2008-02-05 23:30:23 UTC (rev 5844)
@@ -460,5 +460,9 @@
<module>orderingListDemo</module>
<module>listShuttleDemo</module>
<module>columnsDemo</module>
+
+ <module>combobox-sample</module>
+ <module>pickList-sample</module>
+
</modules>
</project>
\ No newline at end of file
Modified: trunk/sandbox/samples/pom.xml
===================================================================
--- trunk/sandbox/samples/pom.xml 2008-02-05 23:30:22 UTC (rev 5843)
+++ trunk/sandbox/samples/pom.xml 2008-02-05 23:30:23 UTC (rev 5844)
@@ -18,9 +18,7 @@
<!--module>contextMenuDemo</module-->
<module>fileUploadPOC</module>
<module>fileUploadDemo</module>
- <module>combobox-sample</module>
<module>progressBarDemo</module>
- <module>pickList-sample</module>
<module>sortingFilteringDemo</module>
</modules>
</project>
\ No newline at end of file
Modified: trunk/sandbox/ui/pom.xml
===================================================================
--- trunk/sandbox/ui/pom.xml 2008-02-05 23:30:22 UTC (rev 5843)
+++ trunk/sandbox/ui/pom.xml 2008-02-05 23:30:23 UTC (rev 5844)
@@ -20,8 +20,6 @@
<!--module>rex-button</module-->
<module>sortableHeader</module>
<module>fileUpload</module>
- <module>combobox</module>
<module>progressBAR</module>
- <module>pickList</module>
</modules>
</project>
\ No newline at end of file
Copied: trunk/ui/combobox (from rev 5842, trunk/sandbox/ui/combobox)
Modified: trunk/ui/combobox/pom.xml
===================================================================
--- trunk/sandbox/ui/combobox/pom.xml 2008-02-05 19:08:52 UTC (rev 5842)
+++ trunk/ui/combobox/pom.xml 2008-02-05 23:30:23 UTC (rev 5844)
@@ -1,11 +1,11 @@
<?xml version="1.0"?><project>
<parent>
<artifactId>ui</artifactId>
- <groupId>org.richfaces.sandbox</groupId>
+ <groupId>org.richfaces</groupId>
<version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.sandbox.ui</groupId>
+ <groupId>org.richfaces.ui</groupId>
<artifactId>combobox</artifactId>
<name>combobox</name>
<version>3.2.0-SNAPSHOT</version>
@@ -25,7 +25,7 @@
</executions>
<configuration>
<library>
- <prefix>org.richfaces.sandbox.ui</prefix>
+ <prefix>org.richfaces.ui</prefix>
<taglib>
<shortName>combobox</shortName>
</taglib>
Copied: trunk/ui/pickList (from rev 5842, trunk/sandbox/ui/pickList)
Modified: trunk/ui/pickList/pom.xml
===================================================================
--- trunk/sandbox/ui/pickList/pom.xml 2008-02-05 19:08:52 UTC (rev 5842)
+++ trunk/ui/pickList/pom.xml 2008-02-05 23:30:23 UTC (rev 5844)
@@ -1,11 +1,11 @@
<?xml version="1.0"?><project>
<parent>
<artifactId>ui</artifactId>
- <groupId>org.richfaces.sandbox</groupId>
+ <groupId>org.richfaces</groupId>
<version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.sandbox.ui</groupId>
+ <groupId>org.richfaces.ui</groupId>
<artifactId>pickList</artifactId>
<name>pickList</name>
<version>3.2.0-SNAPSHOT</version>
Modified: trunk/ui/pom.xml
===================================================================
--- trunk/ui/pom.xml 2008-02-05 23:30:22 UTC (rev 5843)
+++ trunk/ui/pom.xml 2008-02-05 23:30:23 UTC (rev 5844)
@@ -104,6 +104,8 @@
<module>listShuttle</module>
<module>contextMenu</module>
<module>columns</module>
+ <module>combobox</module>
+ <module>pickList</module>
</modules>
<dependencies>
<dependency>