JBoss Rich Faces SVN: r17713 - in root/commons/branches/RF8755: api/src/main/java/org/richfaces/renderkit and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2010-07-02 12:46:56 -0400 (Fri, 02 Jul 2010)
New Revision: 17713
Modified:
root/commons/branches/RF8755/
root/commons/branches/RF8755/api/src/main/java/org/richfaces/renderkit/ComponentAttribute.java
root/commons/branches/RF8755/api/src/main/java/org/richfaces/renderkit/RenderKitUtils.java
Log:
Merged revisions 17698,17702 via svnmerge from
https://svn.jboss.org/repos/richfaces/root/commons/trunk
.......
r17698 | nbelaevski | 2010-07-01 11:28:45 -0700 (Thu, 01 Jul 2010) | 1 line
Small commons refactoring
.......
r17702 | konstantin.mishin | 2010-07-01 12:58:07 -0700 (Thu, 01 Jul 2010) | 1 line
RF-8101
.......
Property changes on: root/commons/branches/RF8755
___________________________________________________________________
Name: svnmerge-integrated
- /root/commons/trunk:1-17697
+ /root/commons/trunk:1-17712
Modified: root/commons/branches/RF8755/api/src/main/java/org/richfaces/renderkit/ComponentAttribute.java
===================================================================
--- root/commons/branches/RF8755/api/src/main/java/org/richfaces/renderkit/ComponentAttribute.java 2010-07-02 16:45:41 UTC (rev 17712)
+++ root/commons/branches/RF8755/api/src/main/java/org/richfaces/renderkit/ComponentAttribute.java 2010-07-02 16:46:56 UTC (rev 17713)
@@ -88,7 +88,7 @@
* @param eventNames the eventNames to set
* @return
*/
- public ComponentAttribute setEventNames(String[] eventNames) {
+ public ComponentAttribute setEventNames(String... eventNames) {
this.eventNames = eventNames;
return this;
Modified: root/commons/branches/RF8755/api/src/main/java/org/richfaces/renderkit/RenderKitUtils.java
===================================================================
--- root/commons/branches/RF8755/api/src/main/java/org/richfaces/renderkit/RenderKitUtils.java 2010-07-02 16:45:41 UTC (rev 17712)
+++ root/commons/branches/RF8755/api/src/main/java/org/richfaces/renderkit/RenderKitUtils.java 2010-07-02 16:46:56 UTC (rev 17713)
@@ -255,9 +255,8 @@
}
}
- public static void renderAttributeAndBehaviors(FacesContext facesContext, UIComponent component,
- ComponentAttribute componentAttribute) throws IOException {
-
+ public static Object getAttributeAndBehaviorsValue(FacesContext facesContext, UIComponent component,
+ ComponentAttribute componentAttribute) {
if (facesContext == null) {
throw new NullPointerException("facesContext");
}
@@ -270,7 +269,6 @@
throw new NullPointerException("componentAttribute");
}
- String htmlAttributeName = componentAttribute.getHtmlAttributeName();
String componentAttributeName = componentAttribute.getComponentAttributeName();
Object attributeValue = component.getAttributes().get(componentAttributeName);
@@ -293,8 +291,13 @@
}
}
}
+ return attributeValue;
+ }
- renderAttribute(facesContext, htmlAttributeName, attributeValue);
+ public static void renderAttributeAndBehaviors(FacesContext facesContext, UIComponent component,
+ ComponentAttribute componentAttribute) throws IOException {
+ Object attributeValue = getAttributeAndBehaviorsValue(facesContext, component, componentAttribute);
+ renderAttribute(facesContext, componentAttribute.getHtmlAttributeName(), attributeValue);
}
public static void renderPassThroughAttributesOptimized(FacesContext context, UIComponent component,
14 years, 6 months
JBoss Rich Faces SVN: r17712 - in root/commons/branches/RF8755: api/src/main/java/org/richfaces/renderkit and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2010-07-02 12:45:41 -0400 (Fri, 02 Jul 2010)
New Revision: 17712
Modified:
root/commons/branches/RF8755/
root/commons/branches/RF8755/api/src/main/java/org/richfaces/renderkit/RenderKitUtils.java
root/commons/branches/RF8755/api/src/test/java/org/richfaces/renderkit/RenderKitUtilsMocksTest.java
Log:
Merged revisions 17690 via svnmerge from
https://svn.jboss.org/repos/richfaces/root/commons/trunk
.......
r17690 | nbelaevski | 2010-06-30 12:32:51 -0700 (Wed, 30 Jun 2010) | 1 line
https://jira.jboss.org/browse/RF-8744
.......
Property changes on: root/commons/branches/RF8755
___________________________________________________________________
Name: svnmerge-integrated
- /root/commons/trunk:1-17685
+ /root/commons/trunk:1-17697
Modified: root/commons/branches/RF8755/api/src/main/java/org/richfaces/renderkit/RenderKitUtils.java
===================================================================
--- root/commons/branches/RF8755/api/src/main/java/org/richfaces/renderkit/RenderKitUtils.java 2010-07-02 16:23:44 UTC (rev 17711)
+++ root/commons/branches/RF8755/api/src/main/java/org/richfaces/renderkit/RenderKitUtils.java 2010-07-02 16:45:41 UTC (rev 17712)
@@ -353,16 +353,16 @@
}
}
- public static void decodeBehaviors(FacesContext context, UIComponent component) {
+ public static String decodeBehaviors(FacesContext context, UIComponent component) {
if (!(component instanceof ClientBehaviorHolder)) {
- return;
+ return null;
}
ClientBehaviorHolder holder = (ClientBehaviorHolder) component;
Map<String, List<ClientBehavior>> behaviors = holder.getClientBehaviors();
if (behaviors == null || behaviors.isEmpty()) {
- return;
+ return null;
}
ExternalContext externalContext = context.getExternalContext();
@@ -370,7 +370,7 @@
String behaviorEvent = parametersMap.get(BEHAVIOR_EVENT_NAME);
if (behaviorEvent == null) {
- return;
+ return null;
}
List<ClientBehavior> behaviorsForEvent = behaviors.get(behaviorEvent);
@@ -378,12 +378,16 @@
String clientId = component.getClientId(context);
if (behaviorSource != null && behaviorSource.equals(clientId)) {
- if (behaviorsForEvent != null) {
+ if (behaviorsForEvent != null && !behaviorsForEvent.isEmpty()) {
for (ClientBehavior behavior : behaviorsForEvent) {
behavior.decode(context, component);
}
+
+ return behaviorEvent;
}
}
+
+ return null;
}
}
Modified: root/commons/branches/RF8755/api/src/test/java/org/richfaces/renderkit/RenderKitUtilsMocksTest.java
===================================================================
--- root/commons/branches/RF8755/api/src/test/java/org/richfaces/renderkit/RenderKitUtilsMocksTest.java 2010-07-02 16:23:44 UTC (rev 17711)
+++ root/commons/branches/RF8755/api/src/test/java/org/richfaces/renderkit/RenderKitUtilsMocksTest.java 2010-07-02 16:45:41 UTC (rev 17712)
@@ -25,6 +25,8 @@
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
import static org.easymock.EasyMock.same;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
@@ -322,7 +324,7 @@
facesEnvironment.replay();
- RenderKitUtils.decodeBehaviors(facesContext, component);
+ assertEquals("action", RenderKitUtils.decodeBehaviors(facesContext, component));
}
@Test
@@ -337,7 +339,7 @@
facesEnvironment.replay();
- RenderKitUtils.decodeBehaviors(facesContext, component);
+ assertEquals("blur", RenderKitUtils.decodeBehaviors(facesContext, component));
}
@Test
@@ -348,7 +350,7 @@
facesEnvironment.replay();
- RenderKitUtils.decodeBehaviors(facesContext, component);
+ assertNull(RenderKitUtils.decodeBehaviors(facesContext, component));
}
@Test
@@ -359,7 +361,7 @@
facesEnvironment.replay();
- RenderKitUtils.decodeBehaviors(facesContext, component);
+ assertNull(RenderKitUtils.decodeBehaviors(facesContext, component));
}
@Test
@@ -370,6 +372,6 @@
facesEnvironment.replay();
- RenderKitUtils.decodeBehaviors(facesContext, component);
+ assertNull(RenderKitUtils.decodeBehaviors(facesContext, component));
}
}
\ No newline at end of file
14 years, 6 months
JBoss Rich Faces SVN: r17711 - in root/cdk/branches/RF8755: bom and 3 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2010-07-02 12:23:44 -0400 (Fri, 02 Jul 2010)
New Revision: 17711
Modified:
root/cdk/branches/RF8755/
root/cdk/branches/RF8755/bom/pom.xml
root/cdk/branches/RF8755/plugins/generator/pom.xml
root/cdk/branches/RF8755/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java
root/cdk/branches/RF8755/plugins/generator/src/test/java/org/richfaces/cdk/LibraryBuilderTest.java
Log:
Merged revisions 17698,17708 via svnmerge from
https://svn.jboss.org/repos/richfaces/root/cdk/trunk
.......
r17698 | nbelaevski | 2010-07-01 11:28:45 -0700 (Thu, 01 Jul 2010) | 1 line
Small commons refactoring
.......
r17708 | nbelaevski | 2010-07-02 08:31:28 -0700 (Fri, 02 Jul 2010) | 1 line
Replaced google-collections with guava
.......
Property changes on: root/cdk/branches/RF8755
___________________________________________________________________
Name: svnmerge-integrated
- /root/cdk/trunk:1-17697
+ /root/cdk/trunk:1-17709
Modified: root/cdk/branches/RF8755/bom/pom.xml
===================================================================
--- root/cdk/branches/RF8755/bom/pom.xml 2010-07-02 16:00:38 UTC (rev 17710)
+++ root/cdk/branches/RF8755/bom/pom.xml 2010-07-02 16:23:44 UTC (rev 17711)
@@ -77,11 +77,6 @@
<version>20081112</version>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
<groupId>com.googlecode.functional-collections</groupId>
<artifactId>functional-collections</artifactId>
<version>1.1.7</version>
Modified: root/cdk/branches/RF8755/plugins/generator/pom.xml
===================================================================
--- root/cdk/branches/RF8755/plugins/generator/pom.xml 2010-07-02 16:00:38 UTC (rev 17710)
+++ root/cdk/branches/RF8755/plugins/generator/pom.xml 2010-07-02 16:23:44 UTC (rev 17711)
@@ -42,10 +42,6 @@
<groupId>com.sun.xsom</groupId>
<artifactId>xsom</artifactId>
</element>
- <element>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- </element>
</classpath>
<source>${project.basedir}/src/main/script/SchemaAttributesParserTask.groovy</source>
</configuration>
@@ -81,10 +77,6 @@
</resources>
</build>
<dependencies>
- <!--
- <dependency> <groupId>org.apache.camel</groupId>
- <artifactId>camel-guice</artifactId> </dependency>
- -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -170,30 +162,10 @@
<artifactId>dom4j</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.google.code.javaparser</groupId>
<artifactId>javaparser</artifactId>
<scope>test</scope>
</dependency>
- <!--
- <dependency> <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId> <version>1.0</version> </dependency>
- -->
-
- <!--
- <dependency> <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId> <version>1</version>
- </dependency>
- -->
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
@@ -202,13 +174,6 @@
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
</dependency>
- <!--
- <dependency> <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-grapher</artifactId> </dependency>
- -->
- <!--
- <dependency> <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-assisted-inject</artifactId> </dependency>
- -->
+
</dependencies>
</project>
\ No newline at end of file
Modified: root/cdk/branches/RF8755/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java
===================================================================
--- root/cdk/branches/RF8755/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java 2010-07-02 16:00:38 UTC (rev 17710)
+++ root/cdk/branches/RF8755/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java 2010-07-02 16:23:44 UTC (rev 17711)
@@ -180,10 +180,6 @@
this.createMethodContext();
}
- private <T extends TemplateStatement> T createStatement(Class<T> statementClass) {
- return this.injector.getInstance(statementClass);
- }
-
private void addHelperMethod(HelperMethod helperMethod) {
if (addedHelperMethods.add(helperMethod)) {
JavaMethod helperJavaMethod = helperMethodFactory.getHelperMethod(helperMethod);
@@ -222,6 +218,7 @@
return typesFactory.getType(type);
}
+
private void createMethodContext() {
this.currentStatement = new StatementsContainer();
currentStatement.setVariable(FACES_CONTEXT_VARIABLE, getType(FacesContext.class));
@@ -275,6 +272,10 @@
}
}
+ private <T extends TemplateStatement> T createStatement(Class<T> statementClass) {
+ return this.injector.getInstance(statementClass);
+ }
+
protected void pushStatement(StatementsContainer container) {
addStatement(container);
currentStatement = container;
@@ -289,6 +290,12 @@
protected void popStatement() {
currentStatement = currentStatement.getParent();
}
+
+ protected <T extends TemplateStatement> T addStatement(Class<T> statementClass){
+ T statement = createStatement(statementClass);
+ addStatement(statement);
+ return statement;
+ }
protected void addStatement(TemplateStatement statement) {
addHelperMethods(statement);
@@ -345,11 +352,9 @@
// TODO: add support
return;
}
- StartElementStatement startElementStatement = createStatement(StartElementStatement.class);
- addStatement(startElementStatement);
+ StartElementStatement startElementStatement = addStatement(StartElementStatement.class);
startElementStatement.setElementName(elementName.getLocalPart());
- AttributesStatement attributesStatement = createStatement(AttributesStatement.class);
- addStatement(attributesStatement);
+ AttributesStatement attributesStatement = addStatement(AttributesStatement.class);
attributesStatement.setAttributes(elementAttributes);
// Set<String> writtenAttributes = new HashSet<String>();
// boolean shouldEncodePassThrough = false;
@@ -416,8 +421,7 @@
@Override
public void endElement(AnyElement anyElement) throws CdkException {
QName elementName = anyElement.getName();
- EndElementStatement endElementStatement = createStatement(EndElementStatement.class);
- addStatement(endElementStatement);
+ EndElementStatement endElementStatement = addStatement(EndElementStatement.class);
endElementStatement.setElementName(elementName.getLocalPart());
}
@@ -432,8 +436,7 @@
if (text != null) {
String trimmedText = text.trim();
if (!Strings.isEmpty(trimmedText)) {
- WriteTextStatement statement = createStatement(WriteTextStatement.class);
- addStatement(statement);
+ WriteTextStatement statement = addStatement(WriteTextStatement.class);
statement.setExpression(trimmedText);
}
}
@@ -452,7 +455,6 @@
if (Strings.isEmpty(expression)) {
expression = cdkCallElement.getBodyValue();
}
-
addStatement(new TemplateStatementImpl(expression + ";"));
}
@@ -465,9 +467,8 @@
@Override
public void startElement(CdkIfElement cdkIfElement) {
- pushStatement(createStatement(IfElseStatement.class));
- IfStatement ifStatement = createStatement(IfStatement.class);
- pushStatement(ifStatement);
+ pushStatement(IfElseStatement.class);
+ IfStatement ifStatement = pushStatement(IfStatement.class);
ifStatement.setTest(cdkIfElement.getTest());
}
@@ -493,7 +494,7 @@
@Override
public void startElement(CdkChooseElement cdkChooseElement) {
- pushStatement(createStatement(IfElseStatement.class));
+ pushStatement(IfElseStatement.class);
}
/*
@@ -517,8 +518,7 @@
@Override
public void startElement(CdkWhenElement cdkWhenElement) {
- IfStatement ifStatement = createStatement(IfStatement.class);
- pushStatement(ifStatement);
+ IfStatement ifStatement = pushStatement(IfStatement.class);
ifStatement.setTest(cdkWhenElement.getTest());
}
@@ -543,8 +543,7 @@
@Override
public void startElement(CdkOtherwiseElement cdkOtherwiseElement) {
- IfStatement ifStatement = createStatement(IfStatement.class);
- pushStatement(ifStatement);
+ IfStatement ifStatement = pushStatement(IfStatement.class);
}
/*
@@ -606,8 +605,7 @@
// }
//
// defineObject(type, name, value);
- DefineObjectStatement statement = createStatement(DefineObjectStatement.class);
- addStatement(statement);
+ DefineObjectStatement statement = addStatement(DefineObjectStatement.class);
// TODO - set parameters.
}
@@ -649,8 +647,7 @@
public void startElement(CdkSwitchElement cdkSwitchElement) {
String key = cdkSwitchElement.getKey();
// String keyExpression = compileEl(key, Object.class);
- SwitchStatement switchStatement = createStatement(SwitchStatement.class);
- pushStatement(switchStatement);
+ SwitchStatement switchStatement = pushStatement(SwitchStatement.class);
switchStatement.setKeyExpression(key);
}
@@ -672,7 +669,7 @@
@Override
public void startElement(CdkDefaultElement cdkDefaultElement) {
- pushStatement(new CaseStatement());
+ pushStatement(CaseStatement.class);
}
@Override
Modified: root/cdk/branches/RF8755/plugins/generator/src/test/java/org/richfaces/cdk/LibraryBuilderTest.java
===================================================================
--- root/cdk/branches/RF8755/plugins/generator/src/test/java/org/richfaces/cdk/LibraryBuilderTest.java 2010-07-02 16:00:38 UTC (rev 17710)
+++ root/cdk/branches/RF8755/plugins/generator/src/test/java/org/richfaces/cdk/LibraryBuilderTest.java 2010-07-02 16:23:44 UTC (rev 17711)
@@ -9,7 +9,6 @@
import java.util.Collections;
import java.util.List;
-import org.apache.maven.plugin.MojoExecutionException;
import org.junit.Test;
/**
@@ -40,7 +39,7 @@
* @param type
*/
private static void setOutput(Generator generator, File directory, Outputs type) {
-
+
generator.addOutputFolder(type, directory);
}
@@ -75,14 +74,9 @@
// configure CDK workers.
// setupPlugins(generator);
- try {
-
- // Build JSF library.
- // LibraryBuilder builder = LibraryBuilder.createInstance(context);
- generator.init();
- } catch (CdkException e) {
- throw new MojoExecutionException("CDK build error", e);
- }
+ // Build JSF library.
+ // LibraryBuilder builder = LibraryBuilder.createInstance(context);
+ generator.init();
}
/**
@@ -100,16 +94,16 @@
return new CdkClassLoader(this.getClass().getClassLoader());
}
- private Iterable<File> findFacesConfigFiles() throws MojoExecutionException {
+ private Iterable<File> findFacesConfigFiles() {
return Collections.emptySet();
}
- private Iterable<File> findJavaFiles() throws MojoExecutionException {
+ private Iterable<File> findJavaFiles() {
return Collections.emptySet();
}
- private Iterable<File> findTemplateFiles() throws MojoExecutionException {
+ private Iterable<File> findTemplateFiles() {
return Collections.emptySet();
}
}
14 years, 6 months
JBoss Rich Faces SVN: r17710 - in root: examples-sandbox/trunk/components/autocomplete-demo and 12 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2010-07-02 12:00:38 -0400 (Fri, 02 Jul 2010)
New Revision: 17710
Added:
root/examples-sandbox/trunk/components/autocomplete-demo/
root/examples-sandbox/trunk/components/autocomplete-demo/src/
root/examples-sandbox/trunk/components/autocomplete-demo/src/main/
root/examples-sandbox/trunk/components/autocomplete-demo/src/main/webapp/
root/examples-sandbox/trunk/components/autocomplete-demo/src/main/webapp/WEB-INF/
root/examples-sandbox/trunk/components/autocomplete-demo/src/main/webapp/WEB-INF/faces-config.xml
root/examples-sandbox/trunk/components/autocomplete-demo/src/main/webapp/WEB-INF/web.xml
root/ui-sandbox/inputs/trunk/autocomplete/pom.xml
root/ui-sandbox/inputs/trunk/autocomplete/src/main/java/
root/ui-sandbox/inputs/trunk/autocomplete/src/main/java/org/
root/ui-sandbox/inputs/trunk/autocomplete/src/main/java/org/richfaces/
root/ui-sandbox/inputs/trunk/autocomplete/src/main/java/org/richfaces/renderkit/
root/ui-sandbox/inputs/trunk/autocomplete/src/main/java/org/richfaces/renderkit/AutocompleteRenderer.java
root/ui-sandbox/inputs/trunk/parent/
root/ui-sandbox/inputs/trunk/parent/pom.xml
root/ui-sandbox/inputs/trunk/pom.xml
Modified:
root/examples-sandbox/trunk/components/pom.xml
Log:
Added autocomplete-demo
Added pom.xml for autocomplete
Added: root/examples-sandbox/trunk/components/autocomplete-demo/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- root/examples-sandbox/trunk/components/autocomplete-demo/src/main/webapp/WEB-INF/faces-config.xml (rev 0)
+++ root/examples-sandbox/trunk/components/autocomplete-demo/src/main/webapp/WEB-INF/faces-config.xml 2010-07-02 16:00:38 UTC (rev 17710)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
+<managed-bean>
+</faces-config>
Added: root/examples-sandbox/trunk/components/autocomplete-demo/src/main/webapp/WEB-INF/web.xml
===================================================================
--- root/examples-sandbox/trunk/components/autocomplete-demo/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ root/examples-sandbox/trunk/components/autocomplete-demo/src/main/webapp/WEB-INF/web.xml 2010-07-02 16:00:38 UTC (rev 17710)
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!--
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+
+ The contents of this file are subject to the terms of either the GNU
+ General Public License Version 2 only ("GPL") or the Common Development
+ and Distribution License("CDDL") (collectively, the "License"). You
+ may not use this file except in compliance with the License. You can obtain
+ a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
+ or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
+ language governing permissions and limitations under the License.
+
+ When distributing the software, include this License Header Notice in each
+ file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
+ Sun designates this particular file as subject to the "Classpath" exception
+ as provided by Sun in the GPL Version 2 section of the License file that
+ accompanied this code. If applicable, add the following below the License
+ Header, with the fields enclosed by brackets [] replaced by your own
+ identifying information: "Portions Copyrighted [year]
+ [name of copyright owner]"
+
+ Contributor(s):
+
+ If you wish your version of this file to be governed by only the CDDL or
+ only the GPL Version 2, indicate your decision by adding "[Contributor]
+ elects to include this software in this distribution under the [CDDL or GPL
+ Version 2] license." If you don't indicate a single choice of license, a
+ recipient has the option to distribute your version of this file under
+ either the CDDL, the GPL Version 2 or to extend the choice of license to
+ its licensees as provided above. However, if you add GPL Version 2 code
+ and therefore, elected the GPL Version 2 license, then the option applies
+ only if the new code is made subject to such option by the copyright
+ holder.
+-->
+
+<web-app version="2.5"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+
+ <display-name></display-name>
+ <description></description>
+
+ <context-param>
+ <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+ <param-value>server</param-value>
+ </context-param>
+
+ <!-- Faces Servlet -->
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <!-- Faces Servlet Mapping -->
+ <!--
+
+ This mapping identifies a jsp page as having JSF content. If a
+ request comes to the server for foo.faces, the container will
+ send the request to the FacesServlet, which will expect a
+ corresponding foo.jsp page to exist containing the content.
+
+ -->
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>/faces/*</url-pattern>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Modified: root/examples-sandbox/trunk/components/pom.xml
===================================================================
--- root/examples-sandbox/trunk/components/pom.xml 2010-07-02 15:56:17 UTC (rev 17709)
+++ root/examples-sandbox/trunk/components/pom.xml 2010-07-02 16:00:38 UTC (rev 17710)
@@ -16,6 +16,7 @@
<name>Richfaces Examples Sandbox: Component Demos Aggregator</name>
<modules>
+ <module>autocomplete-demo</module>
</modules>
<dependencies>
Added: root/ui-sandbox/inputs/trunk/autocomplete/pom.xml
===================================================================
--- root/ui-sandbox/inputs/trunk/autocomplete/pom.xml (rev 0)
+++ root/ui-sandbox/inputs/trunk/autocomplete/pom.xml 2010-07-02 16:00:38 UTC (rev 17710)
@@ -0,0 +1,131 @@
+
+ <!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat, Inc.
+ and individual contributors by the @authors tag. See the copyright.txt
+ in the distribution for a full listing of individual contributors.
+ This is free software; you can redistribute it and/or modify it under
+ the terms of the GNU Lesser General Public License as published by the
+ Free Software Foundation; either version 2.1 of the License, or (at
+ your option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the GNU Lesser General Public License for more details.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+ USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<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>
+ <groupId>org.richfaces.ui.inputs-sandbox</groupId>
+ <artifactId>richfaces-ui-inputs-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui.inputs-sandbox</groupId>
+ <artifactId>autocomplete</artifactId>
+ <name>Richfaces UI Sandbox Components: Autocomplete Input Component</name>
+ <packaging>jar</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <!-- runtime -->
+ <dependency>
+ <groupId>org.richfaces.core</groupId>
+ <artifactId>richfaces-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <!-- todo remove this dependency or move to test scope -->
+ <groupId>org.richfaces.core</groupId>
+ <artifactId>richfaces-core-impl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- JSF with dependencies -->
+ <dependency>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
+ <version>2.0.2</version>
+ <!--
+ TODO: remove this dependency it should inherited from perent poms
+ -->
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- tests -->
+ <dependency>
+ <groupId>${jsf2.impl.groupid}</groupId>
+ <artifactId>${jsf2.impl.artifactid}</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <!-- todo api? -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-test-stage</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>htmlunit-client</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-mock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui-sandbox/inputs/trun...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui-sandbox/inputs/trun...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
+</project>
\ No newline at end of file
Added: root/ui-sandbox/inputs/trunk/autocomplete/src/main/java/org/richfaces/renderkit/AutocompleteRenderer.java
===================================================================
Added: root/ui-sandbox/inputs/trunk/parent/pom.xml
===================================================================
--- root/ui-sandbox/inputs/trunk/parent/pom.xml (rev 0)
+++ root/ui-sandbox/inputs/trunk/parent/pom.xml 2010-07-02 16:00:38 UTC (rev 17710)
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+-->
+
+<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/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>7</version>
+ </parent>
+
+ <groupId>org.richfaces.ui.inputs-sandbox</groupId>
+ <artifactId>richfaces-ui-inputs-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <name>Richfaces UI Sandbox Components: Inputs Parent</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <richfaces.checkstyle.version>1</richfaces.checkstyle.version>
+ <org.richfaces.cdk.version>4.0.0-SNAPSHOT</org.richfaces.cdk.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.core</groupId>
+ <artifactId>richfaces-core-bom</artifactId>
+ <version>${project.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>annotations</artifactId>
+ <version>${org.richfaces.cdk.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
+ <version>${org.richfaces.cdk.version}</version>
+ <configuration>
+ <library>
+ <prefix>org.richfaces</prefix>
+ <taglib>
+ <uri>http://richfaces.org/a4j</uri>
+ <shortName>a4j</shortName>
+ <displayName>Core ajax components tags</displayName>
+ </taglib>
+ </library>
+ </configuration>
+ <executions>
+ <execution>
+ <id>cdk-generate-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <version>1.0-beta-2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>2.0-alpha-4</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-build-checkstyle</artifactId>
+ <version>${richfaces.checkstyle.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <configuration>
+ <fail>false</fail>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <javadocVersion>1.5</javadocVersion>
+ <aggregate>true</aggregate>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-javadoc</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui-sandbox/inputs/t...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui-sandbox/inputs/trun...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
+</project>
Added: root/ui-sandbox/inputs/trunk/pom.xml
===================================================================
--- root/ui-sandbox/inputs/trunk/pom.xml (rev 0)
+++ root/ui-sandbox/inputs/trunk/pom.xml 2010-07-02 16:00:38 UTC (rev 17710)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+-->
+
+<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/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>7</version>
+ </parent>
+
+ <groupId>org.richfaces.ui.inputs-sandbox</groupId>
+ <artifactId>richfaces-ui-inputs-sandbox-aggregator</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Richfaces UI Sandbox Components: Inputs Aggregator</name>
+
+ <modules>
+ <module>parent</module>
+ <module>autocomplete</module>
+ </modules>
+
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui-sandbox/inputs/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui-sandbox/inputs/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
+</project>
\ No newline at end of file
14 years, 6 months
JBoss Rich Faces SVN: r17709 - root/cdk/branches/RF8755.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2010-07-02 11:56:17 -0400 (Fri, 02 Jul 2010)
New Revision: 17709
Modified:
root/cdk/branches/RF8755/
Log:
merge 17697
Property changes on: root/cdk/branches/RF8755
___________________________________________________________________
Name: svnmerge-integrated
- /root/cdk/trunk:1-17639
+ /root/cdk/trunk:1-17697
14 years, 6 months
JBoss Rich Faces SVN: r17708 - in root/cdk/trunk: plugins/generator and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2010-07-02 11:31:28 -0400 (Fri, 02 Jul 2010)
New Revision: 17708
Modified:
root/cdk/trunk/bom/pom.xml
root/cdk/trunk/plugins/generator/pom.xml
Log:
Replaced google-collections with guava
Modified: root/cdk/trunk/bom/pom.xml
===================================================================
--- root/cdk/trunk/bom/pom.xml 2010-07-02 14:29:39 UTC (rev 17707)
+++ root/cdk/trunk/bom/pom.xml 2010-07-02 15:31:28 UTC (rev 17708)
@@ -75,11 +75,6 @@
<version>20081112</version>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>2.0</version>
Modified: root/cdk/trunk/plugins/generator/pom.xml
===================================================================
--- root/cdk/trunk/plugins/generator/pom.xml 2010-07-02 14:29:39 UTC (rev 17707)
+++ root/cdk/trunk/plugins/generator/pom.xml 2010-07-02 15:31:28 UTC (rev 17708)
@@ -42,10 +42,6 @@
<groupId>com.sun.xsom</groupId>
<artifactId>xsom</artifactId>
</element>
- <element>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- </element>
</classpath>
<source>${project.basedir}/src/main/script/SchemaAttributesParserTask.groovy</source>
</configuration>
@@ -160,8 +156,8 @@
<artifactId>easymock</artifactId>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xsom</groupId>
14 years, 6 months
JBoss Rich Faces SVN: r17707 - in root/ui/iteration/trunk/lists: ui/src/main/java/org/richfaces and 2 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2010-07-02 10:29:39 -0400 (Fri, 02 Jul 2010)
New Revision: 17707
Added:
root/ui/iteration/trunk/lists/api/pom.xml
root/ui/iteration/trunk/lists/ui/src/main/java/org/richfaces/package-info.java
Modified:
root/ui/iteration/trunk/lists/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java
root/ui/iteration/trunk/lists/ui/src/main/templates/list.template.xml
Log:
https://jira.jboss.org/browse/RF-8852
Added: root/ui/iteration/trunk/lists/api/pom.xml
===================================================================
--- root/ui/iteration/trunk/lists/api/pom.xml (rev 0)
+++ root/ui/iteration/trunk/lists/api/pom.xml 2010-07-02 14:29:39 UTC (rev 17707)
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+-->
+
+<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/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.richfaces.ui.iteration</groupId>
+ <artifactId>lists-aggregator</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui.iteration</groupId>
+ <artifactId>lists-api</artifactId>
+ <name>Richfaces UI Components: Lists API</name>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <!-- runtime -->
+ <dependency>
+ <groupId>org.richfaces.core</groupId>
+ <artifactId>richfaces-core-api</artifactId>
+ </dependency>
+
+ <!-- JSF with dependencies -->
+ <dependency>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- tests -->
+ <dependency>
+ <groupId>${jsf2.impl.groupid}</groupId>
+ <artifactId>${jsf2.impl.artifactid}</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <!-- todo api? -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-test-stage</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>htmlunit-client</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-mock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/lis...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
+
+</project>
\ No newline at end of file
Added: root/ui/iteration/trunk/lists/ui/src/main/java/org/richfaces/package-info.java
===================================================================
--- root/ui/iteration/trunk/lists/ui/src/main/java/org/richfaces/package-info.java (rev 0)
+++ root/ui/iteration/trunk/lists/ui/src/main/java/org/richfaces/package-info.java 2010-07-02 14:29:39 UTC (rev 17707)
@@ -0,0 +1,5 @@
+/**
+ * Implementation of RichFaces data lists
+ */
+(a)org.richfaces.cdk.annotations.TagLibrary(uri="http://richfaces.org/lists", shortName="lists")
+package org.richfaces;
\ No newline at end of file
Modified: root/ui/iteration/trunk/lists/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java
===================================================================
--- root/ui/iteration/trunk/lists/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java 2010-07-02 14:26:59 UTC (rev 17706)
+++ root/ui/iteration/trunk/lists/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java 2010-07-02 14:29:39 UTC (rev 17707)
@@ -76,7 +76,15 @@
* @author Nick Belaevski
*
*/
- private final class SimpleItemsEncoder extends ItemsEncoder {
+ private class SimpleItemsEncoder extends ItemsEncoder {
+
+ private String itemClass;
+
+ public SimpleItemsEncoder(String itemClass) {
+ super();
+ this.itemClass = itemClass;
+ }
+
@Override
protected void encodeRow(FacesContext context, UISequence sequence, SequenceRendererHelper helper)
throws IOException {
@@ -89,7 +97,7 @@
}
rendererUtils.writeAttribute(writer, HTML.CLASS_ATTRIBUTE,
- HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-ls-i"));
+ HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), itemClass));
renderHandlers(context, sequence);
rendererUtils.encodeChildren(context, sequence);
writer.endElement(HTML.LI_ELEMENT);
@@ -122,7 +130,7 @@
}
rendererUtils.writeAttribute(writer, HTML.CLASS_ATTRIBUTE,
- HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-ls-dt"));
+ HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-lst-t rf-dlst-t"));
termFacet.encodeAll(context);
writer.endElement(HTML.DT_ELEMENT);
}
@@ -134,7 +142,7 @@
}
rendererUtils.writeAttribute(writer, HTML.CLASS_ATTRIBUTE,
- HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-ls-dd"));
+ HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-lst-i rf-dlst-i"));
renderHandlers(context, sequence);
rendererUtils.encodeChildren(context, sequence);
writer.endElement(HTML.DD_ELEMENT);
@@ -180,10 +188,40 @@
}
- private ItemsEncoder simpleItemsEncoder = new SimpleItemsEncoder();
+ private ItemsEncoder unorderedListItemsEncoder = new SimpleItemsEncoder("rf-lst-i rf-ulst-i");
+ private ItemsEncoder orderedListItemsEncoder = new SimpleItemsEncoder("rf-lst-i rf-olst-i");
+
private ItemsEncoder definitionItemsEncoder = new DefinitionItemsEncoder();
+ protected String getListClass(ListType type) {
+ switch (type) {
+ case ordered:
+ return "rf-lst rf-olst";
+ case unordered:
+ return "rf-lst rf-ulst";
+ case definitions:
+ return "rf-lst rf-dlst";
+
+ default:
+ throw new IllegalArgumentException(type.toString());
+ }
+ }
+
+ protected ItemsEncoder getItemsEncoderByType(ListType type) {
+ switch (type) {
+ case ordered:
+ return orderedListItemsEncoder;
+ case unordered:
+ return unorderedListItemsEncoder;
+ case definitions:
+ return definitionItemsEncoder;
+
+ default:
+ throw new IllegalArgumentException(type.toString());
+ }
+ }
+
protected ListType getType(UIComponent component) {
ListType type = ((AbstractList) component).getType();
if (type == null) {
@@ -194,17 +232,25 @@
return type;
}
- protected String getStyleClass(UIComponent component) {
+ protected String getStyleClass(UIComponent component, ListType listType) {
String styleClass = (String) component.getAttributes().get(HTML.STYLE_CLASS_ATTR);
// TODO rf-* classes for different list types
- return HtmlUtil.concatClasses(styleClass, "rf-ls");
+ return HtmlUtil.concatClasses(styleClass, getListClass(listType));
}
- protected void encodeListItems(FacesContext context, UIComponent component, boolean isSimpleList)
+ protected String getElementId(FacesContext facesContext, UIComponent component) {
+ if (rendererUtils.hasExplicitId(component)) {
+ return component.getClientId(facesContext);
+ }
+
+ return null;
+ }
+
+ protected void encodeListItems(FacesContext context, UIComponent component, ListType listType)
throws IOException {
AbstractList list = (AbstractList) component;
try {
- ItemsEncoder itemsEncoder = isSimpleList ? simpleItemsEncoder : definitionItemsEncoder;
+ ItemsEncoder itemsEncoder = getItemsEncoderByType(listType);
SequenceRendererHelper rendererHelper = new SequenceRendererHelper(list);
list.walk(context, itemsEncoder, rendererHelper);
Modified: root/ui/iteration/trunk/lists/ui/src/main/templates/list.template.xml
===================================================================
--- root/ui/iteration/trunk/lists/ui/src/main/templates/list.template.xml 2010-07-02 14:26:59 UTC (rev 17706)
+++ root/ui/iteration/trunk/lists/ui/src/main/templates/list.template.xml 2010-07-02 14:29:39 UTC (rev 17707)
@@ -78,21 +78,24 @@
<cc:implementation>
<cdk:object type="org.richfaces.component.ListType" name="listType" value="#{getType(component)}" />
- <cdk:object name="styleClass" value="#{getStyleClass(component)}" />
+
+ <cdk:object name="styleClass" value="#{getStyleClass(component, listType)}" />
+ <cdk:object name="elementId" value="#{getElementId(facesContext, component)}" />
+
<cdk:switch key="#{listType}">
<cdk:case values="ordered">
- <ol id="#{clientId}" class="#{styleClass}" cdk:passThroughWithExclusions="type value">
- <cdk:call expression="encodeListItems(facesContext, component, true)" />
+ <ol id="#{elementId}" class="#{styleClass}" cdk:passThroughWithExclusions="type value">
+ <cdk:call expression="encodeListItems(facesContext, component, listType)" />
</ol>
</cdk:case>
<cdk:case values="unordered">
- <ul id="#{clientId}" class="#{styleClass}" cdk:passThroughWithExclusions="type value">
- <cdk:call expression="encodeListItems(facesContext, component, true)" />
+ <ul id="#{elementId}" class="#{styleClass}" cdk:passThroughWithExclusions="type value">
+ <cdk:call expression="encodeListItems(facesContext, component, listType)" />
</ul>
</cdk:case>
<cdk:case values="definitions">
- <dl id="#{clientId}" class="#{styleClass}" cdk:passThroughWithExclusions="type value">
- <cdk:call expression="encodeListItems(facesContext, component, false)" />
+ <dl id="#{elementId}" class="#{styleClass}" cdk:passThroughWithExclusions="type value">
+ <cdk:call expression="encodeListItems(facesContext, component, listType)" />
</dl>
</cdk:case>
</cdk:switch>
14 years, 6 months
JBoss Rich Faces SVN: r17706 - root/examples/iteration-demo/trunk/src/main/webapp.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2010-07-02 10:26:59 -0400 (Fri, 02 Jul 2010)
New Revision: 17706
Modified:
root/examples/iteration-demo/trunk/src/main/webapp/list.xhtml
Log:
https://jira.jboss.org/browse/RF-8856
Modified: root/examples/iteration-demo/trunk/src/main/webapp/list.xhtml
===================================================================
--- root/examples/iteration-demo/trunk/src/main/webapp/list.xhtml 2010-07-02 14:02:26 UTC (rev 17705)
+++ root/examples/iteration-demo/trunk/src/main/webapp/list.xhtml 2010-07-02 14:26:59 UTC (rev 17706)
@@ -20,7 +20,7 @@
</h:form>
<h:form id="form1">
- <it:list id="list" var="item" value="#{dataBean.employeeList}" rows="20" type="#{listBean.listType}">
+ <it:list var="item" value="#{dataBean.employeeList}" rows="20" type="#{listBean.listType}">
<f:facet name="term">
#{item.EMail}
</f:facet>
14 years, 6 months
JBoss Rich Faces SVN: r17705 - root/core/trunk/impl/src/main/resources/META-INF/resources.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-07-02 10:02:26 -0400 (Fri, 02 Jul 2010)
New Revision: 17705
Modified:
root/core/trunk/impl/src/main/resources/META-INF/resources/richfaces-event.js
Log:
RF-8745 TogglePanel component
Fix for event handlers
Modified: root/core/trunk/impl/src/main/resources/META-INF/resources/richfaces-event.js
===================================================================
--- root/core/trunk/impl/src/main/resources/META-INF/resources/richfaces-event.js 2010-07-02 04:56:30 UTC (rev 17704)
+++ root/core/trunk/impl/src/main/resources/META-INF/resources/richfaces-event.js 2010-07-02 14:02:26 UTC (rev 17705)
@@ -31,8 +31,8 @@
}
var getHandlerWrapper = function (component, fn) {
- return f = function (e,d){
- fn.call(component||this, e, this, d);
+ return function (e,d){
+ return fn.call(component||this, e, this, d);
};
}
14 years, 6 months
JBoss Rich Faces SVN: r17704 - in root/docs/trunk: Component_Reference/en-US and 3 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: SeanRogers
Date: 2010-07-02 00:56:30 -0400 (Fri, 02 Jul 2010)
New Revision: 17704
Modified:
root/docs/trunk/Component_Reference/en-US/Component_Reference.xml
root/docs/trunk/Component_Reference/pom.xml
root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Advanced_features.xml
root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Basic_concepts.xml
root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Skinning_and_theming.xml
root/docs/trunk/Developer_Guide/pom.xml
root/docs/trunk/Migration_Guide/pom.xml
Log:
Removed language from artifact IDs
Modified: root/docs/trunk/Component_Reference/en-US/Component_Reference.xml
===================================================================
--- root/docs/trunk/Component_Reference/en-US/Component_Reference.xml 2010-07-02 00:31:47 UTC (rev 17703)
+++ root/docs/trunk/Component_Reference/en-US/Component_Reference.xml 2010-07-02 04:56:30 UTC (rev 17704)
@@ -42,6 +42,8 @@
<xi:include href="chap-Component_Reference-Functionality_extension.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-->
</part>
+ <!--
<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ -->
</book>
Modified: root/docs/trunk/Component_Reference/pom.xml
===================================================================
--- root/docs/trunk/Component_Reference/pom.xml 2010-07-02 00:31:47 UTC (rev 17703)
+++ root/docs/trunk/Component_Reference/pom.xml 2010-07-02 04:56:30 UTC (rev 17704)
@@ -9,10 +9,10 @@
</parent>
<groupId>org.richfaces.docs</groupId>
- <artifactId>Component_Reference-en-US</artifactId>
+ <artifactId>Component_Reference</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
- <name>Component Reference-(en-US)</name>
+ <name>Component Reference</name>
<properties>
<translation>en-US</translation>
Modified: root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Advanced_features.xml
===================================================================
--- root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Advanced_features.xml 2010-07-02 00:31:47 UTC (rev 17703)
+++ root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Advanced_features.xml 2010-07-02 04:56:30 UTC (rev 17704)
@@ -3,9 +3,6 @@
]>
<chapter id="chap-Developer_Guide-Advanced_features">
<title>Advanced features</title>
- <para>
- Read this chapter for details on some of the advanced features and configuration possibilities for the RichFaces framework.
- </para>
<!-- In development notification -->
<important>
<title>Documentation in development</title>
@@ -13,6 +10,9 @@
Some concepts covered in this chapter may refer to the previous version of <productname>Richfaces</productname>, version 3.3.3. This chapter is scheduled for review to ensure all information is up to date.
</para>
</important>
+ <para>
+ Read this chapter for details on some of the advanced features and configuration possibilities for the RichFaces framework.
+ </para>
<section id="sect-Developer_Guide-Advanced_features-JSF2_integration">
<title>JSF2 integration</title>
<para>
Modified: root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Basic_concepts.xml
===================================================================
--- root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Basic_concepts.xml 2010-07-02 00:31:47 UTC (rev 17703)
+++ root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Basic_concepts.xml 2010-07-02 04:56:30 UTC (rev 17704)
@@ -3,9 +3,6 @@
]>
<chapter id="chap-Developer_Guide-Basic_concepts">
<title>Basic concepts</title>
- <para>
- Read this chapter for the basic concepts of using RichFaces in conjunction with Ajax and JavaServer Faces.
- </para>
<!-- In development notification -->
<important>
<title>Documentation in development</title>
@@ -13,6 +10,9 @@
Some concepts covered in this chapter may refer to the previous version of <productname>Richfaces</productname>, version 3.3.3. This chapter is scheduled for review to ensure all information is up to date.
</para>
</important>
+ <para>
+ Read this chapter for the basic concepts of using RichFaces in conjunction with Ajax and JavaServer Faces.
+ </para>
<section id="sect-Developer_Guide-Basic_concepts-Sending_an_Ajax_request">
<title>Sending an Ajax request</title>
<para>
Modified: root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Skinning_and_theming.xml
===================================================================
--- root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Skinning_and_theming.xml 2010-07-02 00:31:47 UTC (rev 17703)
+++ root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Skinning_and_theming.xml 2010-07-02 04:56:30 UTC (rev 17704)
@@ -3,9 +3,6 @@
]>
<chapter id="chap-Developer_Guide-Skinning_and_theming">
<title>Skinning and theming</title>
- <para>
- Read this chapter for a guide to skinning and theming RichFaces applications, including how to implement themes, and details on customizing and extending skins.
- </para>
<!-- In development notification -->
<important>
<title>Documentation in development</title>
@@ -13,6 +10,9 @@
Some concepts covered in this chapter may refer to the previous version of <productname>Richfaces</productname>, version 3.3.3. This chapter is scheduled for review to ensure all information is up to date.
</para>
</important>
+ <para>
+ Read this chapter for a guide to skinning and theming RichFaces applications, including how to implement themes, and details on customizing and extending skins.
+ </para>
<section id="sect-Developer_Guide-Skinning_and_theming-What_are_skins">
<title>What are skins?</title>
<para>
Modified: root/docs/trunk/Developer_Guide/pom.xml
===================================================================
--- root/docs/trunk/Developer_Guide/pom.xml 2010-07-02 00:31:47 UTC (rev 17703)
+++ root/docs/trunk/Developer_Guide/pom.xml 2010-07-02 04:56:30 UTC (rev 17704)
@@ -9,10 +9,10 @@
</parent>
<groupId>org.richfaces.docs</groupId>
- <artifactId>Developer_Guide-en-US</artifactId>
+ <artifactId>Developer_Guide</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
- <name>Developer Guide-(en-US)</name>
+ <name>Developer Guide</name>
<properties>
<translation>en-US</translation>
Modified: root/docs/trunk/Migration_Guide/pom.xml
===================================================================
--- root/docs/trunk/Migration_Guide/pom.xml 2010-07-02 00:31:47 UTC (rev 17703)
+++ root/docs/trunk/Migration_Guide/pom.xml 2010-07-02 04:56:30 UTC (rev 17704)
@@ -9,10 +9,10 @@
</parent>
<groupId>org.richfaces.docs</groupId>
- <artifactId>Migration_Guide-en-US</artifactId>
+ <artifactId>Migration_Guide</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
- <name>Migration Guide-(en-US)</name>
+ <name>Migration Guide</name>
<properties>
<translation>en-US</translation>
14 years, 6 months