9:53 p.m.
Author: nbelaevski
Date: 2008-03-02 22:53:57 -0500 (Sun, 02 Mar 2008)
New Revision: 6478
Added:
trunk/samples/inplaceInput-sample/
trunk/samples/inplaceSelect-sample/
trunk/samples/sortingFilteringDemo/
trunk/ui/fileUpload/
trunk/ui/inplaceInput/
trunk/ui/inplaceSelect/
Removed:
trunk/sandbox/samples/fileUploadDemo/
trunk/sandbox/samples/inplaceInput-sample/
trunk/sandbox/samples/inplaceSelect-sample/
trunk/sandbox/samples/sortingFilteringDemo/
trunk/sandbox/ui/fileUpload/
trunk/sandbox/ui/inplaceInput/
trunk/sandbox/ui/inplaceSelect/
Modified:
trunk/samples/inplaceInput-sample/pom.xml
trunk/samples/inplaceInput-sample/src/main/webapp/pages/index.jsp
trunk/samples/inplaceInput-sample/src/main/webapp/pages/index.xhtml
trunk/samples/inplaceSelect-sample/pom.xml
trunk/samples/inplaceSelect-sample/src/main/webapp/pages/index.jsp
trunk/samples/inplaceSelect-sample/src/main/webapp/pages/index.xhtml
trunk/samples/pom.xml
trunk/samples/sortingFilteringDemo/pom.xml
trunk/sandbox/samples/pom.xml
trunk/sandbox/ui/pom.xml
trunk/ui/fileUpload/pom.xml
trunk/ui/inplaceInput/pom.xml
trunk/ui/inplaceSelect/pom.xml
trunk/ui/pom.xml
Log:
fileUpload, inplaceInput, inplaceSelect components & demos; data table sorting &
filtering demo moved to main build
Copied: trunk/samples/inplaceInput-sample (from rev 6477,
trunk/sandbox/samples/inplaceInput-sample)
Modified: trunk/samples/inplaceInput-sample/pom.xml
===================================================================
--- trunk/sandbox/samples/inplaceInput-sample/pom.xml 2008-03-03 01:41:29 UTC (rev 6477)
+++ trunk/samples/inplaceInput-sample/pom.xml 2008-03-03 03:53:57 UTC (rev 6478)
@@ -1,11 +1,11 @@
<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.sandbox</groupId>
+ <groupId>org.richfaces</groupId>
<version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces</groupId>
+ <groupId>org.richfaces.samples</groupId>
<artifactId>inplaceInput-sample</artifactId>
<packaging>war</packaging>
<name>webapp Maven Webapp</name>
@@ -14,7 +14,7 @@
</build>
<dependencies>
<dependency>
- <groupId>org.richfaces.sandbox.ui</groupId>
+ <groupId>org.richfaces.ui</groupId>
<artifactId>inplaceInput</artifactId>
<version>3.2.0-SNAPSHOT</version>
</dependency>
Modified: trunk/samples/inplaceInput-sample/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/sandbox/samples/inplaceInput-sample/src/main/webapp/pages/index.jsp 2008-03-03
01:41:29 UTC (rev 6477)
+++ trunk/samples/inplaceInput-sample/src/main/webapp/pages/index.jsp 2008-03-03 03:53:57
UTC (rev 6478)
@@ -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/inplaceInput"
prefix="ii"%>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/inplaceInput"
prefix="ii"%>
<html>
<head>
<title></title>
Modified: trunk/samples/inplaceInput-sample/src/main/webapp/pages/index.xhtml
===================================================================
--- trunk/sandbox/samples/inplaceInput-sample/src/main/webapp/pages/index.xhtml 2008-03-03
01:41:29 UTC (rev 6477)
+++ trunk/samples/inplaceInput-sample/src/main/webapp/pages/index.xhtml 2008-03-03
03:53:57 UTC (rev 6478)
@@ -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:ii="http://labs.jboss.com/jbossrichfaces/ui/ui/inplaceInput&qu...
+ xmlns:ii="http://labs.jboss.com/jbossrichfaces/ui/inplaceInput"...
<head>
<title></title>
Copied: trunk/samples/inplaceSelect-sample (from rev 6477,
trunk/sandbox/samples/inplaceSelect-sample)
Modified: trunk/samples/inplaceSelect-sample/pom.xml
===================================================================
--- trunk/sandbox/samples/inplaceSelect-sample/pom.xml 2008-03-03 01:41:29 UTC (rev 6477)
+++ trunk/samples/inplaceSelect-sample/pom.xml 2008-03-03 03:53:57 UTC (rev 6478)
@@ -1,46 +1,17 @@
<?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>
- <groupId>org.richfaces</groupId>
+ <groupId>org.richfaces.samples</groupId>
<artifactId>inplaceSelect-sample</artifactId>
<packaging>war</packaging>
<name>JSF Maven Webapp</name>
- <version>3.2.0-SNAPSHOT</version>
<build>
<finalName>inplaceSelect-sample</finalName>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.1</version>
- <configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- <connectors>
- <connector
implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>8080</port>
- <maxIdleTime>60000</maxIdleTime>
- </connector>
- </connectors>
- </configuration>
- </plugin>
- </plugins>
</build>
- <pluginRepositories>
- <pluginRepository>
- <id>mortbay-repo</id>
- <name>mortbay-repo</name>
- <url>http://www.mortbay.org/maven2/snapshot</url>
- </pluginRepository>
- <pluginRepository>
- <id>repository.jboss.com</id>
- <name>Jboss Repository for Maven Artifacts</name>
- <url>http://repository.jboss.com/maven2</url>
- </pluginRepository>
- </pluginRepositories>
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -54,7 +25,7 @@
<version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.richfaces.sandbox.ui</groupId>
+ <groupId>org.richfaces.ui</groupId>
<artifactId>inplaceSelect</artifactId>
<version>3.2.0-SNAPSHOT</version>
</dependency>
Modified: trunk/samples/inplaceSelect-sample/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/sandbox/samples/inplaceSelect-sample/src/main/webapp/pages/index.jsp 2008-03-03
01:41:29 UTC (rev 6477)
+++ trunk/samples/inplaceSelect-sample/src/main/webapp/pages/index.jsp 2008-03-03 03:53:57
UTC (rev 6478)
@@ -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/inplaceSelect"
prefix="is"%>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/inplaceSelect"
prefix="is"%>
<html>
<head>
<title></title>
Modified: trunk/samples/inplaceSelect-sample/src/main/webapp/pages/index.xhtml
===================================================================
---
trunk/sandbox/samples/inplaceSelect-sample/src/main/webapp/pages/index.xhtml 2008-03-03
01:41:29 UTC (rev 6477)
+++ trunk/samples/inplaceSelect-sample/src/main/webapp/pages/index.xhtml 2008-03-03
03:53:57 UTC (rev 6478)
@@ -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:is="http://labs.jboss.com/jbossrichfaces/ui/ui/inplaceSelect&q...
+ xmlns:is="http://labs.jboss.com/jbossrichfaces/ui/inplaceSelect"...
<head>
Modified: trunk/samples/pom.xml
===================================================================
--- trunk/samples/pom.xml 2008-03-03 01:41:29 UTC (rev 6477)
+++ trunk/samples/pom.xml 2008-03-03 03:53:57 UTC (rev 6478)
@@ -464,6 +464,10 @@
<module>pickList-sample</module>
<module>progressBarDemo</module>
<module>jira-data</module>
- <module>stdcomponents-sample</module>
+ <module>stdcomponents-sample</module>
+ <module>fileUploadDemo</module>
+ <module>sortingFilteringDemo</module>
+ <module>inplaceInput-sample</module>
+ <module>inplaceSelect-sample</module>
</modules>
</project>
\ No newline at end of file
Copied: trunk/samples/sortingFilteringDemo (from rev 6477,
trunk/sandbox/samples/sortingFilteringDemo)
Modified: trunk/samples/sortingFilteringDemo/pom.xml
===================================================================
--- trunk/sandbox/samples/sortingFilteringDemo/pom.xml 2008-03-03 01:41:29 UTC (rev 6477)
+++ trunk/samples/sortingFilteringDemo/pom.xml 2008-03-03 03:53:57 UTC (rev 6478)
@@ -2,24 +2,24 @@
<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>
- <groupId>org.richfaces.sandbox</groupId>
+ <groupId>org.richfaces.samples</groupId>
<artifactId>sortingFilteringDemo</artifactId>
<packaging>war</packaging>
<name>sortingFilteringDemo Maven Webapp</name>
- <version>3.2.0-SNAPSHOT</version>
<build>
<finalName>sortingFilteringDemo</finalName>
</build>
<dependencies>
- <dependency>
- <groupId>org.richfaces.sandbox.ui</groupId>
+ <!--dependency>
+ <groupId>org.richfaces.ui</groupId>
<artifactId>sortableHeader</artifactId>
<version>3.2.0-SNAPSHOT</version>
- </dependency>
+ </dependency-->
+
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>core</artifactId>
@@ -41,7 +41,7 @@
<version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.richfaces.sandbox.ui</groupId>
+ <groupId>org.richfaces.ui</groupId>
<artifactId>inplaceInput</artifactId>
<version>3.2.0-SNAPSHOT</version>
</dependency>
Modified: trunk/sandbox/samples/pom.xml
===================================================================
--- trunk/sandbox/samples/pom.xml 2008-03-03 01:41:29 UTC (rev 6477)
+++ trunk/sandbox/samples/pom.xml 2008-03-03 03:53:57 UTC (rev 6478)
@@ -17,9 +17,5 @@
<module>simpleTogglePanel2-sample</module>
<!--module>contextMenuDemo</module-->
<module>fileUploadPOC</module>
- <module>fileUploadDemo</module>
- <module>sortingFilteringDemo</module>
- <module>inplaceInput-sample</module>
- <module>inplaceSelect-sample</module>
</modules>
</project>
\ No newline at end of file
Modified: trunk/sandbox/ui/pom.xml
===================================================================
--- trunk/sandbox/ui/pom.xml 2008-03-03 01:41:29 UTC (rev 6477)
+++ trunk/sandbox/ui/pom.xml 2008-03-03 03:53:57 UTC (rev 6478)
@@ -19,8 +19,5 @@
<module>rex-messageBox</module>
<!--module>rex-button</module-->
<module>sortableHeader</module>
- <module>fileUpload</module>
- <module>inplaceInput</module>
- <module>inplaceSelect</module>
</modules>
</project>
\ No newline at end of file
Copied: trunk/ui/fileUpload (from rev 6477, trunk/sandbox/ui/fileUpload)
Modified: trunk/ui/fileUpload/pom.xml
===================================================================
--- trunk/sandbox/ui/fileUpload/pom.xml 2008-03-03 01:41:29 UTC (rev 6477)
+++ trunk/ui/fileUpload/pom.xml 2008-03-03 03:53:57 UTC (rev 6478)
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?><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>fileUpload</artifactId>
<name>fileUpload</name>
<version>3.2.0-SNAPSHOT</version>
Copied: trunk/ui/inplaceInput (from rev 6477, trunk/sandbox/ui/inplaceInput)
Modified: trunk/ui/inplaceInput/pom.xml
===================================================================
--- trunk/sandbox/ui/inplaceInput/pom.xml 2008-03-03 01:41:29 UTC (rev 6477)
+++ trunk/ui/inplaceInput/pom.xml 2008-03-03 03:53:57 UTC (rev 6478)
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?><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>inplaceInput</artifactId>
<name>inplaceInput</name>
<version>3.2.0-SNAPSHOT</version>
@@ -32,7 +32,7 @@
</executions>
<configuration>
<library>
- <prefix>org.richfaces.sandbox.ui</prefix>
+ <prefix>org.richfaces.ui</prefix>
<taglib>
<shortName>inplaceInput</shortName>
</taglib>
Copied: trunk/ui/inplaceSelect (from rev 6477, trunk/sandbox/ui/inplaceSelect)
Modified: trunk/ui/inplaceSelect/pom.xml
===================================================================
--- trunk/sandbox/ui/inplaceSelect/pom.xml 2008-03-03 01:41:29 UTC (rev 6477)
+++ trunk/ui/inplaceSelect/pom.xml 2008-03-03 03:53:57 UTC (rev 6478)
@@ -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>inplaceSelect</artifactId>
<name>inplaceSelect</name>
<version>3.2.0-SNAPSHOT</version>
@@ -64,7 +64,7 @@
<version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.richfaces.sandbox.ui</groupId>
+ <groupId>org.richfaces.ui</groupId>
<artifactId>inplaceInput</artifactId>
<version>3.2.0-SNAPSHOT</version>
</dependency>
Modified: trunk/ui/pom.xml
===================================================================
--- trunk/ui/pom.xml 2008-03-03 01:41:29 UTC (rev 6477)
+++ trunk/ui/pom.xml 2008-03-03 03:53:57 UTC (rev 6478)
@@ -105,6 +105,9 @@
<module>combobox</module>
<module>pickList</module>
<module>progressBAR</module>
+ <module>fileUpload</module>
+ <module>inplaceInput</module>
+ <module>inplaceSelect</module>
</modules>
<dependencies>
<dependency>
@@ -161,4 +164,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>