[richfaces-svn-commits] JBoss Rich Faces SVN: r4908 - in trunk: framework/api/src/main/java/org/ajax4jsf and 17 other directories.

richfaces-svn-commits at lists.jboss.org richfaces-svn-commits at lists.jboss.org
Tue Dec 18 19:43:19 EST 2007


Author: nbelaevski
Date: 2007-12-18 19:43:18 -0500 (Tue, 18 Dec 2007)
New Revision: 4908

Added:
   trunk/samples/contextMenuDemo/
   trunk/samples/contextMenuDemo/pom.xml
   trunk/samples/contextMenuDemo/src/
   trunk/samples/listShuttleDemo/
   trunk/samples/listShuttleDemo/pom.xml
   trunk/samples/listShuttleDemo/src/
   trunk/samples/orderingListDemo/
   trunk/samples/orderingListDemo/pom.xml
   trunk/samples/orderingListDemo/src/
   trunk/ui/componentControl/
   trunk/ui/componentControl/pom.xml
   trunk/ui/componentControl/src/
   trunk/ui/contextMenu/
   trunk/ui/contextMenu/pom.xml
   trunk/ui/contextMenu/src/
   trunk/ui/listShuttle/
   trunk/ui/listShuttle/design/
   trunk/ui/listShuttle/pom.xml
   trunk/ui/listShuttle/src/
   trunk/ui/orderingList/
   trunk/ui/orderingList/design/
   trunk/ui/orderingList/pom.xml
   trunk/ui/orderingList/src/
Removed:
   trunk/samples/contextMenuDemo/pom.xml
   trunk/samples/contextMenuDemo/src/
   trunk/samples/listShuttleDemo/pom.xml
   trunk/samples/listShuttleDemo/src/
   trunk/samples/orderingListDemo/pom.xml
   trunk/samples/orderingListDemo/src/
   trunk/ui/componentControl/pom.xml
   trunk/ui/componentControl/src/
   trunk/ui/contextMenu/pom.xml
   trunk/ui/contextMenu/src/
   trunk/ui/listShuttle/design/
   trunk/ui/listShuttle/pom.xml
   trunk/ui/listShuttle/src/
   trunk/ui/orderingList/design/
   trunk/ui/orderingList/pom.xml
   trunk/ui/orderingList/src/
Modified:
   trunk/cdk/maven-javascript-plugin/
   trunk/framework/api/src/main/java/org/ajax4jsf/Messages.java
   trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java
   trunk/framework/impl/src/main/java/org/richfaces/component/util/HtmlUtil.java
   trunk/samples/pom.xml
   trunk/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java
   trunk/ui/contextMenu/src/main/config/component/contextMenu.xml
   trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java
   trunk/ui/listShuttle/src/main/config/component/listShuttle.xml
   trunk/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java
   trunk/ui/orderingList/src/main/config/component/orderinglist.xml
   trunk/ui/pom.xml
Log:
3.1.3 release components moved into trunk


Property changes on: trunk/cdk/maven-javascript-plugin
___________________________________________________________________
Name: svn:ignore
   + target


Modified: trunk/framework/api/src/main/java/org/ajax4jsf/Messages.java
===================================================================
--- trunk/framework/api/src/main/java/org/ajax4jsf/Messages.java	2007-12-18 21:46:01 UTC (rev 4907)
+++ trunk/framework/api/src/main/java/org/ajax4jsf/Messages.java	2007-12-19 00:43:18 UTC (rev 4908)
@@ -320,6 +320,7 @@
 	public static final String UTF_CONVERSION_ERROR = "UTF_CONVERSION_ERROR";
 	public static final String READ_ONLY_NODE_ERROR = "READ_ONLY_NODE_ERROR";
 	public static final String NOT_PARENT_AJAX_COMPONENT_ERROR = "NOT_PARENT_AJAX_COMPONENT_ERROR";
+	public static final String INVALID_VALUE = "INVALID_VALUE";
 	
 	public static void main(String[] args) {
 		String m = getMessage(INVALID_ATTRIBUTE_VALUE, "A", "B");

Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java	2007-12-18 21:46:01 UTC (rev 4907)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java	2007-12-19 00:43:18 UTC (rev 4908)
@@ -822,6 +822,12 @@
 		writer.endElement(HTML.SCRIPT_ELEM);
 	}
 
