12:46 p.m.
Author: nbelaevski
Date: 2007-12-20 13:46:05 -0500 (Thu, 20 Dec 2007)
New Revision: 4942
Added:
trunk/samples/columnsDemo/
trunk/ui/columns/
Removed:
trunk/sandbox/samples/columnsDemo/
trunk/sandbox/ui/columns/
Modified:
trunk/samples/columnsDemo/pom.xml
trunk/samples/columnsDemo/src/main/webapp/pages/index.jsp
trunk/samples/columnsDemo/src/main/webapp/pages/index.xhtml
trunk/samples/pom.xml
trunk/ui/columns/pom.xml
trunk/ui/columns/src/test/java/org/richfaces/facelet/mock/MockHttpServletRequest.java
trunk/ui/columns/src/test/java/org/richfaces/facelet/mock/MockServletContext.java
trunk/ui/pom.xml
Log:
columns & columnsDemo moved from sandbox
Copied: trunk/samples/columnsDemo (from rev 4937, trunk/sandbox/samples/columnsDemo)
Modified: trunk/samples/columnsDemo/pom.xml
===================================================================
--- trunk/sandbox/samples/columnsDemo/pom.xml 2007-12-20 14:02:35 UTC (rev 4937)
+++ trunk/samples/columnsDemo/pom.xml 2007-12-20 18:46:05 UTC (rev 4942)
@@ -1,48 +1,37 @@
<?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.sandbox.samples</groupId>
+ <groupId>org.richfaces.samples</groupId>
<artifactId>columnsDemo</artifactId>
<packaging>war</packaging>
<name>columnsDemo Maven Webapp</name>
- <version>3.2.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>org.richfaces.sandbox.ui</groupId>
+ <groupId>org.richfaces.ui</groupId>
<artifactId>columns</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>core</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>dataTable</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
<build>
<finalName>columnsDemo</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>
+ </build>
</project>
\ No newline at end of file
Modified: trunk/samples/columnsDemo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/sandbox/samples/columnsDemo/src/main/webapp/pages/index.jsp 2007-12-20 14:02:35
UTC (rev 4937)
+++ trunk/samples/columnsDemo/src/main/webapp/pages/index.jsp 2007-12-20 18:46:05 UTC (rev
4942)
@@ -2,7 +2,7 @@
<%@ 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/dataTable"
prefix="dt"%>
-<%@ taglib prefix="columns"
uri="http://labs.jboss.com/jbossrichfaces/ui/ui/columns" %>
+<%@ taglib prefix="columns"
uri="http://labs.jboss.com/jbossrichfaces/ui/columns" %>
Modified: trunk/samples/columnsDemo/src/main/webapp/pages/index.xhtml
===================================================================
--- trunk/sandbox/samples/columnsDemo/src/main/webapp/pages/index.xhtml 2007-12-20
14:02:35 UTC (rev 4937)
+++ trunk/samples/columnsDemo/src/main/webapp/pages/index.xhtml 2007-12-20 18:46:05 UTC
(rev 4942)
@@ -6,7 +6,7 @@
xmlns:a4j="http://richfaces.org/a4j"
xmlns:jstl="http://java.sun.com/jstl/core"
xmlns:dt="http://labs.jboss.com/jbossrichfaces/ui/dataTable"
- xmlns:columns="http://labs.jboss.com/jbossrichfaces/ui/ui/columns&qu...
+ xmlns:columns="http://labs.jboss.com/jbossrichfaces/ui/columns"...
<f:view>
XHTML
<h:form>
Modified: trunk/samples/pom.xml
===================================================================
--- trunk/samples/pom.xml 2007-12-20 18:03:41 UTC (rev 4941)
+++ trunk/samples/pom.xml 2007-12-20 18:46:05 UTC (rev 4942)
@@ -460,5 +460,6 @@
<module>contextMenuDemo</module>
<module>orderingListDemo</module>
<module>listShuttleDemo</module>
+ <module>columnsDemo</module>
</modules>
</project>
\ No newline at end of file
Copied: trunk/ui/columns (from rev 4937, trunk/sandbox/ui/columns)
Modified: trunk/ui/columns/pom.xml
===================================================================
--- trunk/sandbox/ui/columns/pom.xml 2007-12-20 14:02:35 UTC (rev 4937)
+++ trunk/ui/columns/pom.xml 2007-12-20 18:46:05 UTC (rev 4942)
@@ -1,20 +1,19 @@
<?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>columns</artifactId>
<name>columns</name>
- <version>3.2.0-SNAPSHOT</version>
<build>
<plugins>
<plugin>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -25,7 +24,7 @@
</executions>
<configuration>
<library>
- <prefix>org.richfaces.sandbox.ui</prefix>
+ <prefix>org.richfaces.ui</prefix>
<taglib>
<shortName>columns</shortName>
</taglib>
@@ -44,12 +43,12 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>dataTable</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified:
trunk/ui/columns/src/test/java/org/richfaces/facelet/mock/MockHttpServletRequest.java
===================================================================
---
trunk/sandbox/ui/columns/src/test/java/org/richfaces/facelet/mock/MockHttpServletRequest.java 2007-12-20
14:02:35 UTC (rev 4937)
+++
trunk/ui/columns/src/test/java/org/richfaces/facelet/mock/MockHttpServletRequest.java 2007-12-20
18:46:05 UTC (rev 4942)
@@ -41,8 +41,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import org.ajax4jsf.tests.facelet.mock.MockHttpSession;
-import org.ajax4jsf.tests.facelet.mock.MockServletInputStream;
/**
*
Modified:
trunk/ui/columns/src/test/java/org/richfaces/facelet/mock/MockServletContext.java
===================================================================
---
trunk/sandbox/ui/columns/src/test/java/org/richfaces/facelet/mock/MockServletContext.java 2007-12-20
14:02:35 UTC (rev 4937)
+++
trunk/ui/columns/src/test/java/org/richfaces/facelet/mock/MockServletContext.java 2007-12-20
18:46:05 UTC (rev 4942)
@@ -35,8 +35,6 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import org.ajax4jsf.tests.facelet.mock.MockRequestDispatcher;
-
/**
*
* @author Jacob Hookom
Modified: trunk/ui/pom.xml
===================================================================
--- trunk/ui/pom.xml 2007-12-20 18:03:41 UTC (rev 4941)
+++ trunk/ui/pom.xml 2007-12-20 18:46:05 UTC (rev 4942)
@@ -103,6 +103,7 @@
<module>orderingList</module>
<module>listShuttle</module>
<module>contextMenu</module>
+ <module>columns</module>
</modules>
<dependencies>
<dependency>