JBoss Rich Faces SVN: r21733 - in trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk: resource/util and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2011-02-17 09:55:54 -0500 (Thu, 17 Feb 2011)
New Revision: 21733
Modified:
trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/ProcessMojo.java
trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/util/ResourceUtil.java
trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/ResourceWriterImpl.java
Log:
https://issues.jboss.org/browse/RF-9124
Modified: trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/ProcessMojo.java
===================================================================
--- trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/ProcessMojo.java 2011-02-17 14:42:38 UTC (rev 21732)
+++ trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/ProcessMojo.java 2011-02-17 14:55:54 UTC (rev 21733)
@@ -103,6 +103,12 @@
};
};
+ private static final Function<Resource, String> RESOURCE_QUALIFIER_FUNCTION = new Function<Resource, String>() {
+ public String apply(Resource from) {
+ return ResourceUtil.getResourceQualifier(from);
+ };
+ };
+
private final Function<String, URL> filePathToURL = new Function<String, URL>() {
public URL apply(String from) {
try {
@@ -150,6 +156,16 @@
/**
* @parameter
*/
+ private List<String> includedFiles;
+
+ /**
+ * @parameter
+ */
+ private List<String> excludedFiles;
+
+ /**
+ * @parameter
+ */
// TODO review usage of properties?
private FileNameMapping[] fileNameMappings = new FileNameMapping[0];
@@ -192,9 +208,16 @@
}
private Predicate<Resource> createResourcesFilter() {
+ Predicate<CharSequence> qualifierPredicate = MorePredicates.compose(includedFiles,
+ excludedFiles, REGEX_CONTAINS_BUILDER_FUNCTION);
+
+ Predicate<Resource> qualifierResourcePredicate = Predicates.compose(qualifierPredicate, RESOURCE_QUALIFIER_FUNCTION);
+
Predicate<CharSequence> contentTypePredicate = MorePredicates.compose(includedContentTypes,
excludedContentTypes, REGEX_CONTAINS_BUILDER_FUNCTION);
- return Predicates.compose(contentTypePredicate, CONTENT_TYPE_FUNCTION);
+ Predicate<Resource> contentTypeResourcePredicate = Predicates.compose(contentTypePredicate, CONTENT_TYPE_FUNCTION);
+
+ return Predicates.and(qualifierResourcePredicate, contentTypeResourcePredicate);
}
private URL resolveWebRoot() throws MalformedURLException {
Modified: trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/util/ResourceUtil.java
===================================================================
--- trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/util/ResourceUtil.java 2011-02-17 14:42:38 UTC (rev 21732)
+++ trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/util/ResourceUtil.java 2011-02-17 14:55:54 UTC (rev 21733)
@@ -21,6 +21,7 @@
*/
package org.richfaces.cdk.resource.util;
+import static org.richfaces.cdk.strings.Constants.COLON_JOINER;
import static org.richfaces.cdk.strings.Constants.DOT_JOINER;
import java.io.IOException;
@@ -31,6 +32,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import javax.faces.application.Resource;
+
import org.richfaces.cdk.vfs.VFSRoot;
import org.richfaces.cdk.vfs.VirtualFile;
@@ -144,4 +147,9 @@
return result;
}
+
+ public static String getResourceQualifier(Resource resource) {
+ return COLON_JOINER.join(resource.getLibraryName(), resource.getResourceName());
+ }
+
}
Modified: trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/ResourceWriterImpl.java
===================================================================
--- trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/ResourceWriterImpl.java 2011-02-17 14:42:38 UTC (rev 21732)
+++ trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/ResourceWriterImpl.java 2011-02-17 14:55:54 UTC (rev 21733)
@@ -21,8 +21,6 @@
*/
package org.richfaces.cdk.resource.writer.impl;
-import static org.richfaces.cdk.strings.Constants.COLON_JOINER;
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -36,6 +34,7 @@
import org.apache.maven.plugin.logging.Log;
import org.richfaces.cdk.ResourceWriter;
+import org.richfaces.cdk.resource.util.ResourceUtil;
import org.richfaces.cdk.resource.writer.ResourceProcessor;
import org.richfaces.cdk.strings.Constants;
import org.richfaces.resource.ResourceFactory;
@@ -91,10 +90,6 @@
currentTime = System.currentTimeMillis();
}
- private String getResourceQualifier(Resource resource) {
- return COLON_JOINER.join(resource.getLibraryName(), resource.getResourceName());
- }
-
private synchronized File createOutputFile(String path) throws IOException {
File outFile = new File(resourceContentsDir, path);
outFile.getParentFile().mkdirs();
@@ -133,7 +128,7 @@
File outFile = createOutputFile(requestPathWithSkin);
matchingProcessor.process(requestPathWithSkin, new ResourceInputStreamSupplier(resource), Files.newOutputStreamSupplier(outFile));
- processedResources.put(getResourceQualifier(resource), requestPath);
+ processedResources.put(ResourceUtil.getResourceQualifier(resource), requestPath);
}
@Override
15 years, 2 months
JBoss Rich Faces SVN: r21732 - in modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest: a4jCommandLink and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-02-17 09:42:38 -0500 (Thu, 17 Feb 2011)
New Revision: 21732
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandButton/TestA4JCommandButton.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandLink/TestA4JCommandLink.java
Log:
added issue tracking info
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandButton/TestA4JCommandButton.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandButton/TestA4JCommandButton.java 2011-02-17 14:01:13 UTC (rev 21731)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandButton/TestA4JCommandButton.java 2011-02-17 14:42:38 UTC (rev 21732)
@@ -332,6 +332,7 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-10555")
public void testRender() {
JQueryLocator renderInput = pjq("input[name$=renderInput]");
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandLink/TestA4JCommandLink.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandLink/TestA4JCommandLink.java 2011-02-17 14:01:13 UTC (rev 21731)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandLink/TestA4JCommandLink.java 2011-02-17 14:42:38 UTC (rev 21732)
@@ -340,6 +340,7 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-10555")
public void testRender() {
JQueryLocator renderInput = pjq("input[name$=renderInput]");
15 years, 2 months
JBoss Rich Faces SVN: r21731 - in trunk: ui/dnd/ui/src/main/java/org/richfaces/component and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2011-02-17 09:01:13 -0500 (Thu, 17 Feb 2011)
New Revision: 21731
Modified:
trunk/examples/dnd-demo/src/main/webapp/examples/dnd.xhtml
trunk/ui/dnd/ui/src/main/java/org/richfaces/component/AbstractDropTarget.java
Log:
https://issues.jboss.org/browse/RF-10534 Drop Target - add missing common ajax attributes
Modified: trunk/examples/dnd-demo/src/main/webapp/examples/dnd.xhtml
===================================================================
--- trunk/examples/dnd-demo/src/main/webapp/examples/dnd.xhtml 2011-02-17 13:30:17 UTC (rev 21730)
+++ trunk/examples/dnd-demo/src/main/webapp/examples/dnd.xhtml 2011-02-17 14:01:13 UTC (rev 21731)
@@ -79,8 +79,8 @@
render="drp"/>
</li>
<li>
- <a4j:commandLink value="Make acceptedTypes nullable. Every type will be accepted."
- action="#{dataBean.makeAcceptedTypesNullable}"
+ <a4j:commandLink value="Make every type be accepted."
+ action="#{dataBean.makeAcceptedTypeIsAny}"
render="drp"/>
</li>
<li>
@@ -101,8 +101,8 @@
</table>
<a4j:outputPanel id="drp" layout="block" styleClass="droppable">
- <dnd:dropTarget acceptedTypes="#{dataBean.acceptedTypes}" dropListener="#{dropListenerBean.processDrop}"
- render="grid executeOut" execute="executeIn" immediate="#{dataBean.immediate}" bypassUpdates="#{dataBean.bypassUpdates}"/>
+ <dnd:dropTarget acceptedTypes="#{dataBean.acceptedTypes}" dropListener="#{dataBean.processDrop}"
+ render="grid executeOut" execute="executeIn" immediate="#{dataBean.immediate}" onbeforedomupdate="alert('onbeforedomupdate')" oncomplete="alert('oncomlete')" status="dndstatus" bypassUpdates="#{dataBean.bypassUpdates}"/>
<h:dataTable id="grid" var="dropValue" value="#{dataBean.dropValues}">
<h:column>
<h:outputText value="#{dropValue}"/> : <h:outputText value="#{dataBean.phaseId}" />;
@@ -113,6 +113,11 @@
<a4j:outputPanel id="execute" layout="block">
<h:inputText id="executeIn" value="#{dataBean.executeTest}"/> <br/>
<h:outputText id="executeOut" value="#{dataBean.executeTest}"/> <br/>
+ <a4j:status name="dndstatus" startText="...named status request start...">
+ </a4j:status>
+
+
+
</a4j:outputPanel>
</h:form>
</h:body>
Modified: trunk/ui/dnd/ui/src/main/java/org/richfaces/component/AbstractDropTarget.java
===================================================================
--- trunk/ui/dnd/ui/src/main/java/org/richfaces/component/AbstractDropTarget.java 2011-02-17 13:30:17 UTC (rev 21730)
+++ trunk/ui/dnd/ui/src/main/java/org/richfaces/component/AbstractDropTarget.java 2011-02-17 14:01:13 UTC (rev 21731)
@@ -28,11 +28,7 @@
import javax.faces.event.FacesEvent;
import javax.faces.event.PhaseId;
-import org.richfaces.cdk.annotations.Attribute;
-import org.richfaces.cdk.annotations.JsfComponent;
-import org.richfaces.cdk.annotations.JsfRenderer;
-import org.richfaces.cdk.annotations.Tag;
-import org.richfaces.cdk.annotations.TagType;
+import org.richfaces.cdk.annotations.*;
import org.richfaces.event.DropEvent;
import org.richfaces.event.DropListener;
@@ -67,8 +63,28 @@
@Attribute
public abstract Object getExecute();
+ @Attribute
public abstract Object getAcceptedTypes();
+ @Attribute
+ public abstract boolean isLimitRender();
+
+ @Attribute
+ public abstract Object getData();
+
+ @Attribute
+ public abstract String getStatus();
+
+ @Attribute(events = @EventName("beforedomupdate"))
+ public abstract String getOnbeforedomupdate();
+
+ @Attribute(events = @EventName("complete"))
+ public abstract String getOncomplete();
+
+ @Attribute(events = @EventName("begin"))
+ public abstract String getOnbegin();
+
+
public void addDropListener(DropListener listener) {
addFacesListener(listener);
}
15 years, 2 months
JBoss Rich Faces SVN: r21730 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-17 08:30:17 -0500 (Thu, 17 Feb 2011)
New Revision: 21730
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSimple.java
Log:
removed issue tracking for RF-10302
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSimple.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSimple.java 2011-02-17 13:29:42 UTC (rev 21729)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSimple.java 2011-02-17 13:30:17 UTC (rev 21730)
@@ -28,7 +28,6 @@
import org.jboss.test.selenium.css.CssProperty;
import org.richfaces.PanelMenuMode;
import org.richfaces.tests.metamer.ftest.annotations.Inject;
-import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
import org.richfaces.tests.metamer.ftest.annotations.RegressionTest;
import org.richfaces.tests.metamer.ftest.annotations.Use;
import org.testng.annotations.Test;
@@ -123,8 +122,9 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-10302")
+ @RegressionTest("https://issues.jboss.org/browse/RF-10302")
public void testWidth() {
+ attributes.setStyle("");
attributes.setWidth("300px");
assertEquals(selenium.getStyle(menu, CssProperty.WIDTH), "300px");
}
15 years, 2 months
JBoss Rich Faces SVN: r21729 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-17 08:29:42 -0500 (Thu, 17 Feb 2011)
New Revision: 21729
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSimple.java
Log:
panelMenu - fixed @disabled test and removed issue tracking (RF-10158)
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSimple.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSimple.java 2011-02-17 13:29:05 UTC (rev 21728)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSimple.java 2011-02-17 13:29:42 UTC (rev 21729)
@@ -29,6 +29,7 @@
import org.richfaces.PanelMenuMode;
import org.richfaces.tests.metamer.ftest.annotations.Inject;
import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
+import org.richfaces.tests.metamer.ftest.annotations.RegressionTest;
import org.richfaces.tests.metamer.ftest.annotations.Use;
import org.testng.annotations.Test;
@@ -43,7 +44,7 @@
Boolean expandSingle;
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-10158")
+ @RegressionTest("https://issues.jboss.org/browse/RF-10158")
public void testDisabled() {
attributes.setGroupMode(PanelMenuMode.client);
attributes.setDisabled(false);
@@ -53,8 +54,8 @@
attributes.setDisabled(true);
- assertEquals(selenium.getCount(menu.getAnyDisabledGroup()), 5);
- assertEquals(selenium.getCount(menu.getAnyDisabledItem()), 18);
+ assertEquals(selenium.getCount(menu.getAnyDisabledGroup()), 6);
+ assertEquals(selenium.getCount(menu.getAnyDisabledItem()), 24);
}
@Test
15 years, 2 months
JBoss Rich Faces SVN: r21728 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-17 08:29:05 -0500 (Thu, 17 Feb 2011)
New Revision: 21728
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupMode.java
Log:
issue tracking - removed RF-10314, RF-10480 - added RF-10550, RF-10551
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupMode.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupMode.java 2011-02-17 13:28:30 UTC (rev 21727)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupMode.java 2011-02-17 13:29:05 UTC (rev 21728)
@@ -27,6 +27,7 @@
import static javax.faces.event.PhaseId.RENDER_RESPONSE;
import static javax.faces.event.PhaseId.RESTORE_VIEW;
import static javax.faces.event.PhaseId.UPDATE_MODEL_VALUES;
+import static org.testng.Assert.assertTrue;
import java.util.LinkedList;
@@ -43,7 +44,7 @@
* @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
* @version $Revision$
*/
-@IssueTracking({ "https://issues.jboss.org/browse/RF-10314", "https://issues.jboss.org/browse/RF-10480" })
+@IssueTracking({ "https://issues.jboss.org/browse/RF-10550" })
public class TestPanelMenuGroupMode extends AbstractPanelMenuGroupTest {
@Inject
@@ -56,7 +57,7 @@
@Inject
@Use("requestModes")
- PanelMenuMode mode = PanelMenuMode.ajax;
+ PanelMenuMode mode;
PanelMenuMode[] requestModes = new PanelMenuMode[] { PanelMenuMode.ajax, PanelMenuMode.server };
@Inject
@@ -66,7 +67,7 @@
"item changed" };
@Test
- public void testMode() {
+ public void testRequestMode() {
attributes.setImmediate(immediate);
attributes.setBypassUpdates(bypassUpdates);
attributes.setMode(mode);
@@ -74,7 +75,9 @@
attributes.setExecute("@this executeChecker");
+ assertTrue(topGroup.isExpanded());
topGroup.toggle();
+ assertTrue(topGroup.isCollapsed());
if (mode != PanelMenuMode.client) {
if ("phases".equals(listener)) {
@@ -88,8 +91,14 @@
@Test
@Uses({ @Use(field = "immediate", empty = true), @Use(field = "bypassUpdates", empty = true),
@Use(field = "mode", empty = true), @Use(field = "listener", empty = true) })
+ @IssueTracking("https://issues.jboss.org/browse/RF-10551")
public void testClientMode() {
+ attributes.setMode(PanelMenuMode.client);
+ menu.setGroupMode(PanelMenuMode.client);
+
+ assertTrue(topGroup.isExpanded());
topGroup.toggle();
+ assertTrue(topGroup.isCollapsed());
}
private PhaseId[] getExpectedPhases() {
15 years, 2 months
JBoss Rich Faces SVN: r21726 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropTarget.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-17 08:27:45 -0500 (Thu, 17 Feb 2011)
New Revision: 21726
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropTarget/TestDropTarget.java
Log:
TestDropTarget - fixed tests for RF-10535
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropTarget/TestDropTarget.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropTarget/TestDropTarget.java 2011-02-17 12:23:26 UTC (rev 21725)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropTarget/TestDropTarget.java 2011-02-17 13:27:45 UTC (rev 21726)
@@ -25,6 +25,7 @@
import static javax.faces.event.PhaseId.APPLY_REQUEST_VALUES;
import static javax.faces.event.PhaseId.INVOKE_APPLICATION;
import static javax.faces.event.PhaseId.PROCESS_VALIDATIONS;
+import static javax.faces.event.PhaseId.RENDER_RESPONSE;
import static javax.faces.event.PhaseId.RESTORE_VIEW;
import static javax.faces.event.PhaseId.UPDATE_MODEL_VALUES;
import static org.jboss.test.selenium.locator.LocatorFactory.jq;
@@ -38,11 +39,12 @@
import java.net.URL;
+import org.jboss.test.selenium.GuardRequest;
import org.jboss.test.selenium.actions.Drag;
import org.jboss.test.selenium.locator.JQueryLocator;
import org.jboss.test.selenium.request.RequestType;
import org.jboss.test.selenium.waiting.retrievers.TextRetriever;
-import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
+import org.richfaces.tests.metamer.ftest.annotations.RegressionTest;
import org.richfaces.tests.metamer.ftest.richDragIndicator.AbstractDragNDropTest;
import org.richfaces.tests.metamer.ftest.richDragIndicator.Draggable;
import org.richfaces.tests.metamer.ftest.richDragIndicator.Indicator.IndicatorState;
@@ -147,7 +149,7 @@
attributes.setExecute("executeChecker");
testAcception(drg1, ACCEPTING);
- drag.drop();
+ guardedDrop(RequestType.XHR);
phaseInfo.assertListener(UPDATE_MODEL_VALUES, "executeChecker");
phaseInfo.assertListener(INVOKE_APPLICATION, "dropListener");
@@ -155,27 +157,35 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-10535")
+ @RegressionTest("https://issues.jboss.org/browse/RF-10535")
public void testImmediate() {
attributes.setImmediate(true);
testAcception(drg1, ACCEPTING);
- drag.drop();
+ guardedDrop(RequestType.XHR);
phaseInfo.assertListener(APPLY_REQUEST_VALUES, "dropListener");
- phaseInfo.assertPhases(RESTORE_VIEW, APPLY_REQUEST_VALUES);
+ phaseInfo.assertPhases(RESTORE_VIEW, APPLY_REQUEST_VALUES, RENDER_RESPONSE);
}
+ private void guardedDrop(RequestType type) {
+ new GuardRequest(type) {
+ public void command() {
+ drag.drop();
+ }
+ }.waitRequest();
+ }
+
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-10535")
+ @RegressionTest("https://issues.jboss.org/browse/RF-10535")
public void testBypassUpdates() {
attributes.setBypassUpdates(true);
testAcception(drg1, ACCEPTING);
- drag.drop();
+ guardedDrop(RequestType.XHR);
phaseInfo.assertListener(PROCESS_VALIDATIONS, "dropListener");
- phaseInfo.assertPhases(RESTORE_VIEW, APPLY_REQUEST_VALUES, PROCESS_VALIDATIONS);
+ phaseInfo.assertPhases(RESTORE_VIEW, APPLY_REQUEST_VALUES, PROCESS_VALIDATIONS, RENDER_RESPONSE);
}
private void testAcceptedDropping(Draggable draggable) {
15 years, 2 months
JBoss Rich Faces SVN: r21725 - in modules/tests/metamer/trunk/application/src/main/webapp: resources/css and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-02-17 07:23:26 -0500 (Thu, 17 Feb 2011)
New Revision: 21725
Removed:
modules/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jAjax.css
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButton.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButtonWrapped.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandLink.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hGraphicImage.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputSecret.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputText.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextWrapped.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextarea.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectBooleanCheckbox.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyListbox.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyMenu.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneListbox.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneMenu.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneRadio.xhtml
Log:
removed empty stylesheet
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButton.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButton.xhtml 2011-02-17 12:22:37 UTC (rev 21724)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButton.xhtml 2011-02-17 12:23:26 UTC (rev 21725)
@@ -34,7 +34,6 @@
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="a4jAjax.css"/>
</ui:define>
<ui:define name="outOfTemplateBefore">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButtonWrapped.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButtonWrapped.xhtml 2011-02-17 12:22:37 UTC (rev 21724)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButtonWrapped.xhtml 2011-02-17 12:23:26 UTC (rev 21725)
@@ -34,7 +34,6 @@
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="a4jAjax.css"/>
</ui:define>
<ui:define name="outOfTemplateBefore">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandLink.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandLink.xhtml 2011-02-17 12:22:37 UTC (rev 21724)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandLink.xhtml 2011-02-17 12:23:26 UTC (rev 21725)
@@ -34,7 +34,6 @@
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="a4jAjax.css"/>
</ui:define>
<ui:define name="outOfTemplateBefore">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hGraphicImage.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hGraphicImage.xhtml 2011-02-17 12:22:37 UTC (rev 21724)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hGraphicImage.xhtml 2011-02-17 12:23:26 UTC (rev 21725)
@@ -34,7 +34,6 @@
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="a4jAjax.css"/>
</ui:define>
<ui:define name="outOfTemplateBefore">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputSecret.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputSecret.xhtml 2011-02-17 12:22:37 UTC (rev 21724)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputSecret.xhtml 2011-02-17 12:23:26 UTC (rev 21725)
@@ -34,7 +34,6 @@
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="a4jAjax.css"/>
</ui:define>
<ui:define name="outOfTemplateBefore">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputText.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputText.xhtml 2011-02-17 12:22:37 UTC (rev 21724)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputText.xhtml 2011-02-17 12:23:26 UTC (rev 21725)
@@ -34,7 +34,6 @@
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="a4jAjax.css"/>
</ui:define>
<ui:define name="outOfTemplateBefore">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextWrapped.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextWrapped.xhtml 2011-02-17 12:22:37 UTC (rev 21724)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextWrapped.xhtml 2011-02-17 12:23:26 UTC (rev 21725)
@@ -34,7 +34,6 @@
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="a4jAjax.css"/>
</ui:define>
<ui:define name="outOfTemplateBefore">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextarea.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextarea.xhtml 2011-02-17 12:22:37 UTC (rev 21724)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextarea.xhtml 2011-02-17 12:23:26 UTC (rev 21725)
@@ -34,7 +34,6 @@
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="a4jAjax.css"/>
</ui:define>
<ui:define name="outOfTemplateBefore">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectBooleanCheckbox.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectBooleanCheckbox.xhtml 2011-02-17 12:22:37 UTC (rev 21724)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectBooleanCheckbox.xhtml 2011-02-17 12:23:26 UTC (rev 21725)
@@ -34,7 +34,6 @@
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="a4jAjax.css"/>
</ui:define>
<ui:define name="outOfTemplateBefore">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml 2011-02-17 12:22:37 UTC (rev 21724)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml 2011-02-17 12:23:26 UTC (rev 21725)
@@ -34,7 +34,6 @@
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="a4jAjax.css"/>
</ui:define>
<ui:define name="outOfTemplateBefore">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyListbox.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyListbox.xhtml 2011-02-17 12:22:37 UTC (rev 21724)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyListbox.xhtml 2011-02-17 12:23:26 UTC (rev 21725)
@@ -34,7 +34,6 @@
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="a4jAjax.css"/>
</ui:define>
<ui:define name="outOfTemplateBefore">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyMenu.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyMenu.xhtml 2011-02-17 12:22:37 UTC (rev 21724)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyMenu.xhtml 2011-02-17 12:23:26 UTC (rev 21725)
@@ -34,7 +34,6 @@
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="a4jAjax.css"/>
</ui:define>
<ui:define name="outOfTemplateBefore">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneListbox.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneListbox.xhtml 2011-02-17 12:22:37 UTC (rev 21724)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneListbox.xhtml 2011-02-17 12:23:26 UTC (rev 21725)
@@ -34,7 +34,6 @@
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="a4jAjax.css"/>
</ui:define>
<ui:define name="outOfTemplateBefore">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneMenu.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneMenu.xhtml 2011-02-17 12:22:37 UTC (rev 21724)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneMenu.xhtml 2011-02-17 12:23:26 UTC (rev 21725)
@@ -34,7 +34,6 @@
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="a4jAjax.css"/>
</ui:define>
<ui:define name="outOfTemplateBefore">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneRadio.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneRadio.xhtml 2011-02-17 12:22:37 UTC (rev 21724)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneRadio.xhtml 2011-02-17 12:23:26 UTC (rev 21725)
@@ -34,7 +34,6 @@
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="a4jAjax.css"/>
</ui:define>
<ui:define name="outOfTemplateBefore">
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jAjax.css
===================================================================
15 years, 2 months
JBoss Rich Faces SVN: r21724 - in modules/tests/metamer/trunk/application/src/main/webapp/components: a4jCommandLink and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-02-17 07:22:37 -0500 (Thu, 17 Feb 2011)
New Revision: 21724
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/simple.xhtml
Log:
samples for command link/button fixed
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml 2011-02-17 12:22:10 UTC (rev 21723)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml 2011-02-17 12:22:37 UTC (rev 21724)
@@ -85,7 +85,7 @@
</ui:define>
<ui:define name="outOfTemplateAfter">
- <metamer:attributes value="#{a4jButtonBean.attributes}" id="attributes" render="panel"/>
+ <metamer:attributes value="#{a4jButtonBean.attributes}" id="attributes" render="log"/>
</ui:define>
</ui:composition>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/simple.xhtml 2011-02-17 12:22:10 UTC (rev 21723)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/simple.xhtml 2011-02-17 12:22:37 UTC (rev 21724)
@@ -91,7 +91,7 @@
</ui:define>
<ui:define name="outOfTemplateAfter">
- <metamer:attributes value="#{a4jLinkBean.attributes}" id="attributes" render="panel"/>
+ <metamer:attributes value="#{a4jLinkBean.attributes}" id="attributes" render="log"/>
</ui:define>
</ui:composition>
15 years, 2 months