+
+	public UIComponent findComponentFor(FacesContext context,
+		UIComponent component, String id) {
+	    	return findComponentFor(component,id);
+	}
+
 	/**
 	 * @param component
 	 * @param id

Modified: trunk/framework/impl/src/main/java/org/richfaces/component/util/HtmlUtil.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/component/util/HtmlUtil.java	2007-12-18 21:46:01 UTC (rev 4907)
+++ trunk/framework/impl/src/main/java/org/richfaces/component/util/HtmlUtil.java	2007-12-19 00:43:18 UTC (rev 4908)
@@ -65,14 +65,37 @@
 
 		while (matcher.find()) {
 			// make new id selector here using matcher.group(1)
-			UIComponent target = RendererUtils.getInstance().findComponentFor(component, matcher.group(1));
+			String unescaped = matcher.group(1).replaceAll("\\\\:", ":");
+			UIComponent target = RendererUtils.getInstance().findComponentFor(context, component, unescaped);
 
 			if (target != null) {
 				matcher.appendReplacement(sb, "#"
-						+ target.getClientId(context).replaceAll(":", "\\\\\\\\\\\\\\\\:"));
+						+ target.getClientId(context).replaceAll(":",
+								"\\\\\\\\\\\\\\\\:"));
 			}
 		}
 		matcher.appendTail(sb);
 		return sb.toString();
 	}
+	
+	public static String idsToIdSelector(String ids) {
+		StringBuffer buffer = new StringBuffer();
+		if (ids != null) {
+			String[] idString = ids.split("\\s*,\\s*");
+			
+			for(int i = 0; i < idString.length; i++) {
+				if (i > 0) {
+					buffer.append(",");
+				}
+				idString[i] = idString[i].replaceAll(":", "\\\\:");
+				buffer
+					.append("#")
+					.append(idString[i]);
+			}
+		}
+		return buffer.toString();
+	}
+	
+	
+	
 }

Copied: trunk/samples/contextMenuDemo (from rev 4905, branches/3.1.x/samples/contextMenuDemo)

Deleted: trunk/samples/contextMenuDemo/pom.xml
===================================================================
--- branches/3.1.x/samples/contextMenuDemo/pom.xml	2007-12-18 19:40:59 UTC (rev 4905)
+++ trunk/samples/contextMenuDemo/pom.xml	2007-12-19 00:43:18 UTC (rev 4908)
@@ -1,58 +0,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>samples</artifactId>
-    <groupId>org.richfaces</groupId>
-    <version>3.1.4-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.richfaces.samples</groupId>
-  <artifactId>contextMenuDemo</artifactId>
-  <packaging>war</packaging>
-  <name>contextMenuDemo Maven Webapp</name>
-  <version>3.1.4-SNAPSHOT</version>
-	<dependencies>
-		<dependency>
-			<groupId>org.richfaces.samples</groupId>
-			<artifactId>skins</artifactId>
-			<version>3.1.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.richfaces.ui</groupId>
-			<artifactId>core</artifactId>
-			<version>3.1.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.richfaces.ui</groupId>
-			<artifactId>dataTable</artifactId>
-			<version>3.1.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.richfaces.ui</groupId>
-			<artifactId>contextMenu</artifactId>
-			<version>3.1.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.richfaces.ui</groupId>
-			<artifactId>componentControl</artifactId>
-			<version>3.1.4-SNAPSHOT</version>
-		</dependency>
-        	<dependency>
-            		<groupId>org.richfaces.ui</groupId>
-            		<artifactId>menu-components</artifactId>
-            		<version>3.1.4-SNAPSHOT</version>
-        	</dependency>
-	</dependencies>
-  <build>
-    <finalName>contextMenuDemo</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

Copied: trunk/samples/contextMenuDemo/pom.xml (from rev 4906, branches/3.1.x/samples/contextMenuDemo/pom.xml)
===================================================================
--- trunk/samples/contextMenuDemo/pom.xml	                        (rev 0)
+++ trunk/samples/contextMenuDemo/pom.xml	2007-12-19 00:43:18 UTC (rev 4908)
@@ -0,0 +1,58 @@
+<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.2.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.richfaces.samples</groupId>
+  <artifactId>contextMenuDemo</artifactId>
+  <packaging>war</packaging>
+  <name>contextMenuDemo Maven Webapp</name>
+  <version>3.2.0-SNAPSHOT</version>
+	<dependencies>
+		<dependency>
+			<groupId>org.richfaces.samples</groupId>
+			<artifactId>skins</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.richfaces.ui</groupId>
+			<artifactId>core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.richfaces.ui</groupId>
+			<artifactId>dataTable</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.richfaces.ui</groupId>
+			<artifactId>contextMenu</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.richfaces.ui</groupId>
+			<artifactId>componentControl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+        	<dependency>
+            		<groupId>org.richfaces.ui</groupId>
+            		<artifactId>menu-components</artifactId>
+            		<version>${project.version}</version>
+        	</dependency>
+	</dependencies>
+  <build>
+    <finalName>contextMenuDemo</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

Copied: trunk/samples/contextMenuDemo/src (from rev 4906, branches/3.1.x/samples/contextMenuDemo/src)

Copied: trunk/samples/listShuttleDemo (from rev 4905, branches/3.1.x/samples/listShuttleDemo)

Deleted: trunk/samples/listShuttleDemo/pom.xml
===================================================================
--- branches/3.1.x/samples/listShuttleDemo/pom.xml	2007-12-18 19:40:59 UTC (rev 4905)
+++ trunk/samples/listShuttleDemo/pom.xml	2007-12-19 00:43:18 UTC (rev 4908)
@@ -1,27 +0,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>samples</artifactId>
-    <groupId>org.richfaces</groupId>
-    <version>3.1.4-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.richfaces.samples</groupId>
-  <artifactId>listShuttleDemo</artifactId>
-  <packaging>war</packaging>
-  <name>listShuttleDemo Maven Webapp</name>
-  <build>
-    <finalName>listShuttleDemo</finalName>
-  </build>
-	<dependencies>
-		<dependency>
-			<groupId>org.richfaces.ui</groupId>
-			<artifactId>listShuttle</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-  		<dependency>
-			<groupId>org.richfaces.samples</groupId>
-	    	<artifactId>skins</artifactId>
-      		<version>${project.version}</version>
-  		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file

Copied: trunk/samples/listShuttleDemo/pom.xml (from rev 4906, branches/3.1.x/samples/listShuttleDemo/pom.xml)
===================================================================
--- trunk/samples/listShuttleDemo/pom.xml	                        (rev 0)
+++ trunk/samples/listShuttleDemo/pom.xml	2007-12-19 00:43:18 UTC (rev 4908)
@@ -0,0 +1,27 @@
+<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.2.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.richfaces.samples</groupId>
+  <artifactId>listShuttleDemo</artifactId>
+  <packaging>war</packaging>
+  <name>listShuttleDemo Maven Webapp</name>
+  <build>
+    <finalName>listShuttleDemo</finalName>
+  </build>
+	<dependencies>
+		<dependency>
+			<groupId>org.richfaces.ui</groupId>
+			<artifactId>listShuttle</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+  		<dependency>
+			<groupId>org.richfaces.samples</groupId>
+	    	<artifactId>skins</artifactId>
+      		<version>${project.version}</version>
+  		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file

Copied: trunk/samples/listShuttleDemo/src (from rev 4906, branches/3.1.x/samples/listShuttleDemo/src)

Copied: trunk/samples/orderingListDemo (from rev 4905, branches/3.1.x/samples/orderingListDemo)

Deleted: trunk/samples/orderingListDemo/pom.xml
===================================================================
--- branches/3.1.x/samples/orderingListDemo/pom.xml	2007-12-18 19:40:59 UTC (rev 4905)
+++ trunk/samples/orderingListDemo/pom.xml	2007-12-19 00:43:18 UTC (rev 4908)
@@ -1,27 +0,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>samples</artifactId>
-    <groupId>org.richfaces</groupId>
-    <version>3.1.4-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.richfaces.samples</groupId>
-  <artifactId>orderingListDemo</artifactId>
-  <packaging>war</packaging>
-  <name>orderingListDemo Maven Webapp</name>
-  <build>
-    <finalName>orderingListDemo</finalName>
-  </build>
-	<dependencies>
-		<dependency>
-			<groupId>org.richfaces.ui</groupId>
-			<artifactId>orderingList</artifactId>
-			<version>3.1.4-SNAPSHOT</version>
-		</dependency>
-  		<dependency>
-			<groupId>org.richfaces.samples</groupId>
-	    		<artifactId>skins</artifactId>
-      			<version>3.1.4-SNAPSHOT</version>
-  		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file

Copied: trunk/samples/orderingListDemo/pom.xml (from rev 4906, branches/3.1.x/samples/orderingListDemo/pom.xml)
===================================================================
--- trunk/samples/orderingListDemo/pom.xml	                        (rev 0)
+++ trunk/samples/orderingListDemo/pom.xml	2007-12-19 00:43:18 UTC (rev 4908)
@@ -0,0 +1,27 @@
+<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.2.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.richfaces.samples</groupId>
+  <artifactId>orderingListDemo</artifactId>
+  <packaging>war</packaging>
+  <name>orderingListDemo Maven Webapp</name>
+  <build>
+    <finalName>orderingListDemo</finalName>
+  </build>
+	<dependencies>
+		<dependency>
+			<groupId>org.richfaces.ui</groupId>
+			<artifactId>orderingList</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+  		<dependency>
+			<groupId>org.richfaces.samples</groupId>
+	    		<artifactId>skins</artifactId>
+      			<version>${project.version}</version>
+  		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file

Copied: trunk/samples/orderingListDemo/src (from rev 4906, branches/3.1.x/samples/orderingListDemo/src)

Modified: trunk/samples/pom.xml
===================================================================
--- trunk/samples/pom.xml	2007-12-18 21:46:01 UTC (rev 4907)
+++ trunk/samples/pom.xml	2007-12-19 00:43:18 UTC (rev 4908)
@@ -456,5 +456,9 @@
 			<module>scrollableDataTableDemo</module>
 			<module>richfaces-ear-demo</module>
 		-->
+
+		<module>contextMenuDemo</module>
+		<module>orderingListDemo</module>
+		<module>listShuttleDemo</module>
 	</modules>
 </project>
\ No newline at end of file

Copied: trunk/ui/componentControl (from rev 4905, branches/3.1.x/ui/componentControl)

Deleted: trunk/ui/componentControl/pom.xml
===================================================================
--- branches/3.1.x/ui/componentControl/pom.xml	2007-12-18 19:40:59 UTC (rev 4905)
+++ trunk/ui/componentControl/pom.xml	2007-12-19 00:43:18 UTC (rev 4908)
@@ -1,56 +0,0 @@
-<?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>ui</artifactId>
-    <groupId>org.richfaces</groupId>
-    <version>3.1.4-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.richfaces.ui</groupId>
-  <artifactId>componentControl</artifactId>
-  <name>componentControl</name>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.richfaces.cdk</groupId>
-        <artifactId>maven-cdk-plugin</artifactId>
-        <version>3.1.4-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-          </execution>
-	  <execution>
-	    <id>generate-test-sources</id>
-            <phase>generate-test-sources</phase>
-            <goals>
-              <goal>generate-tests</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <library>
-            <prefix>org.richfaces</prefix>
-            <taglib>
-              <shortName>componentControl</shortName>
-            </taglib>
-          </library>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.richfaces.framework</groupId>
-      <artifactId>richfaces-impl</artifactId>
-      <version>3.1.4-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-</project>

Copied: trunk/ui/componentControl/pom.xml (from rev 4906, branches/3.1.x/ui/componentControl/pom.xml)
===================================================================
--- trunk/ui/componentControl/pom.xml	                        (rev 0)
+++ trunk/ui/componentControl/pom.xml	2007-12-19 00:43:18 UTC (rev 4908)
@@ -0,0 +1,56 @@
+<?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>ui</artifactId>
+    <groupId>org.richfaces</groupId>
+    <version>3.2.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.richfaces.ui</groupId>
+  <artifactId>componentControl</artifactId>
+  <name>componentControl</name>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.richfaces.cdk</groupId>
+        <artifactId>maven-cdk-plugin</artifactId>
+        <version>3.2.0-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+	  <execution>
+	    <id>generate-test-sources</id>
+            <phase>generate-test-sources</phase>
+            <goals>
+              <goal>generate-tests</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <library>
+            <prefix>org.richfaces</prefix>
+            <taglib>
+              <shortName>componentControl</shortName>
+            </taglib>
+          </library>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.richfaces.framework</groupId>
+      <artifactId>richfaces-impl</artifactId>
+      <version>3.2.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+</project>

Copied: trunk/ui/componentControl/src (from rev 4906, branches/3.1.x/ui/componentControl/src)

Modified: trunk/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java
===================================================================
--- branches/3.1.x/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java	2007-12-18 20:25:07 UTC (rev 4906)
+++ trunk/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java	2007-12-19 00:43:18 UTC (rev 4908)
@@ -174,4 +174,8 @@
 
 	public abstract void setAttachTiming( String attachTiming);
 	public abstract String getAttachTiming();
+
+
+	public abstract void setDisableDefault(boolean attachTiming);
+	public abstract boolean isDisableDefault();
 }

Copied: trunk/ui/contextMenu (from rev 4905, branches/3.1.x/ui/contextMenu)

Deleted: trunk/ui/contextMenu/pom.xml
===================================================================
--- branches/3.1.x/ui/contextMenu/pom.xml	2007-12-18 19:40:59 UTC (rev 4905)
+++ trunk/ui/contextMenu/pom.xml	2007-12-19 00:43:18 UTC (rev 4908)
@@ -1,55 +0,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>ui</artifactId>
-    <groupId>org.richfaces</groupId>
-    <version>3.1.4-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.richfaces.ui</groupId>
-  <artifactId>contextMenu</artifactId>
-  <name>contextMenu</name>
-  <version>3.1.4-SNAPSHOT</version>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.richfaces.cdk</groupId>
-        <artifactId>maven-cdk-plugin</artifactId>
-        <version>3.1.4-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <library>
-            <prefix>org.richfaces</prefix>
-            <taglib>
-              <shortName>contextMenu</shortName>
-            </taglib>
-          </library>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.richfaces.framework</groupId>
-      <artifactId>richfaces-impl</artifactId>
-      <version>3.1.4-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.richfaces.ui</groupId>
-      <artifactId>menu-components</artifactId>
-      <version>3.1.4-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file

Copied: trunk/ui/contextMenu/pom.xml (from rev 4906, branches/3.1.x/ui/contextMenu/pom.xml)
===================================================================
--- trunk/ui/contextMenu/pom.xml	                        (rev 0)
+++ trunk/ui/contextMenu/pom.xml	2007-12-19 00:43:18 UTC (rev 4908)
@@ -0,0 +1,55 @@
+<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>ui</artifactId>
+    <groupId>org.richfaces</groupId>
+    <version>3.2.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.richfaces.ui</groupId>
+  <artifactId>contextMenu</artifactId>
+  <name>contextMenu</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>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <library>
+            <prefix>org.richfaces</prefix>
+            <taglib>
+              <shortName>contextMenu</shortName>
+            </taglib>
+          </library>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.richfaces.framework</groupId>
+      <artifactId>richfaces-impl</artifactId>
+      <version>3.2.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.richfaces.ui</groupId>
+      <artifactId>menu-components</artifactId>
+      <version>3.2.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

Copied: trunk/ui/contextMenu/src (from rev 4906, branches/3.1.x/ui/contextMenu/src)

Modified: trunk/ui/contextMenu/src/main/config/component/contextMenu.xml
===================================================================
--- branches/3.1.x/ui/contextMenu/src/main/config/component/contextMenu.xml	2007-12-18 20:25:07 UTC (rev 4906)
+++ trunk/ui/contextMenu/src/main/config/component/contextMenu.xml	2007-12-19 00:43:18 UTC (rev 4908)
@@ -134,7 +134,7 @@
 
         <property>
             <name>selectItemStyle</name>
-            <classname>java.lang. String</classname>
+            <classname>java.lang.String</classname>
             <description>
 			CSS style(s) is/are to be applied to selected item when this component is rendered.	
             </description>

Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java	2007-12-18 21:46:01 UTC (rev 4907)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java	2007-12-19 00:43:18 UTC (rev 4908)
@@ -88,6 +88,10 @@
 		holder.nextRow();
 	}
 
+	public void encodeRows(FacesContext context, UIComponent component) throws IOException {
+		encodeRows(context, component, new TableHolder((UIDataAdaptor) component));
+	}
+	
 	/**
 	 * Iterate over all rows for this table.
 	 * 
@@ -95,12 +99,11 @@
 	 * @param component
 	 * @throws IOException
 	 */
