JBoss Rich Faces SVN: r18571 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid.
by richfaces-svn-commits@lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-08-11 17:14:25 -0400 (Wed, 11 Aug 2010)
New Revision: 18571
Added:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/AbstractDataGridTest.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestPagination.java
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestSimple.java
Log:
derived AbstractDataGridTest, created stub for TestPagination (RFPL-672)
Copied: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/AbstractDataGridTest.java (from rev 18570, modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestSimple.java)
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/AbstractDataGridTest.java (rev 0)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/AbstractDataGridTest.java 2010-08-11 21:14:25 UTC (rev 18571)
@@ -0,0 +1,119 @@
+/*******************************************************************************
+ * 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.
+ *******************************************************************************/
+package org.richfaces.tests.metamer.ftest.richDataGrid;
+
+import static java.lang.Math.ceil;
+import static java.lang.Math.max;
+import static java.lang.Math.min;
+import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardHttp;
+import static org.jboss.test.selenium.locator.LocatorFactory.jq;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.fail;
+
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.bind.JAXBException;
+
+import org.jboss.test.selenium.locator.ElementLocator;
+import org.jboss.test.selenium.locator.JQueryLocator;
+import org.richfaces.tests.metamer.bean.Model;
+import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
+import org.richfaces.tests.metamer.ftest.annotations.Inject;
+import org.richfaces.tests.metamer.ftest.annotations.Use;
+import org.richfaces.tests.metamer.ftest.model.DataGrid;
+import org.richfaces.tests.metamer.model.Capital;
+import org.testng.annotations.BeforeMethod;
+
+/**
+ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
+ * @version $Revision$
+ */
+public abstract class AbstractDataGridTest extends AbstractMetamerTest {
+
+ protected static final int ELEMENTS_TOTAL = 50;
+
+ List<Capital> capitals;
+
+ JQueryLocator attributeColumns = pjq("input[id$=columnsInput]");
+ JQueryLocator attributeElements = pjq("input[id$=elementsInput]");
+ JQueryLocator attributeFirst = pjq("input[id$=firstInput]");
+
+ DataGrid dataGrid = new DataGrid(jq("table.rf-dg[id$=richDataGrid]"));
+
+ @Inject
+ @Use(ints = { 3 })
+ Integer columns;
+
+ @Inject
+ @Use(empty = true)
+ Integer elements;
+
+ @Inject
+ @Use(empty = true)
+ Integer first;
+
+ @SuppressWarnings("restriction")
+ public AbstractDataGridTest() throws JAXBException {
+ capitals = Model.unmarshallCapitals();
+ }
+
+ @BeforeMethod
+ public void prepareAttributes() {
+ prepareAttribute(attributeColumns, columns);
+ prepareAttribute(attributeElements, elements);
+ prepareAttribute(attributeFirst, first);
+ }
+
+ private void prepareAttribute(ElementLocator<?> inputLocator, Object value) {
+ String v = value == null ? "" : value.toString();
+ guardHttp(selenium).type(inputLocator, v);
+ }
+
+ protected void verifyCounts() {
+ int nFirst = first == null ? 0 : min(ELEMENTS_TOTAL, max(0, first));
+ int nElements = (elements == null ? ELEMENTS_TOTAL : min(elements, ELEMENTS_TOTAL)) - nFirst;
+ int nColumns = columns;
+ double nRows = ceil((float) nElements / columns);
+
+ assertEquals(dataGrid.getElementCount(), (int) nElements);
+ assertEquals(dataGrid.getColumnCount(), (int) nColumns);
+ assertEquals(dataGrid.getRowCount(), (int) nRows);
+ }
+
+ protected void verifyElements() {
+ int nFirst = first == null ? 0 : min(ELEMENTS_TOTAL, max(0, first));
+ int nElements = (elements == null ? ELEMENTS_TOTAL : min(elements, ELEMENTS_TOTAL)) - nFirst;
+
+ Iterator<Capital> capitalIterator = capitals.subList(nFirst, nFirst + nElements).iterator();
+ Iterator<JQueryLocator> elementIterator = dataGrid.iterateElements();
+
+ while (capitalIterator.hasNext()) {
+ final Capital capital = capitalIterator.next();
+ if (!elementIterator.hasNext()) {
+ fail("there should be next element for state name: " + capital.getState());
+ }
+ final JQueryLocator element = elementIterator.next().getChild(jq("span"));
+ assertEquals(selenium.getText(element), capital.getState());
+ }
+ }
+}
Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestPagination.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestPagination.java (rev 0)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestPagination.java 2010-08-11 21:14:25 UTC (rev 18571)
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * 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.
+ *******************************************************************************/
+package org.richfaces.tests.metamer.ftest.richDataGrid;
+
+import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
+
+import java.net.URL;
+
+import javax.xml.bind.JAXBException;
+
+import org.richfaces.tests.metamer.ftest.annotations.Use;
+import org.testng.annotations.Test;
+
+/**
+ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
+ * @version $Revision$
+ */
+@Use(field = "elements", ints = { 7 })
+public class TestPagination extends AbstractDataGridTest {
+
+ public TestPagination() throws JAXBException {
+ super();
+ }
+
+ @Override
+ public URL getTestUrl() {
+ return buildUrl(contextPath, "faces/components/richDataGrid/scroller.xhtml");
+ }
+
+ @Test
+ public void testPagination() {
+
+ }
+}
\ No newline at end of file
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestSimple.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestSimple.java 2010-08-11 21:13:47 UTC (rev 18570)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestSimple.java 2010-08-11 21:14:25 UTC (rev 18571)
@@ -21,63 +21,23 @@
*******************************************************************************/
package org.richfaces.tests.metamer.ftest.richDataGrid;
-import static java.lang.Math.ceil;
-import static java.lang.Math.max;
-import static java.lang.Math.min;
-import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardHttp;
-import static org.jboss.test.selenium.locator.LocatorFactory.jq;
import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
import javax.xml.bind.JAXBException;
-import org.jboss.test.selenium.locator.ElementLocator;
-import org.jboss.test.selenium.locator.JQueryLocator;
-import org.richfaces.tests.metamer.bean.Model;
-import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
-import org.richfaces.tests.metamer.ftest.annotations.Inject;
import org.richfaces.tests.metamer.ftest.annotations.Use;
-import org.richfaces.tests.metamer.ftest.model.DataGrid;
-import org.richfaces.tests.metamer.model.Capital;
-import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
/**
* @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
* @version $Revision$
*/
-public class TestSimple extends AbstractMetamerTest {
+public class TestSimple extends AbstractDataGridTest {
- private static final int ELEMENTS_TOTAL = 50;
-
- List<Capital> capitals;
-
- JQueryLocator attributeColumns = pjq("input[id$=columnsInput]");
- JQueryLocator attributeElements = pjq("input[id$=elementsInput]");
- JQueryLocator attributeFirst = pjq("input[id$=firstInput]");
-
- DataGrid dataGrid = new DataGrid(jq("table.rf-dg[id$=richDataGrid]"));
-
- @Inject
- @Use(ints = { 3 })
- Integer columns;
-
- @Inject
- @Use(empty = true)
- Integer elements;
-
- @Inject
- @Use(empty = true)
- Integer first;
-
- @SuppressWarnings("restriction")
public TestSimple() throws JAXBException {
- capitals = Model.unmarshallCapitals();
+ super();
}
@Override
@@ -85,18 +45,6 @@
return buildUrl(contextPath, "faces/components/richDataGrid/simple.xhtml");
}
- @BeforeMethod
- public void prepareAttributes() {
- prepareAttribute(attributeColumns, columns);
- prepareAttribute(attributeElements, elements);
- prepareAttribute(attributeFirst, first);
- }
-
- private void prepareAttribute(ElementLocator<?> inputLocator, Object value) {
- String v = value == null ? "" : value.toString();
- guardHttp(selenium).type(inputLocator, v);
- }
-
@Test
@Use(field = "columns", ints = { 1, 3, 11, ELEMENTS_TOTAL / 2, ELEMENTS_TOTAL - 1, ELEMENTS_TOTAL,
ELEMENTS_TOTAL + 1 })
@@ -118,32 +66,4 @@
verifyCounts();
verifyElements();
}
-
- private void verifyCounts() {
- int nFirst = first == null ? 0 : min(ELEMENTS_TOTAL, max(0, first));
- int nElements = (elements == null ? ELEMENTS_TOTAL : min(elements, ELEMENTS_TOTAL)) - nFirst;
- int nColumns = columns;
- double nRows = ceil((float) nElements / columns);
-
- assertEquals(dataGrid.getElementCount(), (int) nElements);
- assertEquals(dataGrid.getColumnCount(), (int) nColumns);
- assertEquals(dataGrid.getRowCount(), (int) nRows);
- }
-
- private void verifyElements() {
- int nFirst = first == null ? 0 : min(ELEMENTS_TOTAL, max(0, first));
- int nElements = (elements == null ? ELEMENTS_TOTAL : min(elements, ELEMENTS_TOTAL)) - nFirst;
-
- Iterator<Capital> capitalIterator = capitals.subList(nFirst, nFirst + nElements).iterator();
- Iterator<JQueryLocator> elementIterator = dataGrid.iterateElements();
-
- while (capitalIterator.hasNext()) {
- final Capital capital = capitalIterator.next();
- if (!elementIterator.hasNext()) {
- fail("there should be next element for state name: " + capital.getState());
- }
- final JQueryLocator element = elementIterator.next().getChild(jq("span"));
- assertEquals(selenium.getText(element), capital.getState());
- }
- }
}
15 years, 9 months
JBoss Rich Faces SVN: r18570 - modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean.
by richfaces-svn-commits@lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-08-11 17:13:47 -0400 (Wed, 11 Aug 2010)
New Revision: 18570
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataGridBean.java
Log:
RFPL-672 added attributes which should be hidden, added rowKeyConverter as attribute needs to be tested other way
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataGridBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataGridBean.java 2010-08-11 21:13:15 UTC (rev 18569)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataGridBean.java 2010-08-11 21:13:47 UTC (rev 18570)
@@ -66,10 +66,18 @@
// TODO has to be tested in other way
attributes.remove("componentState");
attributes.remove("rowKeyVar");
+ attributes.remove("rowKeyConverter");
attributes.remove("stateVar");
attributes.remove("value");
attributes.remove("var");
-
+
+ // should be hidden
+ attributes.remove("rows");
+ attributes.remove("rowAvailable");
+ attributes.remove("rowCount");
+ attributes.remove("rowData");
+ attributes.remove("rowIndex");
+ attributes.remove("rowKey");
}
public Attributes getAttributes() {
15 years, 9 months
JBoss Rich Faces SVN: r18569 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid.
by richfaces-svn-commits@lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-08-11 17:13:15 -0400 (Wed, 11 Aug 2010)
New Revision: 18569
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestSimple.java
Log:
removed unnecessary imports
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestSimple.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestSimple.java 2010-08-11 20:03:56 UTC (rev 18568)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestSimple.java 2010-08-11 21:13:15 UTC (rev 18569)
@@ -21,12 +21,16 @@
*******************************************************************************/
package org.richfaces.tests.metamer.ftest.richDataGrid;
+import static java.lang.Math.ceil;
+import static java.lang.Math.max;
+import static java.lang.Math.min;
import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardHttp;
+import static org.jboss.test.selenium.locator.LocatorFactory.jq;
import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
-import static java.lang.Math.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.fail;
import java.net.URL;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -40,16 +44,9 @@
import org.richfaces.tests.metamer.ftest.annotations.Use;
import org.richfaces.tests.metamer.ftest.model.DataGrid;
import org.richfaces.tests.metamer.model.Capital;
-import org.richfaces.util.CollectionsUtils;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.inject.internal.Collections2;
-import com.google.inject.internal.cglib.core.CollectionUtils;
-
-import static org.jboss.test.selenium.locator.LocatorFactory.*;
-import static org.testng.Assert.*;
-
/**
* @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
* @version $Revision$
15 years, 9 months
JBoss Rich Faces SVN: r18568 - modules/build/resources/branches.
by richfaces-svn-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-08-11 16:03:56 -0400 (Wed, 11 Aug 2010)
New Revision: 18568
Added:
modules/build/resources/branches/RF-9040/
Log:
RF-9040 development branch created to process build updates in a batch
Copied: modules/build/resources/branches/RF-9040 (from rev 18567, modules/build/resources/trunk/checkstyle)
15 years, 9 months
JBoss Rich Faces SVN: r18566 - modules/build/parent/branches.
by richfaces-svn-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-08-11 15:58:00 -0400 (Wed, 11 Aug 2010)
New Revision: 18566
Added:
modules/build/parent/branches/RF-9040/
Log:
RF-9040 development branch created to process build updates in a batch
Copied: modules/build/parent/branches/RF-9040 (from rev 18565, modules/build/parent/trunk)
15 years, 9 months
JBoss Rich Faces SVN: r18565 - branches.
by richfaces-svn-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-08-11 15:41:55 -0400 (Wed, 11 Aug 2010)
New Revision: 18565
Added:
branches/RF-9040_build_updated_m2/
Log:
RF-9040 development branch created to process build updates in a batch
Copied: branches/RF-9040_build_updated_m2 (from rev 18564, trunk)
15 years, 9 months
JBoss Rich Faces SVN: r18564 - in trunk: ui and 3 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2010-08-11 15:24:00 -0400 (Wed, 11 Aug 2010)
New Revision: 18564
Added:
trunk/ui/common/
trunk/ui/common/api/
trunk/ui/common/api/pom.xml
trunk/ui/common/pom.xml
trunk/ui/common/ui/
trunk/ui/common/ui/pom.xml
trunk/ui/pom.xml
Modified:
trunk/pom.xml
Log:
Added ui/common module & aggregator for ui modules
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-08-11 18:37:59 UTC (rev 18563)
+++ trunk/pom.xml 2010-08-11 19:24:00 UTC (rev 18564)
@@ -23,12 +23,7 @@
<module>cdk</module>
<!-- richfaces ui -->
- <module>ui/parent</module>
- <module>ui/core</module>
- <module>ui/iteration</module>
- <module>ui/misc</module>
- <module>ui/output</module>
- <module>ui/dist</module>
+ <module>ui</module>
<!-- Remaining -->
<module>archetypes</module>
Added: trunk/ui/common/api/pom.xml
===================================================================
--- trunk/ui/common/api/pom.xml (rev 0)
+++ trunk/ui/common/api/pom.xml 2010-08-11 19:24:00 UTC (rev 18564)
@@ -0,0 +1,99 @@
+<?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</groupId>
+ <artifactId>richfaces-ui-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui.common</groupId>
+ <artifactId>richfaces-ui-common-api</artifactId>
+ <name>Richfaces UI Components: Common API</name>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <!-- 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>
+
+</project>
\ No newline at end of file
Added: trunk/ui/common/pom.xml
===================================================================
--- trunk/ui/common/pom.xml (rev 0)
+++ trunk/ui/common/pom.xml 2010-08-11 19:24:00 UTC (rev 18564)
@@ -0,0 +1,42 @@
+<?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>9</version>
+ </parent>
+
+ <groupId>org.richfaces.ui.common</groupId>
+ <artifactId>richfaces-ui-common-aggregator</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Richfaces UI Components: Common Aggregator</name>
+
+ <modules>
+ <module>api</module>
+ <module>ui</module>
+ </modules>
+
+</project>
\ No newline at end of file
Added: trunk/ui/common/ui/pom.xml
===================================================================
--- trunk/ui/common/ui/pom.xml (rev 0)
+++ trunk/ui/common/ui/pom.xml 2010-08-11 19:24:00 UTC (rev 18564)
@@ -0,0 +1,110 @@
+<?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.ui</groupId>
+ <artifactId>richfaces-ui-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.richfaces.ui.commmon</groupId>
+ <artifactId>richfaces-ui-common-ui</artifactId>
+ <name>Richfaces UI Components: Common UI</name>
+ <packaging>jar</packaging>
+
+ <properties>
+ <org.richfaces.cdk.version>4.0.0-SNAPSHOT</org.richfaces.cdk.version>
+ </properties>
+
+ <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>
+
+</project>
\ No newline at end of file
Added: trunk/ui/pom.xml
===================================================================
--- trunk/ui/pom.xml (rev 0)
+++ trunk/ui/pom.xml 2010-08-11 19:24:00 UTC (rev 18564)
@@ -0,0 +1,51 @@
+<?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>
+
+ <!-- This aggregator pom, is not released, and is only used to make it easy to build all of the
+ examples at once from trunk. -->
+
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>9</version>
+ </parent>
+
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>ui-aggregator</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>RichFaces UI: Aggregator</name>
+
+ <modules>
+ <module>parent</module>
+ <module>common</module>
+ <module>core</module>
+ <module>iteration</module>
+ <module>misc</module>
+ <module>output</module>
+ <module>dist</module>
+ </modules>
+
+</project>
+
15 years, 9 months
JBoss Rich Faces SVN: r18563 - in sandbox/trunk/examples/richfaces-showcase-gae: src/main/resources/META-INF and 6 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2010-08-11 14:37:59 -0400 (Wed, 11 Aug 2010)
New Revision: 18563
Added:
sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/org.richfaces.demo/
sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/org.richfaces.demo/message.css
sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/org.richfaces.demo/messages.css
sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/org.richfaces.demo/page.ecss
sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/org.richfaces.demo/panel.ecss
Removed:
sandbox/trunk/examples/richfaces-showcase-gae/src/main/resources/META-INF/resources/
sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/css/message.css
sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/css/messages.css
Modified:
sandbox/trunk/examples/richfaces-showcase-gae/pom.xml
sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/WEB-INF/web.xml
sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/message.xhtml
sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/messages.xhtml
sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/page.xhtml
sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/panel.xhtml
sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/templates/main.xhtml
Log:
Latest changes in richfaces-showcase-gae
Modified: sandbox/trunk/examples/richfaces-showcase-gae/pom.xml
===================================================================
--- sandbox/trunk/examples/richfaces-showcase-gae/pom.xml 2010-08-11 18:35:57 UTC (rev 18562)
+++ sandbox/trunk/examples/richfaces-showcase-gae/pom.xml 2010-08-11 18:37:59 UTC (rev 18563)
@@ -164,6 +164,11 @@
<artifactId>el-api</artifactId>
<version>1.0</version>
</dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-components-api</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
<!-- Build Settings -->
Modified: sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/WEB-INF/web.xml
===================================================================
--- sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/WEB-INF/web.xml 2010-08-11 18:35:57 UTC (rev 18562)
+++ sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/WEB-INF/web.xml 2010-08-11 18:37:59 UTC (rev 18563)
@@ -66,6 +66,10 @@
<param-name>com.sun.faces.expressionFactory</param-name>
<param-value>com.sun.el.ExpressionFactoryImpl</param-value>
</context-param>
+ <context-param>
+ <param-name>org.richfaces.executeAWTInitializer</param-name>
+ <param-value>false</param-value>
+ </context-param>
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
Copied: sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/org.richfaces.demo/message.css (from rev 18544, sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/css/message.css)
===================================================================
--- sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/org.richfaces.demo/message.css (rev 0)
+++ sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/org.richfaces.demo/message.css 2010-08-11 18:37:59 UTC (rev 18563)
@@ -0,0 +1,3 @@
+rich-message{
+ color:red;
+}
\ No newline at end of file
Copied: sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/org.richfaces.demo/messages.css (from rev 18544, sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/css/messages.css)
===================================================================
--- sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/org.richfaces.demo/messages.css (rev 0)
+++ sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/org.richfaces.demo/messages.css 2010-08-11 18:37:59 UTC (rev 18563)
@@ -0,0 +1,3 @@
+rich-messages{
+ color:red;
+}
\ No newline at end of file
Copied: sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/org.richfaces.demo/page.ecss (from rev 18544, sandbox/trunk/examples/richfaces-showcase-gae/src/main/resources/META-INF/resources/rich/css/page.ecss)
===================================================================
--- sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/org.richfaces.demo/page.ecss (rev 0)
+++ sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/org.richfaces.demo/page.ecss 2010-08-11 18:37:59 UTC (rev 18563)
@@ -0,0 +1,96 @@
+.rich-page {
+ width: 100%;
+}
+
+body {
+ background-color: #FFFFFF;
+ margin: 10px;
+}
+
+.header_bg {
+ background-image:
+ "url(#{resource['org.richfaces.demo.images.PageHeaderGradient']})";
+ border-bottom: 1px solid #FFFFFF;
+ background-color: '#{richSkin.headerBackgroundColor}';
+ background-repeat: repeat-x;
+ background-position: top left;
+}
+
+.footer_bg {
+ background-image:
+ "url(#{resource['org.richfaces.demo.images.PageFooterGradient']})";
+ border-top: 1px solid #FFFFFF;
+ background-color: '#{richSkin.headerBackgroundColor}';
+ background-repeat: repeat-x;
+ background-position: center left;
+}
+
+.menu_col {
+ background-color: '#{richSkin.generalBackgroundColor}';
+ vertical-align: top;
+ border-top: 10px solid #FFFFFF;
+ border-right: 10px solid #FFFFFF;
+ border-bottom: 10px solid #FFFFFF;
+}
+
+.content_col {
+ background-color: #FFFFFF;
+ vertical-align: top;
+ width: 100%;
+ border-top: 10px solid #FFFFFF;
+ border-bottom: 10px solid #FFFFFF;
+}
+
+*.menu_col,*.content_col,*.footer_bg {
+ font-family: '#{richSkin.generalFamilyFont}';
+ color: '#{richSkin.generalTextColor}';
+ font-size: '#{richSkin.generalSizeFont}';
+}
+
+*.header_content {
+ font-family: '#{richSkin.generalFamilyFont}';
+ color: '#{richSkin.headerTextColor}';
+ font-size: '#{richSkin.generalSizeFont}';
+ padding-left: 20px;
+}
+
+.page_size {
+ width: 100%;
+ height: 100%;
+}
+
+.header_content {
+ margin: 0px 0px 0px 0px;
+ position: relative
+}
+
+.spacer {
+ font-size: 1px;
+}
+
+.footer_bg_content {
+ padding:20px;
+ margin: 0px 0px 0px 0px;
+}
+
+.new_marker {
+ color: red;
+ vertical-align: super;
+ font-size: 8px;
+ padding-left: 2px;
+}
+
+.header_links_container, .header_links_container a:visited, .header_links_container * {
+ color: '#{richSkin.headerTextColor}';
+}
+
+.header_links_container {
+ padding-right: 20px;
+}
+
+.skin-chooser{
+margin-bottom: 3px;
+}
+.samples-navigator{
+margin-bottom: 10px;
+}
\ No newline at end of file
Copied: sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/org.richfaces.demo/panel.ecss (from rev 18544, sandbox/trunk/examples/richfaces-showcase-gae/src/main/resources/META-INF/resources/rich/css/panel.ecss)
===================================================================
--- sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/org.richfaces.demo/panel.ecss (rev 0)
+++ sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/org.richfaces.demo/panel.ecss 2010-08-11 18:37:59 UTC (rev 18563)
@@ -0,0 +1,28 @@
+.rich-panel {
+ border-width: 1px;
+ border-style: solid;
+ padding: 1px;
+ color: '#{richSkin.generalTextColor}';
+ font-family: '#{richSkin.generalFamilyFont}';
+ font-size: '#{richSkin.generalSizeFont}';
+ background-color: '#{richSkin.generalBackgroundColor}';
+ border-color: '#{richSkin.panelBorderColor}';
+}
+
+.rich-panel-header {
+ padding: 7px 20px;
+ border-width: 1px;
+ border-style: solid;
+ background-color: '#{richSkin.headerBackgroundColor}';
+ border-color: '#{richSkin.panelBorderColor}';
+ font-weight: bold;
+ background-position: left top;
+ background-repeat: repeat-x;
+ background-image:
+ "url(#{resource['org.richfaces.demo.images.PanelGradient']})";
+ color: '#{richSkin.headerTextColor}';
+}
+
+.rich-panel-body {
+ padding: 10px;
+}
\ No newline at end of file
Deleted: sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/css/message.css
===================================================================
--- sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/css/message.css 2010-08-11 18:35:57 UTC (rev 18562)
+++ sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/css/message.css 2010-08-11 18:37:59 UTC (rev 18563)
@@ -1,3 +0,0 @@
-rich-message{
- color:red;
-}
\ No newline at end of file
Deleted: sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/css/messages.css
===================================================================
--- sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/css/messages.css 2010-08-11 18:35:57 UTC (rev 18562)
+++ sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/css/messages.css 2010-08-11 18:37:59 UTC (rev 18563)
@@ -1,3 +0,0 @@
-rich-messages{
- color:red;
-}
\ No newline at end of file
Modified: sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/message.xhtml
===================================================================
--- sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/message.xhtml 2010-08-11 18:35:57 UTC (rev 18562)
+++ sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/message.xhtml 2010-08-11 18:37:59 UTC (rev 18563)
@@ -19,7 +19,7 @@
</composite:interface>
<composite:implementation>
- <h:outputStylesheet name="rich/css/message.css" />
+ <h:outputStylesheet library="org.richfaces.demo" name="message.css" />
<a4j:outputPanel ajaxRendered="true" layout="none">
<h:message for="#{cc.attrs.for}" showDetail="#{cc.attrs.showDetails}"
showSummary="#{cc.attrs.showSummary}" style="#{cc.attrs.style}"
Modified: sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/messages.xhtml
===================================================================
--- sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/messages.xhtml 2010-08-11 18:35:57 UTC (rev 18562)
+++ sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/messages.xhtml 2010-08-11 18:37:59 UTC (rev 18563)
@@ -18,7 +18,7 @@
</composite:interface>
<composite:implementation>
- <h:outputStylesheet name="rich/css/messages.css" />
+ <h:outputStylesheet library="org.richfaces.demo" name="messages.css" />
<a4j:outputPanel ajaxRendered="true" layout="none">
<h:messages layout="#{cc.attrs.layout}"
showSummary="true" style="color:red; #{cc.attrs.style}"
Modified: sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/page.xhtml
===================================================================
--- sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/page.xhtml 2010-08-11 18:35:57 UTC (rev 18562)
+++ sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/page.xhtml 2010-08-11 18:37:59 UTC (rev 18563)
@@ -26,7 +26,7 @@
<composite:renderFacet name="pageHeader"/>
</h:head>
<h:body>
- <h:outputStylesheet name="rich/css/page.ecss" />
+ <h:outputStylesheet library="org.richfaces.demo" name="page.ecss" />
<table border="0" cellpadding="0" cellspacing="0" class="rich-page #{cc.attrs.pageClass}">
<tbody>
<tr>
Modified: sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/panel.xhtml
===================================================================
--- sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/panel.xhtml 2010-08-11 18:35:57 UTC (rev 18562)
+++ sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/resources/rich/panel.xhtml 2010-08-11 18:37:59 UTC (rev 18563)
@@ -20,7 +20,7 @@
</composite:interface>
<composite:implementation>
- <h:outputStylesheet name="rich/css/panel.ecss" />
+ <h:outputStylesheet library="org.richfaces.demo" name="panel.ecss" />
<div class="rich-panel #{cc.attrs.styleClass}" id="#{cc.attrs.id}"
style="#{cc.attrs.style}"
Modified: sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/templates/main.xhtml
===================================================================
--- sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/templates/main.xhtml 2010-08-11 18:35:57 UTC (rev 18562)
+++ sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/templates/main.xhtml 2010-08-11 18:37:59 UTC (rev 18563)
@@ -12,7 +12,7 @@
<title>Components Gallery</title>
</h:head>
<h:body>
- <h:outputStylesheet name="rich/css/page.ecss" />
+ <h:outputStylesheet library="org.richfaces.demo" name="page.ecss" />
<table border="0" cellpadding="0" cellspacing="0"
class="rich-page header_bg #{cc.attrs.pageClass}">
<tbody>
15 years, 9 months
JBoss Rich Faces SVN: r18562 - in trunk/ui/misc/ui/src/main: resources/META-INF/resources and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2010-08-11 14:35:57 -0400 (Wed, 11 Aug 2010)
New Revision: 18562
Added:
trunk/ui/misc/ui/src/main/resources/META-INF/resources/org.richfaces/component-control.js
Removed:
trunk/ui/misc/ui/src/main/resources/META-INF/resources/script/
Modified:
trunk/ui/misc/ui/src/main/java/org/richfaces/renderkit/ComponentControlBehaviorRenderer.java
Log:
Component resources moved to "org.richfaces" library
Modified: trunk/ui/misc/ui/src/main/java/org/richfaces/renderkit/ComponentControlBehaviorRenderer.java
===================================================================
--- trunk/ui/misc/ui/src/main/java/org/richfaces/renderkit/ComponentControlBehaviorRenderer.java 2010-08-11 18:34:25 UTC (rev 18561)
+++ trunk/ui/misc/ui/src/main/java/org/richfaces/renderkit/ComponentControlBehaviorRenderer.java 2010-08-11 18:35:57 UTC (rev 18562)
@@ -56,7 +56,7 @@
@ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js"),
@ResourceDependency(name = "richfaces-event.js"),
@ResourceDependency(name = "richfaces-base-component.js"),
- @ResourceDependency(name = "script/component-control.js") })
+ @ResourceDependency(library = "org.richfaces", name = "component-control.js") })
public class ComponentControlBehaviorRenderer extends ClientBehaviorRenderer {
private static final String FUNC_NAME = "RichFaces.ui.ComponentControl.execute";
Copied: trunk/ui/misc/ui/src/main/resources/META-INF/resources/org.richfaces/component-control.js (from rev 18558, trunk/ui/misc/ui/src/main/resources/META-INF/resources/script/component-control.js)
===================================================================
--- trunk/ui/misc/ui/src/main/resources/META-INF/resources/org.richfaces/component-control.js (rev 0)
+++ trunk/ui/misc/ui/src/main/resources/META-INF/resources/org.richfaces/component-control.js 2010-08-11 18:35:57 UTC (rev 18562)
@@ -0,0 +1,39 @@
+(function ($, richfaces) {
+
+ richfaces.ui = richfaces.ui || {};
+
+ richfaces.ui.ComponentControl = richfaces.ui.ComponentControl || {};
+
+ $.extend(richfaces.ui.ComponentControl, {
+
+ execute: function(event, parameters) {
+ var targetList = parameters.target;
+ var selector = parameters.selector;
+ var callback = parameters.callback;
+
+ if (targetList) {
+ for (var i = 0; i < targetList.length; i++) {
+ var component = document.getElementById(targetList[i]);
+ if (component) {
+ richfaces.ui.ComponentControl.invokeOnComponent(event, component, callback);
+ }
+ }
+ }
+
+ if(selector) {
+ richfaces.ui.ComponentControl.invokeOnComponent(event, selector, callback);
+ }
+ },
+
+ invokeOnComponent : function(event, target, callback) {
+ if(callback && typeof callback == 'function') {
+ $(target).each(function() {
+ if (this.richfaces && this.richfaces.component) {
+ callback(event, this.richfaces.component);
+ }
+ });
+ }
+ }
+ });
+
+})(jQuery, window.RichFaces);
\ No newline at end of file
15 years, 9 months