-	public void encodeRows(FacesContext context, UIComponent component)
+	protected void encodeRows(FacesContext context, UIComponent component, TableHolder tableHolder)
 			throws IOException {
 		UIDataAdaptor table = (UIDataAdaptor) component;
 		Object key = table.getRowKey();
 		table.captureOrigValue(context);
-		TableHolder tableHolder = new TableHolder(table);
 		table.walk(context, this, tableHolder);
 		doCleanup(context, tableHolder);
 		table.setRowKey(key);

Copied: trunk/ui/listShuttle (from rev 4905, branches/3.1.x/ui/listShuttle)

Copied: trunk/ui/listShuttle/design (from rev 4906, branches/3.1.x/ui/listShuttle/design)

Deleted: trunk/ui/listShuttle/pom.xml
===================================================================
--- branches/3.1.x/ui/listShuttle/pom.xml	2007-12-18 19:40:59 UTC (rev 4905)
+++ trunk/ui/listShuttle/pom.xml	2007-12-19 00:43:18 UTC (rev 4908)
@@ -1,44 +0,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>ui</artifactId>
-    <groupId>org.richfaces</groupId>
-    <version>3.1.4-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.richfaces.ui</groupId>
-  <artifactId>listShuttle</artifactId>
-  <name>listShuttle</name>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.richfaces.cdk</groupId>
-        <artifactId>maven-cdk-plugin</artifactId>
-        <version>${project.version}</version>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <library>
-            <prefix>org.richfaces</prefix>
-            <taglib>
-              <shortName>listShuttle</shortName>
-            </taglib>
-          </library>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  
-  <dependencies>
-  	<dependency>
-  		<artifactId>orderingList</artifactId>
-  		<groupId>org.richfaces.ui</groupId>
-        <version>${project.version}</version>
-  	</dependency>
-  </dependencies>
-</project>
\ No newline at end of file

Copied: trunk/ui/listShuttle/pom.xml (from rev 4906, branches/3.1.x/ui/listShuttle/pom.xml)
===================================================================
--- trunk/ui/listShuttle/pom.xml	                        (rev 0)
+++ trunk/ui/listShuttle/pom.xml	2007-12-19 00:43:18 UTC (rev 4908)
@@ -0,0 +1,44 @@
+<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>ui</artifactId>
+    <groupId>org.richfaces</groupId>
+    <version>3.2.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.richfaces.ui</groupId>
+  <artifactId>listShuttle</artifactId>
+  <name>listShuttle</name>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.richfaces.cdk</groupId>
+        <artifactId>maven-cdk-plugin</artifactId>
+        <version>${project.version}</version>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <library>
+            <prefix>org.richfaces</prefix>
+            <taglib>
+              <shortName>listShuttle</shortName>
+            </taglib>
+          </library>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <dependencies>
+  	<dependency>
+  		<artifactId>orderingList</artifactId>
+  		<groupId>org.richfaces.ui</groupId>
+        <version>${project.version}</version>
+  	</dependency>
+  </dependencies>
+</project>
\ No newline at end of file

Copied: trunk/ui/listShuttle/src (from rev 4906, branches/3.1.x/ui/listShuttle/src)

Modified: trunk/ui/listShuttle/src/main/config/component/listShuttle.xml
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/config/component/listShuttle.xml	2007-12-18 20:25:07 UTC (rev 4906)
+++ trunk/ui/listShuttle/src/main/config/component/listShuttle.xml	2007-12-19 00:43:18 UTC (rev 4908)
@@ -501,4 +501,11 @@
 	    	<defaultvalue><![CDATA[""]]></defaultvalue>
 	    </property>
 	</component>
+
+	<listener>
+		<componentclass>javax.faces.component.EditableValueHolder</componentclass>
+		<eventclass>javax.faces.event.ValueChangeEvent</eventclass>
+		<name>valueChangeListener</name>
+	    <description>Listener for value changes</description>
+	</listener>
 </components>

Modified: trunk/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java	2007-12-18 20:25:07 UTC (rev 4906)
+++ trunk/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java	2007-12-19 00:43:18 UTC (rev 4908)
@@ -366,6 +366,7 @@
 	}
 
 	public abstract MethodBinding getValueChangeListener();
+	public abstract void setValueChangeListener(MethodBinding valueChangeMethod);
 
 	public ValueChangeListener[] getValueChangeListeners() {
 		return (ValueChangeListener[]) getFacesListeners(ValueChangeListener.class);

Copied: trunk/ui/orderingList (from rev 4905, branches/3.1.x/ui/orderingList)


Property changes on: trunk/ui/orderingList
___________________________________________________________________
Name: svn:ignore
   + .classpath
.project
.settings
target
bin


Copied: trunk/ui/orderingList/design (from rev 4906, branches/3.1.x/ui/orderingList/design)

Deleted: trunk/ui/orderingList/pom.xml
===================================================================
--- branches/3.1.x/ui/orderingList/pom.xml	2007-12-18 19:40:59 UTC (rev 4905)
+++ trunk/ui/orderingList/pom.xml	2007-12-19 00:43:18 UTC (rev 4908)
@@ -1,51 +0,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>ui</artifactId>
-    <groupId>org.richfaces</groupId>
-    <version>3.1.4-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.richfaces.ui</groupId>
-  <artifactId>orderingList</artifactId>
-  <name>orderingList</name>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.richfaces.cdk</groupId>
-        <artifactId>maven-cdk-plugin</artifactId>
-        <version>3.1.4-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-          </execution>
-	  <execution>
-	    <id>generate-test-sources</id>
-            <phase>generate-test-sources</phase>
-            <goals>
-              <goal>generate-tests</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <library>
-            <prefix>org.richfaces</prefix>
-            <taglib>
-              <shortName>orderingList</shortName>
-            </taglib>
-          </library>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-  	<dependency>
-  		<groupId>org.richfaces.ui</groupId>
-  		<artifactId>dataTable</artifactId>
-  		<version>${project.version}</version>
-  	</dependency>
-  </dependencies>
-
-</project>
\ No newline at end of file

Copied: trunk/ui/orderingList/pom.xml (from rev 4906, branches/3.1.x/ui/orderingList/pom.xml)
===================================================================
--- trunk/ui/orderingList/pom.xml	                        (rev 0)
+++ trunk/ui/orderingList/pom.xml	2007-12-19 00:43:18 UTC (rev 4908)
@@ -0,0 +1,51 @@
+<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>ui</artifactId>
+    <groupId>org.richfaces</groupId>
+    <version>3.2.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.richfaces.ui</groupId>
+  <artifactId>orderingList</artifactId>
+  <name>orderingList</name>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.richfaces.cdk</groupId>
+        <artifactId>maven-cdk-plugin</artifactId>
+        <version>3.2.0-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+	  <execution>
+	    <id>generate-test-sources</id>
+            <phase>generate-test-sources</phase>
+            <goals>
+              <goal>generate-tests</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <library>
+            <prefix>org.richfaces</prefix>
+            <taglib>
+              <shortName>orderingList</shortName>
+            </taglib>
+          </library>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+  	<dependency>
+  		<groupId>org.richfaces.ui</groupId>
+  		<artifactId>dataTable</artifactId>
+  		<version>${project.version}</version>
+  	</dependency>
+  </dependencies>
+
+</project>
\ No newline at end of file

Copied: trunk/ui/orderingList/src (from rev 4906, branches/3.1.x/ui/orderingList/src)

Modified: trunk/ui/orderingList/src/main/config/component/orderinglist.xml
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/config/component/orderinglist.xml	2007-12-18 20:25:07 UTC (rev 4906)
+++ trunk/ui/orderingList/src/main/config/component/orderinglist.xml	2007-12-19 00:43:18 UTC (rev 4908)
@@ -221,7 +221,7 @@
 		<property elonly="true">
 			<name>validator</name>
 			<classname>javax.faces.el.MethodBinding</classname>
-			<methodargs>java.lang.Object.class</methodargs>
+			<methodargs>java.lang.Object</methodargs>
 		    <description>
 		        MethodBinding pointing at a method that is called during Process Validations phase of the request processing lifecycle, to validate the current value of this component
 		    </description>

Modified: trunk/ui/pom.xml
===================================================================
--- trunk/ui/pom.xml	2007-12-18 21:46:01 UTC (rev 4907)
+++ trunk/ui/pom.xml	2007-12-19 00:43:18 UTC (rev 4908)
@@ -99,6 +99,10 @@
 		<module>message</module>
 		<module>scrollableDataTable</module>
 		<module>insert</module>
+		<module>componentControl</module>
+		<module>orderingList</module>
+		<module>listShuttle</module>
+		<module>contextMenu</module>
 	</modules>
 	<dependencies>
 		<dependency>




More information about the richfaces-svn-commits mailing list